Merge branch 'master' into tres

Conflicts:
	view/css/mod_events.css
	view/theme/redbasic/css/style.css

1 files changed, 7 insertions, 0 deletions

diff --git a/boot.php b/boot.php
index cb20e2ad7..98f2cb378 100755
--- a/boot.php
+++ b/boot.php
@@ -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;