Forráskód Böngészése

Bug #5418 - Fixing some PHP4 style code in PEAR/QuickForm, so deprecation messages be shown on PHP 5.3.

Ivan Tcholakov 15 éve
szülő
commit
fe918166cc

+ 12 - 3
main/inc/lib/pear/HTML/QuickForm.php

@@ -565,7 +565,10 @@ class HTML_QuickForm extends HTML_Common {
         $className = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][$type][1];
         $includeFile = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][$type][0];
         include_once($includeFile);
-        $elementObject =& new $className();
+        // Suppressing a deprecation warning on PHP 5.3
+        //$elementObject =& new $className();
+        $elementObject = new $className();
+        //
         for ($i = 0; $i < 5; $i++) {
             if (!isset($args[$i])) {
                 $args[$i] = null;
@@ -1664,7 +1667,10 @@ class HTML_QuickForm extends HTML_Common {
     {
         if (!isset($GLOBALS['_HTML_QuickForm_default_renderer'])) {
             include_once('HTML/QuickForm/Renderer/Default.php');
-            $GLOBALS['_HTML_QuickForm_default_renderer'] =& new HTML_QuickForm_Renderer_Default();
+            // Suppressing a deprecation warning on PHP 5.3
+            //$GLOBALS['_HTML_QuickForm_default_renderer'] =& new HTML_QuickForm_Renderer_Default();
+            $GLOBALS['_HTML_QuickForm_default_renderer'] = new HTML_QuickForm_Renderer_Default();
+            //
         }
         return $GLOBALS['_HTML_QuickForm_default_renderer'];
     } // end func defaultRenderer
@@ -1821,7 +1827,10 @@ class HTML_QuickForm extends HTML_Common {
     function toArray($collectHidden = false)
     {
         include_once 'HTML/QuickForm/Renderer/Array.php';
-        $renderer =& new HTML_QuickForm_Renderer_Array($collectHidden);
+        // Suppressing a deprecation warning on PHP 5.3
+        //$renderer =& new HTML_QuickForm_Renderer_Array($collectHidden);
+        $renderer = new HTML_QuickForm_Renderer_Array($collectHidden);
+        //
         $this->accept($renderer);
         return $renderer->toArray();
      } // end func toArray

+ 4 - 1
main/inc/lib/pear/HTML/QuickForm/RuleRegistry.php

@@ -115,7 +115,10 @@ class HTML_QuickForm_RuleRegistry
             if (!empty($path)) {
                 include_once($path);
             }
-            $this->_rules[$class] =& new $class();
+            // Suppressing a deprecation warning on PHP 5.3
+            //$this->_rules[$class] =& new $class();
+            $this->_rules[$class] = new $class();
+            //
         }
         $this->_rules[$class]->setName($ruleName);
         return $this->_rules[$class];

+ 4 - 1
main/inc/lib/pear/HTML/QuickForm/group.php

@@ -290,7 +290,10 @@ class HTML_QuickForm_group extends HTML_QuickForm_element
     function toHtml()
     {
         include_once('HTML/QuickForm/Renderer/Default.php');
-        $renderer =& new HTML_QuickForm_Renderer_Default();
+        // Suppressing a deprecation warning on PHP 5.3
+        //$renderer =& new HTML_QuickForm_Renderer_Default();
+        $renderer = new HTML_QuickForm_Renderer_Default();
+        //
         $renderer->setElementTemplate('{element}');
         $this->accept($renderer);
         return $renderer->toHtml();

+ 14 - 4
main/inc/lib/pear/Pager/Common.php

@@ -1149,7 +1149,10 @@ class Pager_Common
     function getPerPageSelectBox($start=5, $end=30, $step=5, $showAllData=false, $extraParams=array())
     {
         require_once 'Pager/HtmlWidgets.php';
-        $widget =& new Pager_HtmlWidgets($this);
+        // Suppressing a deprecation warning on PHP 5.3
+        //$widget =& new Pager_HtmlWidgets($this);
+        $widget = new Pager_HtmlWidgets($this);
+        //
         return $widget->getPerPageSelectBox($start, $end, $step, $showAllData, $extraParams);
     }
 
@@ -1173,7 +1176,10 @@ class Pager_Common
     function getPageSelectBox($params = array(), $extraAttributes = '')
     {
         require_once 'Pager/HtmlWidgets.php';
-        $widget =& new Pager_HtmlWidgets($this);
+        // Suppressing a deprecation warning on PHP 5.3
+        //$widget =& new Pager_HtmlWidgets($this);
+        $widget = new Pager_HtmlWidgets($this);
+        //
         return $widget->getPageSelectBox($params, $extraAttributes);
     }
 
@@ -1428,8 +1434,12 @@ class Pager_Common
             session_write_close();
         }
 
-        $this->_spacesBefore = str_repeat('&nbsp;', $this->_spacesBeforeSeparator);
-        $this->_spacesAfter  = str_repeat('&nbsp;', $this->_spacesAfterSeparator);
+        // Suppressing warnings on PHP 5.3
+        //$this->_spacesBefore = str_repeat('&nbsp;', $this->_spacesBeforeSeparator);
+        //$this->_spacesAfter  = str_repeat('&nbsp;', $this->_spacesAfterSeparator);
+        $this->_spacesBefore = str_repeat('&nbsp;', intval($this->_spacesBeforeSeparator));
+        $this->_spacesAfter  = str_repeat('&nbsp;', intval($this->_spacesAfterSeparator));
+        //
 
         if (isset($_REQUEST[$this->_urlVar]) && empty($options['currentPage'])) {
             $this->_currentPage = (int)$_REQUEST[$this->_urlVar];