http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70064
Revision: 70064
Author: tstarling
Date: 2010-07-28 04:22:01 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
Fixed fatal error when HTML result formats are used, due to botched merge.
Modified Paths:
--------------
branches/wmf/1.16wmf4/includes/api/ApiMain.php
Modified: branches/wmf/1.16wmf4/includes/api/ApiMain.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiMain.php 2010-07-28 04:19:33 UTC
(rev 70063)
+++ branches/wmf/1.16wmf4/includes/api/ApiMain.php 2010-07-28 04:22:01 UTC
(rev 70064)
@@ -371,7 +371,7 @@
// avoid sending public cache headers for errors.
$this->sendCacheHeaders();
- if ( $this->mPrinter->getIsHtml() &&
!$this->mPrinter->isDisabled() ) {
+ if ( $this->mPrinter->getIsHtml() ) {
echo wfReportTime();
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
