[phpwiki-checkins] SF.net SVN: phpwiki:[9366] trunk/lib/WikiGroup.php

[<var...@us...>]

Revision: 9366
          http://sourceforge.net/p/phpwiki/code/9366
Author:   vargenau
Date:     2014-11-23 20:00:55 +0000 (Sun, 23 Nov 2014)
Log Message:
-----------
function getGroup is static

Modified Paths:
--------------
    trunk/lib/WikiGroup.php

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2014-11-23 19:58:23 UTC (rev 9365)
+++ trunk/lib/WikiGroup.php	2014-11-23 20:00:55 UTC (rev 9366)
@@ -106,7 +106,7 @@
      * @param  bool $not_current The global WikiRequest object.
      * @return object Subclass of WikiGroup selected via GROUP_METHOD.
      */
-    function getGroup($not_current = false)
+    static function getGroup($not_current = false)
     {
         switch (GROUP_METHOD) {
             case "NONE":
@@ -139,21 +139,22 @@
         return null;
     }
 
-    /** ACL PagePermissions will need those special groups based on the User status only.
-     *  translated
+    /*
+     * ACL PagePermissions will need those special groups based on the User status only.
+     * translated
      */
     function specialGroup($group)
     {
         return in_array($group, $this->specialGroups());
     }
 
-    /** untranslated */
+    /* untranslated */
     function _specialGroup($group)
     {
         return in_array($group, $this->_specialGroups());
     }
 
-    /** translated */
+    /* translated */
     function specialGroups()
     {
         return array(
@@ -167,7 +168,7 @@
             GROUP_CREATOR);
     }
 
-    /** untranslated */
+    /* untranslated */
     function _specialGroups()
     {
         return array(
@@ -334,7 +335,6 @@
 
     function getSpecialMembersOf($group)
     {
-        //$request = &$this->request;
         $all = $this->_allUsers();
         $users = array();
         switch ($group) {
@@ -369,10 +369,11 @@
             case GROUP_OWNER:
             case GROUP_CREATOR:
                 // this could get complex so just return an empty array
-                return false;
+                return array();
             default:
                 trigger_error(__sprintf("Unknown special group “%s”", $group), E_USER_WARNING);
                 return false;
+                return array();
         }
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.