sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:owncloud/owncloud

remotes/origin/stable4
Tom Needham 2012-05-13 19:42:00 +07:00
parent 30d31fecd9 a332c39472
commit 82d3fe2e1c
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/MDB2/Schema.php vendored
Unescape Escape View File

@ -644,6 +644,7 @@ class MDB2_Schema extends PEAR
if (PEAR::isError($result)) { if (PEAR::isError($result)) {
return $result; return $result;
} }
$database_definition['tables'][$table_name]=$table_definition;
} }

3
lib/db.php
Unescape Escape View File

@ -395,7 +395,8 @@ class OC_DB {
if (PEAR::isError($op)) { if (PEAR::isError($op)) {
$error = $op->getMessage(); $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 false;
} }
return true; return true;

2
lib/json.php
Unescape Escape View File

@ -73,7 +73,7 @@ class OC_JSON{
* Encode and print $data in json format * Encode and print $data in json format
*/ */
public static function encodedPrint($data,$setContentType=true){ public static function encodedPrint($data,$setContentType=true){
if(!isset($_SERVER['PATH_INFO'])) { if(!isset($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '') {
if($setContentType){ if($setContentType){
self::setContentTypeHeader(); self::setContentTypeHeader();
} }