wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Björn Schießle 2012-09-17 17:03:57 +02:00
commit 92413217b3
4 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
db_structure.xml
View file

@ -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>

1
lib/db.php
View file

@ -232,6 +232,7 @@ class OC_DB {
$dsn['database'] = $name;
} else { // use dbname for hostspec
$dsn['hostspec'] = $name;
$dsn['database'] = $user;
}
break;
}

2
settings/ajax/apps/ocs.php
View file

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

1
settings/ajax/enableapp.php
View file

@ -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. ") )));
}