Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events

This commit is contained in:
Michael Vogel 2015-09-29 10:35:50 +02:00
commit 6e981ed798
38 changed files with 8475 additions and 7958 deletions

View file

@ -129,7 +129,7 @@ function nav_info(&$a) {
$gdirpath = 'directory';
if(strlen(get_config('system','singleuser'))) {
$gdir = dirname(get_config('system','directory_submit_url'));
$gdir = get_config('system','directory');
if(strlen($gdir))
$gdirpath = $gdir;
}