Merge lp:~porten-deactivatedaccount/eventum/devel into lp:eventum

[Harri Porten]

We found the following notices in our Apache log:

  PHP Notice: A session had already been started - ignoring session_start() in /var/www/eventum-2.3.0/lib/eventum/class.session.php on line 87

So we changed the logic to avoid repeated calls. We were the only one to see this? Maybe others have Notices disabled in their production system?

[Elan Ruusamäe (glen666)]

Nah, I've seen it too my my logs, just never bothered to find and fix it :)

=== modified file 'lib/eventum/class.session.php'
--- lib/eventum/class.session.php	2010-08-26 19:08:48 +0000
+++ lib/eventum/class.session.php	2011-01-26 20:58:25 +0000
@@ -108,12 +108,12 @@
      */
     function verify($usr_id)
     {
-        session_start();
-
         // Don't check the IP of the session, since this caused problems for users that use a proxy farm that uses
         // a different IP address each page load.
         if (!self::is_set('usr_id')) {
             self::init($usr_id);
+        } else {
+            session_start();
         }
     }