Merge branch 'saas-dev' into saas-dev-publishing
Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/plugins/Acl_plugin.php
This commit is contained in:
commit
12f6536e74
32 changed files with 4672 additions and 326 deletions
|
@ -113,6 +113,9 @@ final class TaskManager {
|
|||
* otherwise false
|
||||
*/
|
||||
private function _isUserSessionRequest() {
|
||||
if (!Zend_Session::isStarted()) {
|
||||
return false;
|
||||
}
|
||||
$auth = Zend_Auth::getInstance();
|
||||
$data = $auth->getStorage()->read();
|
||||
return !empty($data);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue