r92762 MediaWiki - Code Review archive
Repository:
MediaWiki
Revision:
<
r92761
|
r92762
|
r92763
>
Date:
18:03, 21 July 2011
Author:
catrope
Status:
ok
Tags:
Comment:
Fix
r78824
after some misunderstandings in the CR comments. The querypage API module was checking for disabled status and setting the 'disabled' attribute in the output, but would then happily proceed to call doQuery() on a disabled query page.
Modified paths:
/trunk/phase3/includes/api/ApiQueryQueryPage.php
(modified) (
history
)
Diff
[
purge
]
Index: trunk/phase3/includes/api/ApiQueryQueryPage.php
—
—
@@ -97,6 +97,11 @@
98
98
}
99
99
}
100
100
$result->addValue( array( 'query' ), $this->getModuleName(), $r );
101
+
102
+ if ( $qp->isCached() && !$qp->isCacheable() ) {
103
+ // Disabled query page, don't run the query
104
+ return;
105
+ }
101
106
102
107
$res = $qp->doQuery( $params['limit'] + 1, $params['offset'] );
103
108
$count = 0;
Follow-up revisions
Revision
Commit summary
Author
Date
r93426
MFT to REL1_18...
hashar
20:20, 28 July 2011
Past revisions this follows-up on
Revision
Commit summary
Author
Date
r78824
(
bug 14869
) Add API module for accessing QueryPage-based special pages. Took ...
catrope
20:35, 22 December 2010
Status & tagging log
20:23, 28 July 2011
Hashar
(
talk
|
contribs
)
changed the
tags
for r92762
[
removed:
1.18]
18:20, 25 July 2011
Aaron Schulz
(
talk
|
contribs
)
changed the
status
of r92762
[
removed:
new
added:
ok]
18:57, 21 July 2011
Catrope
(
talk
|
contribs
)
changed the
tags
for r92762
[
added:
1.18]