summaryrefslogtreecommitdiff
path: root/includes/api/ApiMain.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/api/ApiMain.php')
-rw-r--r--includes/api/ApiMain.php4
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();