Tweak for r39314: don't add a line break before the "Go" button on the watchlist...

[lhc/web/wiklou.git] / includes / GlobalFunctions.php

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 25327e6..dabe06d 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2242,28 +2242,6 @@ function wfArrayMerge( $array1/* ... */ ) {
        return $out;
 }
 
-/**
- * Merge multiple arrays together.
- * On encountering duplicate keys, merge the two, but ONLY if they're arrays.
- * PHP's array_merge_recursive() merges ANY duplicate values into arrays,
- * which is not fun
- */
-function wfArrayDeepMerge( $array1/* ... */ ) {
-       $out = $array1;
-       for( $i=1; $i< func_num_args(); $i++ ) {
-               foreach( func_get_arg( $i ) as $key => $value ) {
-                       if ( isset($out[$key]) && is_array($out[$key]) && is_array($value) ) {
-                               $out[$key] = wfArrayDeepMerge( $out[$key], $value );
-                       } elseif ( !isset($out[$key] || !$out[$key] ) {
-                               // Values that evaluate to true given precedence, for the primary purpose of merging permissions arrays.
-                               $out[$key] = $value;
-                       }
-               }
-       }
-       
-       return $out;
-}
-
 /**
  * Make a URL index, appropriate for the el_index field of externallinks.
  */