From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 25 Aug 2007 19:22:51 +0000 (+0000)
Subject: *oi_metadata can't be null. Some fa_metadata values are NULL since there was not... 
X-Git-Tag: 1.31.0-rc.0~51664
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=213a7d1ded014da18429bfcf34893aea22d4142e;p=lhc%2Fweb%2Fwiklou.git

*oi_metadata can't be null. Some fa_metadata values are NULL since there was not always an oi_metadata to use for insertion.
---

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index cff948de4e..6edc034f41 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -1474,7 +1474,7 @@ class LocalFileRestoreBatch {
 					'oi_user'         => $row->fa_user,
 					'oi_user_text'    => $row->fa_user_text,
 					'oi_timestamp'    => $row->fa_timestamp,
-					'oi_metadata'     => $row->fa_metadata,
+					'oi_metadata'     => is_null($row->fa_metadata) ? '' : $row->fa_metadata,
 					'oi_media_type'   => $row->fa_media_type,
 					'oi_major_mime'   => $row->fa_major_mime,
 					'oi_minor_mime'   => $row->fa_minor_mime,