bug:2835

ability detect mobile theme earlier, before plugin load git-svn-id: http://piwigo.org/svn/trunk@20543 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Feb 4, 2013 · b39b4e0 · b39b4e0
1 parent 3826020
commit b39b4e0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/include/functions.inc.php b/include/functions.inc.php
@@ -1621,6 +1621,10 @@ function get_branch_from_version($version)
  */
 function get_device()
 {
+  if (session_id() == '')
+  {
+    session_start();
+  }
   $device = pwg_get_session_var('device');
 
   if (is_null($device))
@@ -1657,6 +1661,11 @@ function mobile_theme()
     return false;
   }
 
+  if (session_id() == '')
+  {
+    session_start();
+  }
+
   if (isset($_GET['mobile']))
   {
     $is_mobile_theme = get_boolean($_GET['mobile']);

diff --git a/include/user.inc.php b/include/user.inc.php
@@ -26,7 +26,10 @@
 
 if (isset($_COOKIE[session_name()]))
 {
-  session_start();
+  if (session_id() == '')
+  {
+    session_start();
+  }
   if (isset($_GET['act']) and $_GET['act'] == 'logout')
   { // logout
     logout_user();