Merge branch 'master' into tres

Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
2015-02-05 19:38:43 -08:00
parent aafed50a0e b948fbaeda
commit 4b348d2489
45 changed files with 7847 additions and 6813 deletions
@@ -2154,6 +2154,13 @@ function get_directory_realm() {
 * @return string
 */
 function get_directory_primary() {
+
+   $dirmode = intval(get_config('system','directory_mode'));
+
+    if($dirmode == DIRECTORY_MODE_STANDALONE || $dirmode == DIRECTORY_MODE_PRIMARY) {
+		return z_root();
+    }
+
 	if($x = get_config('system', 'directory_primary'))
 		return $x;