Rename DBA::esc_array to DBA::escapeArray

- Rename internal method DBA::esc_array_callback to
DBA::escapeArrayCallback

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index a7fbc2792aa779485e75a3f6362f714c424a0951..5c7e2adf54182acb79b02a315e1c59fff3ef2b98 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -129,7 +129,7 @@ function dfrn_request_post(App $a)
                                        $photo = $parms["photo"];
 
                                        // Escape the entire array
-                                       DBA::esc_array($parms);
+                                       DBA::escapeArray($parms);
 
                                        // Create a contact record on our site for the other person
                                        $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
@@ -371,7 +371,7 @@ function dfrn_request_post(App $a)
                                $parms['issued-id'] = $issued_id;
                                $photo = $parms["photo"];
 
-                               DBA::esc_array($parms);
+                               DBA::escapeArray($parms);
                                $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
                                        `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` )
                                        VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index ecba9f2eeb93a8d8e354cd27ec1403c6e8aac6de..8e5a621b3689819f93ec021506716debf7f6561e 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -1604,7 +1604,7 @@ class DBA
         * @param boolean $add_quotation add quotation marks for string values
         * @return void
         */
-       private static function esc_array_callback(&$value, $key, $add_quotation)
+       private static function escapeArrayCallback(&$value, $key, $add_quotation)
        {
                if (!$add_quotation) {
                        if (is_bool($value)) {
@@ -1631,8 +1631,8 @@ class DBA
         * @param boolean $add_quotation add quotation marks for string values
         * @return void
         */
-       public static function esc_array(&$arr, $add_quotation = false)
+       public static function escapeArray(&$arr, $add_quotation = false)
        {
-               array_walk($arr, 'self::esc_array_callback', $add_quotation);
+               array_walk($arr, 'self::escapeArrayCallback', $add_quotation);
        }
 }