Bladeren bron

Fixing PHP warnings due arrayMerge

Julio Montoya 12 jaren geleden
bovenliggende
commit
63cd87d023
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1 1
      main/inc/lib/pear/HTML/QuickForm.php

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

@@ -1334,7 +1334,7 @@ class HTML_QuickForm extends HTML_Common
     * @param    array   $b  array which will be merged into first one
     * @param    array   $b  array which will be merged into first one
     * @return   array   merged array
     * @return   array   merged array
     */
     */
-    function arrayMerge($a, $b)
+    static function arrayMerge($a, $b)
     {
     {
         foreach ($b as $k => $v) {
         foreach ($b as $k => $v) {
             if (is_array($v)) {
             if (is_array($v)) {