dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Use OutputPage::wrapWikiTextAsInterface() to add safe <div> wrappers"
[lhc/web/wiklou.git]
/
includes
/
page
/
ImagePage.php
diff --git
a/includes/page/ImagePage.php
b/includes/page/ImagePage.php
index
5382c55
..
c879a88
100644
(file)
--- a/
includes/page/ImagePage.php
+++ b/
includes/page/ImagePage.php
@@
-86,18
+86,15
@@
class ImagePage extends Article {
$this->repo = $img->getRepo();
}
$this->repo = $img->getRepo();
}
- /**
- * Handler for action=render
- * Include body text only; none of the image extras
- */
- public function render() {
- $this->getContext()->getOutput()->setArticleBodyOnly( true );
- parent::view();
- }
-
public function view() {
global $wgShowEXIF;
public function view() {
global $wgShowEXIF;
+ // For action=render, include body text only; none of the image extras
+ if ( $this->viewIsRenderAction ) {
+ parent::view();
+ return;
+ }
+
$out = $this->getContext()->getOutput();
$request = $this->getContext()->getRequest();
$diff = $request->getVal( 'diff' );
$out = $this->getContext()->getOutput();
$request = $this->getContext()->getRequest();
$diff = $request->getVal( 'diff' );