]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #515 from mariroz/dev
authorNicolas Lœuillet <nicolas@loeuillet.org>
Thu, 27 Feb 2014 20:23:10 +0000 (21:23 +0100)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Thu, 27 Feb 2014 20:23:10 +0000 (21:23 +0100)
fix of #509, related to php 5.3

1  2 
inc/poche/Poche.class.php

index 87c00b78c970a03fd869c8145031db0706989b3b,e13e7e1b417628264382d9d90df9efee1a7f69fc..4100f1564f1ae80942818085ba76df193a43e2c3
@@@ -366,7 -366,7 +366,7 @@@ class Poch
          // Saving and clearing context
          $REAL = array();
          foreach( $GLOBALS as $key => $value ) {
-             if( $key != "GLOBALS" && $key != "_SESSION" ) {
+             if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) {
                  $GLOBALS[$key] = array();
                  $REAL[$key] = $value;
              }
          $currentConfig['theme'] = $_POST['theme'];
          
          $_SESSION['poche_user']->setConfig($currentConfig);
 +
 +        $this->emptyCache();
          
          Tools::redirect('?view=config');
      }
          $currentConfig['language'] = $_POST['language'];
          
          $_SESSION['poche_user']->setConfig($currentConfig);
 +
 +        $this->emptyCache();
          
          Tools::redirect('?view=config');
      }