From cdfd3a3d53b88ccb2729d9557a7d65ee856b0e65 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Tue, 11 Oct 2016 18:00:08 +0200
Subject: [PATCH] dev #47780 Bokeh startup refactoring
---
cosmogramme/cosmozend/index.php | 1 -
cosmogramme/cosmozend/tests/bootstrap_frontcontroller.php | 4 ++--
cosmogramme/storm_init.php | 3 ++-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cosmogramme/cosmozend/index.php b/cosmogramme/cosmozend/index.php
index 1610d3980c3..410afdb6544 100644
--- a/cosmogramme/cosmozend/index.php
+++ b/cosmogramme/cosmozend/index.php
@@ -35,7 +35,6 @@ set_include_path( $cosmozendPath
// pretending I am under Bokeh's root
chdir('../..');
-setupControllerActionHelper();
Zend_Session::start();
diff --git a/cosmogramme/cosmozend/tests/bootstrap_frontcontroller.php b/cosmogramme/cosmozend/tests/bootstrap_frontcontroller.php
index 394cc326af6..f873bc809d6 100644
--- a/cosmogramme/cosmozend/tests/bootstrap_frontcontroller.php
+++ b/cosmogramme/cosmozend/tests/bootstrap_frontcontroller.php
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-setupControllerActionHelper();
-
Zend_Controller_Front::getInstance()
->throwExceptions(true)
->addModuleDirectory(realpath(dirname(__FILE__)) . '/../application/modules')
->setDefaultModule('opac')
->registerPlugin(new ZendAfi_Controller_Plugin_CosmoAuth());
+Zend_Controller_Action_HelperBroker::addHelper(new ZendAfi_Controller_Action_Helper_ViewRenderer());
+
$_SESSION['passe'] = 'sysadm';
?>
\ No newline at end of file
diff --git a/cosmogramme/storm_init.php b/cosmogramme/storm_init.php
index 4621c40e29b..f7111d7df07 100644
--- a/cosmogramme/storm_init.php
+++ b/cosmogramme/storm_init.php
@@ -55,4 +55,5 @@ $cfg_file = (new CosmoPaths())->getBokehConfigPath();
->setupHTTPClient()
->setupLanguage()
->setupCustomFields()
- ->setupSession();
+ ->setupSession()
+ ->setupControllerActionHelper();
--
GitLab