From 19ab1292fbc8ee60ecd77bfbe521d3449db25694 Mon Sep 17 00:00:00 2001
From: Thibaut GRIDEL <tgridel@free.fr>
Date: Sun, 2 May 2010 11:24:46 +0200
Subject: [PATCH] simple fixes
---
inc/lib_base.php | 10 +---------
index.php | 3 ---
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/inc/lib_base.php b/inc/lib_base.php
index 52b9aeedd4a..0661f732041 100755
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
@@ -51,7 +51,7 @@ $CONFIG_DBNAME='owncloud';
$CONFIG_DBTYPE='sqlite';
// include the generated configfile
-@oc_include_once('config.php');
+@include_once($SERVERROOT.'/config/config.php');
// redirect to https site if configured
if(isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL){
@@ -477,8 +477,6 @@ function oc_require($file){
require($SERVERROOT.'/'.$file);
}elseif(is_file($SERVERROOT.'/inc/'.$file)){
require($SERVERROOT.'/inc/'.$file);
- }elseif(is_file($SERVERROOT.'/config/'.$file)){
- require($SERVERROOT.'/config/'.$file);
}
}
@@ -501,8 +499,6 @@ function oc_require_once($file){
require_once($SERVERROOT.'/'.$file);
}elseif(is_file($SERVERROOT.'/inc/'.$file)){
require_once($SERVERROOT.'/inc/'.$file);
- }elseif(is_file($SERVERROOT.'/config/'.$file)){
- require_once($SERVERROOT.'/config/'.$file);
}
}
@@ -525,8 +521,6 @@ function oc_include($file){
include($SERVERROOT.'/'.$file);
}elseif(is_file($SERVERROOT.'/inc/'.$file)){
include($SERVERROOT.'/inc/'.$file);
- }elseif(is_file($SERVERROOT.'/config/'.$file)){
- include($SERVERROOT.'/config/'.$file);
}
}
@@ -549,8 +543,6 @@ function oc_include_once($file){
include_once($SERVERROOT.'/'.$file);
}elseif(is_file($SERVERROOT.'/inc/'.$file)){
include_once($SERVERROOT.'/inc/'.$file);
- }elseif(is_file($SERVERROOT.'/config/'.$file)){
- include_once($SERVERROOT.'/config/'.$file);
}
}
diff --git a/index.php b/index.php
index e755ab86237..52013d108ea 100755
--- a/index.php
+++ b/index.php
@@ -28,9 +28,6 @@ if(isset($_GET['dir'])) $dir=$_GET['dir']; else $dir='';
if(isset($_GET['file'])) {
OC_FILES::get($dir,$_GET['file']);
-OC_FILES::get($dir,$_GET['file']);
-OC_FILES::get($dir,$_GET['file']);
-echo('heya');
}else{
OC_UTIL::addscript('js/ajax.js');
--
GitLab