From 8d475debe0acbca99d92c492b08aee9b3ea05979 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 13 May 2012 21:21:39 +0200 Subject: [PATCH 1/3] additional logging when db upgrade fails --- lib/db.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/db.php b/lib/db.php index 9899f30e75c..9f951d645e4 100644 --- a/lib/db.php +++ b/lib/db.php @@ -395,7 +395,8 @@ class OC_DB { if (PEAR::isError($op)) { $error = $op->getMessage(); - OC_Log::write('core','Failed to update database structure ('.$error.')',OC_Log::FATAL); + $detail = $op->getDebugInfo(); + OC_Log::write('core','Failed to update database structure ('.$error.', '.$detail.')',OC_Log::FATAL); return false; } return true; From 6b6477a90a2fc9b8129ff42f1023b2252e65b5a5 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 13 May 2012 21:22:08 +0200 Subject: [PATCH 2/3] fix getting the db scheme from existing database --- 3rdparty/MDB2/Schema.php | 1 + 1 file changed, 1 insertion(+) diff --git a/3rdparty/MDB2/Schema.php b/3rdparty/MDB2/Schema.php index c5ae69d69c4..5eeb97b055b 100644 --- a/3rdparty/MDB2/Schema.php +++ b/3rdparty/MDB2/Schema.php @@ -644,6 +644,7 @@ class MDB2_Schema extends PEAR if (PEAR::isError($result)) { return $result; } + $database_definition['tables'][$table_name]=$table_definition; } From a332c3947217b15b15c7855e41daf95c74576088 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 13 May 2012 15:26:05 -0400 Subject: [PATCH 3/3] Check if path_info is empty as well, fixes bug oc-632. Thanks to die3lustigen2. --- lib/json.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/json.php b/lib/json.php index 6782bad8bb7..f3bbe9ac899 100644 --- a/lib/json.php +++ b/lib/json.php @@ -73,7 +73,7 @@ class OC_JSON{ * Encode and print $data in json format */ public static function encodedPrint($data,$setContentType=true){ - if(!isset($_SERVER['PATH_INFO'])) { + if(!isset($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '') { if($setContentType){ self::setContentTypeHeader(); }