diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2008-12-15 18:02:47 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2008-12-15 18:02:47 +0100 |
| commit | 396b28f3d881f5debd888ba9bb9b47c2d478a76f (patch) | |
| tree | 10d6e1a721ee4ef69def34a57f02d7eb3fc9e31e /includes/api/ApiMain.php | |
| parent | 0be4d3ccf6c4fe98a72704f9463ecdea2ee5e615 (diff) | |
update to Mediawiki 1.13.3; some cleanups
Diffstat (limited to 'includes/api/ApiMain.php')
| -rw-r--r-- | includes/api/ApiMain.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index cce4c3e7..2d0e278c 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -403,7 +403,7 @@ class ApiMain extends ApiBase { * tell the printer not to escape ampersands so that our links do * not break. */ $printer->setUnescapeAmps ( ( $this->mAction == 'help' || $isError ) - && $this->getParameter('format') == ApiMain::API_DEFAULT_FORMAT ); + && $printer->getFormat() == 'XML' && $printer->getIsHtml() ); $printer->initPrinter($isError); @@ -603,7 +603,7 @@ class ApiMain extends ApiBase { public function getVersion() { $vers = array (); $vers[] = 'MediaWiki ' . SpecialVersion::getVersion(); - $vers[] = __CLASS__ . ': $Id: ApiMain.php 37349 2008-07-08 20:53:41Z catrope $'; + $vers[] = __CLASS__ . ': $Id: ApiMain.php 44569 2008-12-14 08:31:04Z tstarling $'; $vers[] = ApiBase :: getBaseVersion(); $vers[] = ApiFormatBase :: getBaseVersion(); $vers[] = ApiQueryBase :: getBaseVersion(); |