diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-05-13 19:42:00 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-05-13 19:42:00 +0000 |
| commit | 82d3fe2e1c740d2ddc1bcb0aa8ce59d058c1e7f5 (patch) | |
| tree | d080a06593a4e096b0a911795f89296a814298f9 | |
| parent | 30d31fecd97ab0c0334ca9d81907a08ae27200a2 (diff) | |
| parent | a332c3947217b15b15c7855e41daf95c74576088 (diff) | |
| download | nextcloud-server-82d3fe2e1c740d2ddc1bcb0aa8ce59d058c1e7f5.tar.gz nextcloud-server-82d3fe2e1c740d2ddc1bcb0aa8ce59d058c1e7f5.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
| -rw-r--r-- | 3rdparty/MDB2/Schema.php | 1 | ||||
| -rw-r--r-- | lib/db.php | 3 | ||||
| -rw-r--r-- | lib/json.php | 2 |
3 files changed, 4 insertions, 2 deletions
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; } 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; 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(); } |