From: Reedy <reedy@wikimedia.org>
Date: Tue, 7 Jan 2014 20:04:14 +0000 (+0000)
Subject: Call to a member function getCommonMetaArray() on a non-object at
X-Git-Tag: 1.31.0-rc.0~17340
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=785b888a2217c92db303f3e08b92e8f5bb046765;p=lhc%2Fweb%2Fwiklou.git

Call to a member function getCommonMetaArray() on a non-object at
File.php on line 586

Bug: 59785
Change-Id: I7163f3fd122922a28519b7cb1d3d4cd4b81165ee
---

diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index dc35016d1f..c9e435e5a1 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -583,6 +583,9 @@ abstract class File {
 	public function getCommonMetaArray() {
 		$handler = $this->getHandler();
 
+		if ( !$handler ) {
+			return false;
+		}
 		return $handler->getCommonMetaArray( $this );
 	}