Merge branch 'master' of github.com:owncloud/core

4 files changed, 14 insertions, 26 deletions

diff --git a/db_structure.xml b/db_structure.xml
index 2256dff943c..d04c838d7cd 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -76,8 +76,7 @@
    <field>
 	   <name>parent</name>
 	   <type>integer</type>
-	   <default>
-	   </default>
+	   <default>0</default>
 	   <notnull>true</notnull>
 	   <length>8</length>
    </field>
@@ -85,8 +84,7 @@
    <field>
 	   <name>name</name>
 	   <type>text</type>
-	   <default>
-	   </default>
+	   <default></default>
 	   <notnull>true</notnull>
 	   <length>300</length>
    </field>
@@ -94,8 +92,7 @@
    <field>
 	   <name>user</name>
 	   <type>text</type>
-	   <default>
-	   </default>
+	   <default></default>
 	   <notnull>true</notnull>
 	   <length>64</length>
    </field>
@@ -103,7 +100,7 @@
    <field>
     <name>size</name>
     <type>integer</type>
-    <default></default>
+    <default>0</default>
     <notnull>true</notnull>
     <length>8</length>
    </field>
@@ -111,8 +108,7 @@
    <field>
 	   <name>ctime</name>
 	   <type>integer</type>
-	   <default>
-	   </default>
+	   <default>0</default>
 	   <notnull>true</notnull>
 	   <length>8</length>
    </field>
@@ -120,8 +116,7 @@
    <field>
 	   <name>mtime</name>
 	   <type>integer</type>
-	   <default>
-	   </default>
+	   <default>0</default>
 	   <notnull>true</notnull>
 	   <length>8</length>
    </field>
@@ -129,8 +124,7 @@
    <field>
 	   <name>mimetype</name>
 	   <type>text</type>
-	   <default>
-	   </default>
+	   <default></default>
 	   <notnull>true</notnull>
 	   <length>96</length>
    </field>
@@ -138,8 +132,7 @@
    <field>
 	   <name>mimepart</name>
 	   <type>text</type>
-	   <default>
-	   </default>
+	   <default></default>
 	   <notnull>true</notnull>
 	   <length>32</length>
    </field>
@@ -322,7 +315,6 @@
    <field>
     <name>timeout</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <unsigned>true</unsigned>
     <length>4</length>
@@ -331,7 +323,6 @@
    <field>
     <name>created</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <length>8</length>
    </field>
@@ -347,7 +338,6 @@
    <field>
     <name>scope</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <length>1</length>
    </field>
@@ -355,7 +345,6 @@
    <field>
     <name>depth</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <length>1</length>
    </field>
@@ -469,7 +458,7 @@
    <field>
     <name>share_type</name>
     <type>integer</type>
-    <default></default>
+    <default>0</default>
     <notnull>true</notnull>
     <length>1</length>
    </field>
@@ -493,7 +482,6 @@
    <field>
     <name>parent</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <length>4</length>
    </field>
@@ -525,7 +513,6 @@
    <field>
     <name>file_source</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <length>4</length>
    </field>
@@ -541,7 +528,7 @@
    <field>
     <name>permissions</name>
     <type>integer</type>
-    <default></default>
+    <default>0</default>
     <notnull>true</notnull>
     <length>1</length>
    </field>
@@ -549,7 +536,7 @@
    <field>
     <name>stime</name>
     <type>integer</type>
-    <default></default>
+    <default>0</default>
     <notnull>true</notnull>
     <length>8</length>
    </field>
@@ -565,7 +552,6 @@
    <field>
     <name>expiration</name>
     <type>timestamp</type>
-    <default></default>
     <notnull>false</notnull>
    </field>
    
diff --git a/lib/db.php b/lib/db.php
index 4d8e5a1a868..9c10512350f 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -232,6 +232,7 @@ class OC_DB {
 						$dsn['database'] = $name;
 					} else { // use dbname for hostspec
 						$dsn['hostspec'] = $name;
+						$dsn['database'] = $user;
 					}
 					break;
 			}
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 71cb046fc8d..b47a67c13bb 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -11,7 +11,7 @@ require_once '../../../lib/base.php';
 
 OC_JSON::checkAdminUser();
 
-$l = OC_L10N::get('core');
+$l = OC_L10N::get('settings');
 
 if(OC_Config::getValue('appstoreenabled', true)==false) {
 	OCP\JSON::success(array('type' => 'external', 'data' => array()));
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 1075a9a433c..c3b3491db93 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -10,5 +10,6 @@ $appid = OC_App::enable($_POST['appid']);
 if($appid !== false) {
 	OC_JSON::success(array('data' => array('appid' => $appid)));
 } else {
+	$l = OC_L10N::get('settings');	
 	OC_JSON::error(array("data" => array( "message" => $l->t("Could not enable app. ") )));
 }