MDL-41908 QuickForm: Fix PEAR Non-static method error

[moodle.git] / lib / pear / HTML / QuickForm.php

diff --git a/lib/pear/HTML/QuickForm.php b/lib/pear/HTML/QuickForm.php
index af116b2..6da6ff4 100644 (file)
--- a/lib/pear/HTML/QuickForm.php
+++ b/lib/pear/HTML/QuickForm.php
@@ -600,7 +600,8 @@ class HTML_QuickForm extends HTML_Common {
         } else {
             $args = func_get_args();
             $elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1));
         } else {
             $args = func_get_args();
             $elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1));

-            if (@PEAR::isError($elementObject)) {
+            $pear = new PEAR();
+            if ($pear->isError($elementObject)) {

                 return $elementObject;
             }
         }
                 return $elementObject;
             }
         }


@@ -1875,7 +1876,8 @@ class HTML_QuickForm extends HTML_Common {
             }
             foreach ($elementList as $elementName) {
                 $value = $this->exportValue($elementName);
             }
             foreach ($elementList as $elementName) {
                 $value = $this->exportValue($elementName);

-                if (PEAR::isError($value)) {
+                $pear = new PEAR();
+                if ($pear->isError($value)) {

                     return $value;
                 }
                 $values[$elementName] = $value;
                     return $value;
                 }
                 $values[$elementName] = $value;