http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89555
Revision: 89555
Author: catrope
Date: 2011-06-06 09:45:48 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
1.17wmf1: MFT r89553
Modified Paths:
--------------
branches/wmf/1.17wmf1/includes/json/Services_JSON.php
Property Changed:
----------------
branches/wmf/1.17wmf1/includes/json/Services_JSON.php
Modified: branches/wmf/1.17wmf1/includes/json/Services_JSON.php
===================================================================
--- branches/wmf/1.17wmf1/includes/json/Services_JSON.php 2011-06-06
09:43:22 UTC (rev 89554)
+++ branches/wmf/1.17wmf1/includes/json/Services_JSON.php 2011-06-06
09:45:48 UTC (rev 89555)
@@ -870,7 +870,12 @@
function Services_JSON_Error($message = 'unknown error', $code
= null,
$mode = null, $options = null,
$userinfo = null)
{
-
+ $this->message = $message;
}
+
+ function __toString()
+ {
+ return $this->message;
+ }
}
}
Property changes on: branches/wmf/1.17wmf1/includes/json/Services_JSON.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf/1.16wmf4/includes/json/Services_JSON.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/branches/wmf-deployment/includes/json/Services_JSON.php:60970
+ /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf/1.16wmf4/includes/json/Services_JSON.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/branches/wmf-deployment/includes/json/Services_JSON.php:60970
/trunk/phase3/includes/json/Services_JSON.php:89553
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
