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

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;
 
         }
 

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;

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();
 			}