[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.4+dfsg-1-1-g0e83770

[David Prévot]

The following commit has been merged in the master branch:
commit 0e8377051ffcd272bbe054b55d9b8f9754b52b83
Author: David Prévot <taffit at debian.org>
Date:   Wed Apr 10 19:24:27 2013 -0400

    Fix more path occurrences

diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index ed30596..9790c21 100644
--- a/debian/patches/01_fix_data_path.diff
+++ b/debian/patches/01_fix_data_path.diff
@@ -234,6 +234,15 @@ Last-Update: 2013-04-10
  
  		// do nothing if the connection already has been established
  		if(!self::$PDO) {
+@@ -227,7 +227,7 @@
+ 		$pass = OC_Config::getValue( "dbpassword", "" );
+ 		$type = OC_Config::getValue( "dbtype", "sqlite" );
+ 		$SERVERROOT=OC::$SERVERROOT;
+-		$datadir=OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
++		$datadir=OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" );
+ 
+ 		// do nothing if the connection already has been established
+ 		if(!self::$MDB2) {
 --- a/lib/files/filesystem.php
 +++ b/lib/files/filesystem.php
 @@ -221,18 +221,18 @@
@@ -307,3 +316,25 @@ Last-Update: 2013-04-10
  			if (!file_exists($target)){
  				copy($configFile, $target);
  			}
+--- a/apps/files_external/lib/config.php
++++ b/apps/files_external/lib/config.php
+@@ -307,8 +307,8 @@
+ 			$phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php';
+ 			$jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json';
+ 		} else {
+-			$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
+-			$phpFile = OC::$SERVERROOT.'/config/mount.php';
++			$datadir = \OC_Config::getValue("datadirectory", "/var/lib/owncloud/data");
++			$phpFile = '/etc/owncloud/mount.php';
+ 			$jsonFile = $datadir . '/mount.json';
+ 		}
+ 		if (is_file($jsonFile)) {
+@@ -334,7 +334,7 @@
+ 		if ($isPersonal) {
+ 			$file = OC_User::getHome(OCP\User::getUser()).'/mount.json';
+ 		} else {
+-			$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
++			$datadir = \OC_Config::getValue("datadirectory", "/var/lib/owncloud/data");
+ 			$file = $datadir . '/mount.json';
+ 		}
+ 		$content = json_encode($data);

-- 
owncloud.git