Merge https://github.com/friendica/friendica into pull

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 89c2d7d6f992054de8e3b908f2d19ee35202c3bd..f592b4c27c5ef8145a197161c2395d9ba59ec8bc 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1414,7 +1414,9 @@ if(! function_exists('profile_load')) {
 
                $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
 
-               $_SESSION['theme'] = $a->profile['theme'];
+               if (!$profiledata)
+                       $_SESSION['theme'] = $a->profile['theme'];
+
                $_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
 
                /**