start the php session before loading plugins in a standard manner (re…

…lated to bug 2835: ) git-svn-id: http://piwigo.org/svn/trunk@20599 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Feb 7, 2013 · f66a624 · f66a624
1 parent 7956ce1
commit f66a624
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/include/common.inc.php b/include/common.inc.php
@@ -133,6 +133,7 @@ function sanitize_mysql_kv(&$v, $k)
 
 ImageStdParams::load_from_db();
 
+session_start();
 load_plugins();
 
 // users can have defined a custom order pattern, incompatible with GUI form

diff --git a/include/functions.inc.php b/include/functions.inc.php
@@ -1621,10 +1621,6 @@ function get_branch_from_version($version)
  */
 function get_device()
 {
-  if (session_id() == '')
-  {
-    session_start();
-  }
   $device = pwg_get_session_var('device');
 
   if (is_null($device))
@@ -1661,11 +1657,6 @@ 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,10 +26,6 @@
 
 if (isset($_COOKIE[session_name()]))
 {
-  if (session_id() == '')
-  {
-    session_start();
-  }
   if (isset($_GET['act']) and $_GET['act'] == 'logout')
   { // logout
     logout_user();
@@ -47,11 +43,6 @@
   auto_login();
 }
 
-if (session_id()=="")
-{
-  session_start();
-}
-
 // using Apache authentication override the above user search
 if ($conf['apache_authentication'])
 {