diff options
| author | rvelices <rv-github@modusoptimus.com> | 2013-02-07 05:43:44 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2013-02-07 05:43:44 +0000 |
| commit | f66a624576e25d5b13514d3217691fb6657ec5f4 (patch) | |
| tree | ba78329274ab5f7ac625b3053b44d69fca55a9fb | |
| parent | 7956ce1d42f1f7417cc7ccd1f08f434741faff0a (diff) | |
start the php session before loading plugins in a standard manner (related to bug 2835: )
git-svn-id: http://piwigo.org/svn/trunk@20599 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/common.inc.php | 1 | ||||
| -rw-r--r-- | include/functions.inc.php | 9 | ||||
| -rw-r--r-- | include/user.inc.php | 9 |
3 files changed, 1 insertions, 18 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index 46d11e4e4..2891c40e4 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -133,6 +133,7 @@ if (!$conf['check_upgrade_feed']) 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 index 5296288ae..bcbab6ad1 100644 --- 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 index 69d6af692..60117e776 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -26,10 +26,6 @@ $user['id'] = $conf['guest_id']; 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 @@ if ( $user['id']==$conf['guest_id'] ) auto_login(); } -if (session_id()=="") -{ - session_start(); -} - // using Apache authentication override the above user search if ($conf['apache_authentication']) { |