From 062befd1fc90b6c9b6ac835a3d4babce6d8f8c81 Mon Sep 17 00:00:00 2001
From: irgsmirx <tobias.ramforth@udo.edu>
Date: Mon, 11 Feb 2013 20:28:36 +0100
Subject: Update lib/files/cache/legacy.php

Fixing a bug that occurs when trying to update a non-existent 'fscache' table in the database - if unfixed upgrading does not succeed.

Unfortunately I could not get a call to PEAR::isError working. That is why I check for the existence of a property present in class MDB2_Error.
---
 lib/files/cache/legacy.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php
index 33d4b8e7c9f..6d1ffa7b40b 100644
--- a/lib/files/cache/legacy.php
+++ b/lib/files/cache/legacy.php
@@ -51,6 +51,12 @@ class Legacy {
 			$this->cacheHasItems = false;
 			return false;
 		}
+		
+		if ($result === false || property_exists($result, 'error_message_prefix')) {
+			$this->cacheHasItems = false;
+			return false;
+		}		
+		
 		$this->cacheHasItems = (bool)$result->fetchRow();
 		return $this->cacheHasItems;
 	}
-- 
cgit v1.2.3