[xoops-svn] SF.net SVN: xoops-svn:[10998] XoopsCore/branches/2.5.x/2.5.6

[<be...@us...>]

Revision: 10998
          http://sourceforge.net/p/xoops/svn/10998
Author:   beckmi
Date:     2013-02-06 09:00:59 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
fix for missing Protector logo under PHP 5.4 (function had to be static)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/registry.php

Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2013-02-06 08:37:08 UTC (rev 10997)
+++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2013-02-06 09:00:59 UTC (rev 10998)
@@ -9,6 +9,7 @@
  - bug with using reference for non-variables (geekwright/mamba)
  - number of users when "all groups" selected was wrong (tatane/mamba)
  - fix for potential lack of rendering css and javascript in Installer on the last screen (culex)
+ - fix for missing Protector logo under PHP 5.4 (mamba) 
 
 Security fixes
  - XSS/CSRF vulnerability in system/admin/groupperm.php (Dingjie Yang,Qualys/trabis)

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php	2013-02-06 08:37:08 UTC (rev 10997)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php	2013-02-06 09:00:59 UTC (rev 10998)
@@ -252,7 +252,7 @@
 }
 
 
-function get_filepath4bwlimit()
+static function get_filepath4bwlimit()
 {
 	return XOOPS_TRUST_PATH . '/modules/protector/configs/bwlimit' . substr( md5( XOOPS_ROOT_PATH . XOOPS_DB_USER . XOOPS_DB_PREFIX ) , 0 , 6 ) ;
 }
@@ -309,7 +309,7 @@
 }
 
 
-function get_filepath4badips()
+static function get_filepath4badips()
 {
 	return XOOPS_TRUST_PATH . '/modules/protector/configs/badips' . substr( md5( XOOPS_ROOT_PATH . XOOPS_DB_USER . XOOPS_DB_PREFIX ) , 0 , 6 ) ;
 }
@@ -329,7 +329,7 @@
 }
 
 
-function get_filepath4group1ips()
+static function get_filepath4group1ips()
 {
 	return XOOPS_TRUST_PATH . '/modules/protector/configs/group1ips' . substr( md5( XOOPS_ROOT_PATH . XOOPS_DB_USER . XOOPS_DB_PREFIX ) , 0 , 6 ) ;
 }

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/registry.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/registry.php	2013-02-06 08:37:08 UTC (rev 10997)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/registry.php	2013-02-06 09:00:59 UTC (rev 10998)
@@ -18,7 +18,7 @@
         $this->_locks = array();
     }
 
-    function &getInstance()
+    static function &getInstance()
     {
         static $instance = false;
         if (!$instance) {