Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations

Browse source 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/UserController.php
	airtime_mvc/public/js/airtime/preferences/preferences.js
This commit is contained in:
Albert Santoni 2015-09-29 18:58:55 -04:00
commit 8b33acacd3
19 changed files with 395 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/controllers/UserController.php
View file

@ -18,7 +18,7 @@ class UserController extends Zend_Controller_Action
{
// Start the session to re-open write permission to the session so we can
// create the namespace for our csrf token verification
session_start();
SessionHelper::reopenSessionForWriting();
$CC_CONFIG = Config::getConfig();
$request = $this->getRequest();
@ -126,7 +126,8 @@ class UserController extends Zend_Controller_Action
{
Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
session_start(); //Reopen session for writing.
SessionHelper::reopenSessionForWriting();
$request = $this->getRequest();
$form = new Application_Form_EditUser();
if ($request->isPost()) {