[xoops-svn] SF.net SVN: xoops-svn:[12042] XoopsCore/branches/2.5.x/2.5.7

[<be...@us...>]

Revision: 12042
          http://sourceforge.net/p/xoops/svn/12042
Author:   beckmi
Date:     2013-09-14 15:28:17 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
ID: 1285 check if session exists before attempting to start a new one (wishcraft)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2013-09-14 14:06:17 UTC (rev 12041)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2013-09-14 15:28:17 UTC (rev 12042)
@@ -5,6 +5,10 @@
 ===============================
 Bugfixes:
 - ID: 1269  Block template file will not updated after update the module (Irmtfan)
+- ID: 1143 (old ID 430840)  class/module.errorhandler.php (uberrookie/zyspec)
+- ID: 1287 assigning "static" to various class methods (wishcraft/mamba)
+- ID: 1285 check if session exists before attempting to start a new one (wishcraft)
+
 - reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
 - removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
 - added missing "`" in upgrade from 2.0.18 to 2.3.0 (mamba)
@@ -13,13 +17,11 @@
 - fixed wrong return icon in Smarty xoModuleIcons32
 - fixed issue with jGrows in xoops.css (xoobaru/tarik)
 - fix for deprecated "preg_replace/e" function in PHP 5.5 (mamba)
-- ID: 1143 (old ID 430840)  class/module.errorhandler.php (uberrookie/zyspec)
 - added: check if 'date.timezone' is set in php.ini, if not, set it to UTC (cesag/mamba)
 - assigned _SHORTDATESTRING to _CAL_FORMAT to have consistency in local languages (jcweb/guspel)
 - fixed bug in calendar.js (mamba)
 - added link to Module's Admin after "Update" (currently only to XOOPS Modules section) (mamba)
 - added placeholder for a link to upload test data, if available after installation (mamba)
-- assigning "static" to various class methods (mamba)
 - solved bug into PM module readpmsg.php (escrime-info/slider84)
 - fixed missing check on variable in userinfo.php (cesag/mamba) 
 - replaced extract($_POST) in /include/comment_delete.php with filters (mamba) 

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2013-09-14 14:06:17 UTC (rev 12041)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2013-09-14 15:28:17 UTC (rev 12042)
@@ -200,8 +200,11 @@
                          array(&$sess_handler, 'write'),
                          array(&$sess_handler, 'destroy'),
                          array(&$sess_handler, 'gc'));
-session_start();
 
+if (strlen(session_id()) == 0) {
+    session_start();
+}
+
 /**
  * Remove expired session for xoopsUserId
  */