https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112754
Revision: 112754
Author: reedy
Date: 2012-03-01 01:21:55 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
MFT r112751
Prequisite to poking further:
2 PHP Warning: get_object_vars() expects parameter 1 to be object, null given
in
/usr/local/apache/common-local/php-1.19/extensions/CategoryTree/CategoryTreeFunctions.php
on line 201
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/CategoryTree/CategoryTreeFunctions.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/CategoryTree/
branches/wmf/1.19wmf1/extensions/CategoryTree/CategoryTreeFunctions.php
Property changes on: branches/wmf/1.19wmf1/extensions/CategoryTree
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JSTesting/extensions/CategoryTree:100352-107913
/branches/REL1_15/phase3/extensions/CategoryTree:51646
/branches/REL1_17/phase3/extensions/CategoryTree:81445,81448
/branches/new-installer/phase3/extensions/CategoryTree:43664-66004
/branches/sqlite/extensions/CategoryTree:58211-58321
/branches/wmf/1.18wmf1/extensions/CategoryTree:97508
/trunk/extensions/CategoryTree:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112613,112628,112751
/trunk/phase3/extensions/CategoryTree:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Modified:
branches/wmf/1.19wmf1/extensions/CategoryTree/CategoryTreeFunctions.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/CategoryTree/CategoryTreeFunctions.php
2012-03-01 01:21:20 UTC (rev 112753)
+++ branches/wmf/1.19wmf1/extensions/CategoryTree/CategoryTreeFunctions.php
2012-03-01 01:21:55 UTC (rev 112754)
@@ -166,25 +166,11 @@
$outputPage->addModules( 'ext.categoryTree' );
}
- /**
- * @return Services_JSON
- */
- static function getJsonCodec() {
- static $json = null;
-
- if ( !$json ) {
- $json = new Services_JSON(); # recycle API's JSON codec
implementation
- }
-
- return $json;
- }
-
static function encodeOptions( $options, $enc ) {
if ( $enc == 'mode' || $enc == '' ) {
$opt = $options['mode'];
} elseif ( $enc == 'json' ) {
- $json = self::getJsonCodec(); // XXX: this may be a bit
heavy...
- $opt = $json->encode( $options );
+ $opt = FormatJson::encode( $options );
} else {
throw new MWException( 'Unknown encoding for
CategoryTree options: ' . $enc );
}
@@ -196,8 +182,7 @@
if ( $enc == 'mode' || $enc == '' ) {
$opt = array( "mode" => $options );
} elseif ( $enc == 'json' ) {
- $json = self::getJsonCodec(); // XXX: this may be a bit
heavy...
- $opt = $json->decode( $options );
+ $opt = FormatJson::decode( $options );
$opt = get_object_vars( $opt );
} else {
throw new MWException( 'Unknown encoding for
CategoryTree options: ' . $enc );
Property changes on:
branches/wmf/1.19wmf1/extensions/CategoryTree/CategoryTreeFunctions.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/wmf/1.16wmf4/extensions/CategoryTree/CategoryTreeFunctions.php:67183
+
/branches/wmf/1.16wmf4/extensions/CategoryTree/CategoryTreeFunctions.php:67183
/trunk/extensions/CategoryTree/CategoryTreeFunctions.php:112751
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
