From bc395b180b1031094bb78f4b1e0bc1ea10236119 Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Sat, 4 Apr 2015 00:23:09 -0500
Subject: Remove array_intersect_key here too, definitely not needed. add to
 obsoletedfiles

---
 etc/inc/array_intersect_key.inc | 67 -----------------------------------------
 etc/pfSense.obsoletedfiles      |  1 +
 usr/local/www/xmlrpc.php        |  1 -
 3 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 etc/inc/array_intersect_key.inc

diff --git a/etc/inc/array_intersect_key.inc b/etc/inc/array_intersect_key.inc
deleted file mode 100644
index c1416ad..0000000
--- a/etc/inc/array_intersect_key.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Aidan Lister <aidan@php.net>                                |
-// +----------------------------------------------------------------------+
-//
-// $Id$
-
-
-/**
- * Replace array_intersect_key()
- *
- * @category    PHP
- * @package     PHP_Compat
- * @link        http://php.net/function.array_intersect_key
- * @author      Tom Buskens <ortega@php.net>
- * @version     $Revision$
- * @since       PHP 5.0.2
- * @require     PHP 4.0.0 (user_error)
- */
-if (!function_exists('array_intersect_key')) {
-    function array_intersect_key()
-    {
-        $args = func_get_args();
-        if (count($args) < 2) {
-            user_error(gettext('Wrong parameter count for array_intersect_key()'), E_USER_WARNING);
-            return;
-        }
-
-        // Check arrays
-        $array_count = count($args);
-        for ($i = 0; $i !== $array_count; $i++) {
-            if (!is_array($args[$i])) {
-                user_error(gettext('array_intersect_key() Argument #') .
-                    ($i + 1) . gettext(' is not an array'), E_USER_WARNING);
-                return;
-            }
-        }
-
-        // Compare entries
-        $result = array();
-        foreach ($args[0] as $key1 => $value1) {
-            for ($i = 1; $i !== $array_count; $i++) {
-                foreach ($args[$i] as $key2 => $value2) {
-                    if ((string) $key1 === (string) $key2) {
-                        $result[$key1] = $value1;
-                    }
-                }
-            }
-        }
-
-        return $result;
-    }
-}
-
-?>
diff --git a/etc/pfSense.obsoletedfiles b/etc/pfSense.obsoletedfiles
index a8a7f54..b3cbaca 100644
--- a/etc/pfSense.obsoletedfiles
+++ b/etc/pfSense.obsoletedfiles
@@ -17,6 +17,7 @@
 /etc/inc/m0n0
 /etc/inc/regdomain.inc
 /etc/inc/sysctl.inc
+/etc/inc/array_intersect_key.inc
 /etc/isdn
 /etc/locate.rc
 /etc/mail.rc
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index 87d922d..50f0687 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -43,7 +43,6 @@ require("vpn.inc");
 require("shaper.inc");
 require("xmlrpc_server.inc");
 require("xmlrpc.inc");
-require("array_intersect_key.inc");
 
 function xmlrpc_loop_detect() {
 	global $config;
-- 
cgit v1.1