aboutsummaryrefslogtreecommitdiffstats
path: root/includes/ImagePage.php
diff options
context:
space:
mode:
authorDaniel Kinzler <daniel.kinzler@wikimedia.de>2012-03-05 17:09:41 +0000
committerDaniel Kinzler <daniel.kinzler@wikimedia.de>2012-04-04 19:54:06 +0200
commitbdbe861d3472ca62e39b9c1553e92661cbb9d4ff (patch)
tree2f667c5071c8a5d4f641dfd7cbdab2e5518c6bab /includes/ImagePage.php
parentefdb25653db9abfc81591040a92a0dc2bd3aa08d (diff)
downloadmediawikicore-bdbe861d3472ca62e39b9c1553e92661cbb9d4ff.tar.gz
mediawikicore-bdbe861d3472ca62e39b9c1553e92661cbb9d4ff.zip
replacing deprecated getText, etc
Diffstat (limited to 'includes/ImagePage.php')
-rw-r--r--includes/ImagePage.php28
1 files changed, 14 insertions, 14 deletions
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index e1cc6e75f227..cd086c73d7c3 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -245,20 +245,20 @@ class ImagePage extends Article {
return $r;
}
- /**
- * Overloading Article's getContent method.
- *
- * Omit noarticletext if sharedupload; text will be fetched from the
- * shared upload server if possible.
- * @return string
- */
- public function getContent() {
- $this->loadFile();
- if ( $this->mPage->getFile() && !$this->mPage->getFile()->isLocal() && 0 == $this->getID() ) {
- return '';
- }
- return parent::getContent();
- }
+ /**
+ * Overloading Article's getContentObject method.
+ *
+ * Omit noarticletext if sharedupload; text will be fetched from the
+ * shared upload server if possible.
+ * @return string
+ */
+ public function getContentObject() {
+ $this->loadFile();
+ if ( $this->mPage->getFile() && !$this->mPage->getFile()->isLocal() && 0 == $this->getID() ) {
+ return null;
+ }
+ return parent::getContentObject();
+ }
protected function openShowImage() {
global $wgOut, $wgUser, $wgImageLimits, $wgRequest,