From 18e256f4d70d57e8a5c86899ae2b447e90fec3c8 Mon Sep 17 00:00:00 2001
From: Davide Bellettini <davide.bellettini@gmail.com>
Date: Sun, 10 Feb 2013 23:01:29 +0100
Subject: [PATCH] Moving alertMessage to parameters.yml, needed for #247 and
 #258

---
 app/config/parameters.yml                                  | 4 +++-
 config.xml                                                 | 1 -
 .../Bundle/LegacyBundle/App/UniversiboCommand.php          | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/config/parameters.yml b/app/config/parameters.yml
index 69f58b85..11c3b023 100644
--- a/app/config/parameters.yml
+++ b/app/config/parameters.yml
@@ -1,4 +1,6 @@
 parameters:
   antivirus_enabled: false
   antivirus_cmd:     /usr/bin/clamscan
-  antivirus_opts:    '--quiet --recursive'
\ No newline at end of file
+  antivirus_opts:    '--quiet --recursive'
+  
+  alert_message: ~
\ No newline at end of file
diff --git a/config.xml b/config.xml
index d7c5e975..8ce71070 100644
--- a/config.xml
+++ b/config.xml
@@ -272,7 +272,6 @@
 	<!-- appSettings is an optional node. You can place any thing here and access 
 		it from FrontController->getAppSetting() -->
 	<appSettings>
-                <alertMessage></alertMessage>
 		<contactsPath>img/contacts/</contactsPath>
       		<contattoDocentiAdmin>SbiellONE</contattoDocentiAdmin> <!-- un solo nome -->
                 <defaultAnnoAccademico>2011</defaultAnnoAccademico>
diff --git a/src/Universibo/Bundle/LegacyBundle/App/UniversiboCommand.php b/src/Universibo/Bundle/LegacyBundle/App/UniversiboCommand.php
index 2687f95b..5837bf57 100644
--- a/src/Universibo/Bundle/LegacyBundle/App/UniversiboCommand.php
+++ b/src/Universibo/Bundle/LegacyBundle/App/UniversiboCommand.php
@@ -128,9 +128,10 @@ public function _initTemplateUniversibo()
         // /path_universibo2/receiver.php?du=SomeCommand
         @ $template->assign('common_shortUri', $_SERVER['REQUEST_URI']);
 
+        $container = $this->getContainer();
 
-        $router = $this->get('router');
-        $forumRouter = $this->get('universibo_forum.router');
+        $router = $container->get('router');
+        $forumRouter = $container->get('universibo_forum.router');
 
         $template->assign('common_forum', 'Forum');
         $template->assign('common_forumDir', 'forum/');
@@ -142,7 +143,7 @@ public function _initTemplateUniversibo()
         $template->assign('common_rootEmail', $fc->getAppSetting('rootEmail'));
         $template->assign('common_infoEmail', $fc->getAppSetting('infoEmail'));
         $template->assign('common_staffEmail', $fc->getAppSetting('staffEmail'));
-        $template->assign('common_alert', $fc->getAppSetting('alertMessage'));
+        $template->assign('common_alert', $container->getParameter('alert_message'));
 
         //generali
         $template->assign('common_universibo', 'UniversiBO');