Skip to content

Commit

Permalink
Moving alertMessage to parameters.yml, needed for #247 and #258
Browse files Browse the repository at this point in the history
  • Loading branch information
dbellettini committed Feb 10, 2013
1 parent 362ab7d commit 18e256f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion app/config/parameters.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
parameters:
antivirus_enabled: false
antivirus_cmd: /usr/bin/clamscan
antivirus_opts: '--quiet --recursive'
antivirus_opts: '--quiet --recursive'

alert_message: ~
1 change: 0 additions & 1 deletion config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 4 additions & 3 deletions src/Universibo/Bundle/LegacyBundle/App/UniversiboCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/');
Expand All @@ -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');
Expand Down

0 comments on commit 18e256f

Please sign in to comment.