[Pkg-owncloud-commits] [owncloud] 166/273: Add bak defaultapp setting

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 894d69184abc78750160d4818412e45fdc22a81b
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Tue Jul 1 14:28:45 2014 +0200

    Add bak defaultapp setting
---
 lib/private/util.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/private/util.php b/lib/private/util.php
index 7836489..424c27e 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -827,7 +827,9 @@ class OC_Util {
 			if ($defaultPage) {
 				$location = $urlGenerator->getAbsoluteURL($defaultPage);
 			} else {
-				$location = $urlGenerator->getAbsoluteURL('/index.php/apps/files');
+				$defaultApp = \OCP\Config::getSystemValue('defaultapp', 'files');
+				$defaultApp = OC_App::cleanAppId(strip_tags($defaultApp));
+				$location = $urlGenerator->getAbsoluteURL('/index.php/apps/' . $defaultApp);
 			}
 		}
 		OC_Log::write('core', 'redirectToDefaultPage: '.$location, OC_Log::DEBUG);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git