API: Compatibility fix for 5.0.x. Define array_intersect_key if not already defined...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a7b483d..e0e635c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -123,6 +123,7 @@ Full API documentation is available at http://www.mediawiki.org/wiki/API
 * (bug 11569) Login should return the cookie prefix 
 * (bug 11632) Breaking change: Specify the type of a change in the recentchanges list
   as 'edit', 'new', 'log' instead of 0, 1, 2, respectively.
+* Compatibility fix for PHP 5.0.x.
 
 === Languages updated in 1.12 ===
 

diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index 6699707..63aaa24 100644 (file)
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -179,3 +179,30 @@ class ApiResult extends ApiBase {
        }
 }
 
+/* For compatibility with PHP versions < 5.1.0, define our own array_intersect_key function. */
+if (!function_exists('array_intersect_key')) {
+       function array_intersect_key($isec, $keys) {
+               $argc = func_num_args();
+               
+               if ($argc > 2) {
+                       for ($i = 1; !empty($isec) && $i < $argc; $i++) {
+                               $arr = func_get_arg($i);
+                               
+                               foreach (array_keys($isec) as $key) {
+                                       if (!isset($arr[$key])) 
+                                               unset($isec[$key]);
+                               }
+                       }
+                       
+                       return $isec;
+               } else {
+                       $res = array();
+                       foreach (array_keys($isec) as $key) {
+                               if (isset($keys[$key]))
+                                       $res[$key] = $isec[$key];
+                       }
+               
+                       return $res;
+               }
+       }
+}