From f3ba69c1d67c425ffa180d082a373e5cce0c86ce Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 14 Jan 2009 04:12:02 +0000
Subject: Make sure that helper functions are all static.  Add new
 File_Structure_Test to make sure we don't regress.

According to the PHP docs, the "public" keyword is implied on static
functions, so remove it.  Also, require private static functions to
start with an _.

http://php.net/manual/en/language.oop5.visibility.php
---
 modules/media_rss/helpers/media_rss.php           | 4 ++--
 modules/media_rss/helpers/media_rss_block.php     | 2 +-
 modules/media_rss/helpers/media_rss_installer.php | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/media_rss/helpers')

diff --git a/modules/media_rss/helpers/media_rss.php b/modules/media_rss/helpers/media_rss.php
index c834611a..9522727d 100644
--- a/modules/media_rss/helpers/media_rss.php
+++ b/modules/media_rss/helpers/media_rss.php
@@ -19,12 +19,12 @@
  */
 
 class media_rss_Core {
-  public static function item_feed($item) {
+  static function item_feed($item) {
     $id = $item->type == "album" ? $item->id : $item->parent_id;
     return url::site("media_rss/albums/$id");
   }
 
-  public static function tag_feed($tag) {
+  static function tag_feed($tag) {
     return url::site("media_rss/tags/$tag->id}");
   }
 }
\ No newline at end of file
diff --git a/modules/media_rss/helpers/media_rss_block.php b/modules/media_rss/helpers/media_rss_block.php
index 0a88ba70..80fb009e 100644
--- a/modules/media_rss/helpers/media_rss_block.php
+++ b/modules/media_rss/helpers/media_rss_block.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class media_rss_block_Core {
-  public static function head($theme) {
+  static function head($theme) {
     if ($theme->item()) {
       $url = media_rss::item_feed($theme->item());
     } else if ($theme->tag()) {
diff --git a/modules/media_rss/helpers/media_rss_installer.php b/modules/media_rss/helpers/media_rss_installer.php
index aafea9d6..170f2dfb 100644
--- a/modules/media_rss/helpers/media_rss_installer.php
+++ b/modules/media_rss/helpers/media_rss_installer.php
@@ -18,14 +18,14 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class media_rss_installer {
-  public static function install() {
+  static function install() {
     $version = module::get_version("media_rss");
     if ($version == 0) {
       module::set_version("media_rss", 1);
     }
   }
 
-  public static function uninstall() {
+  static function uninstall() {
     module::delete("media_rss");
   }
 }
-- 
cgit v1.2.3