summaryrefslogtreecommitdiffstats
path: root/lib/app.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/app.php')
-rw-r--r--lib/app.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/app.php b/lib/app.php
index c6f6e92e60e..f974dd9f594 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -174,7 +174,8 @@ class OC_App{
$apps=array('files');
$sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
.' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'';
- if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack
+ if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') {
+ //FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
$sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
.' WHERE `configkey` = \'enabled\' AND to_char(`configvalue`)=\'yes\'';
}
@@ -348,7 +349,8 @@ class OC_App{
$settings = array();
// by default, settings only contain the help menu
- if(OC_Config::getValue('knowledgebaseenabled', true)==true) {
+ if(OC_Util::getEditionString() === '' &&
+ OC_Config::getValue('knowledgebaseenabled', true)==true) {
$settings = array(
array(
"id" => "help",