From ccff07a8196135b93f7ab1116362ab278c2c729b Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Mon, 8 Jul 2013 16:55:34 +0000 Subject: [PATCH] Patch Services_JSON to use the proper function name and avoid a fatal error. see #24210. git-svn-id: http://core.svn.wordpress.org/trunk@24587 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-json.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/class-json.php b/wp-includes/class-json.php index 1e8588db14..417592fb88 100644 --- a/wp-includes/class-json.php +++ b/wp-includes/class-json.php @@ -492,7 +492,7 @@ class Services_JSON return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' - : new Services_JSON_Error(class_name($var). + : new Services_JSON_Error(get_class($var). " toJSON returned an object with a toJSON method."); } @@ -933,4 +933,4 @@ if (class_exists('PEAR_Error')) { } -endif; \ No newline at end of file +endif;