[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-48-g83c14ba

[David Prévot]

The following commit has been merged in the master branch:
commit 83c14baeec9224f52d0dc1726016ecbfbcd073b9
Author: David Prévot <taffit at debian.org>
Date:   Mon Mar 25 22:49:37 2013 -0400

    Fix more OC::$SERVERROOT…/config

diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index 34634af..37b56b8 100644
--- a/debian/patches/01_fix_data_path.diff
+++ b/debian/patches/01_fix_data_path.diff
@@ -8,7 +8,7 @@ Author: Thomas Mueller <thomas.mueller at tmit.eu>
 Bug-Debian: http://bugs.debian.org/648674
 Forwarded: not-needed
 Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-03-24
+Last-Update: 2013-03-25
 
 --- a/lib/config.php
 +++ b/lib/config.php
@@ -109,6 +109,15 @@ Last-Update: 2013-03-24
              //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
 --- a/lib/base.php
 +++ b/lib/base.php
+@@ -200,7 +200,7 @@
+ 		// set the right include path
+ 		set_include_path(
+ 			OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
+-				OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
++				'/etc/owncloud' . PATH_SEPARATOR .
+ 				OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
+ 				implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
+ 				get_include_path() . PATH_SEPARATOR .
 @@ -209,8 +209,8 @@
  	}
  

-- 
owncloud.git