diff --git a/config/autoload/global.php b/config/autoload/global.php
index c571da21b2f..586b88e2343 100644
--- a/config/autoload/global.php
+++ b/config/autoload/global.php
@@ -108,7 +108,7 @@ function read_directors_ini($directors, $directors_ini)
foreach($directors as $instance) {
- if(array_key_exists('enabled', $instance) && isset($instance['enabled']) && strtolower($instance['enabled']) == "yes") {
+ if(array_key_exists('enabled', $instance) && isset($instance['enabled']) && (strtolower($instance['enabled']) == "yes" || strtolower($instance['enabled']) == TRUE)) {
if(array_key_exists('diraddress', $instance) && isset($instance['diraddress'])) {
$arr[key($directors)] = array();
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
index 765b2bcc68e..26616ae1ec2 100644
--- a/module/Application/view/layout/layout.phtml
+++ b/module/Application/view/layout/layout.phtml
@@ -75,7 +75,7 @@ echo $this->doctype();
-
+
navigation('navigation')->menu()->setMinDepth(0)->setMaxDepth(0)->setUlClass('nav navbar-nav'); ?>
@@ -91,7 +91,11 @@ echo $this->doctype();
diff --git a/module/Restore/src/Restore/Controller/RestoreController.php b/module/Restore/src/Restore/Controller/RestoreController.php
index b69ed7a8e50..51e8252e03a 100644
--- a/module/Restore/src/Restore/Controller/RestoreController.php
+++ b/module/Restore/src/Restore/Controller/RestoreController.php
@@ -139,7 +139,7 @@ public function indexAction()
echo $e->getMessage();
}
- if($backups == null) {
+ if(empty($backups)) {
$errors = 'No backups of client
'.$this->restore_params['client'].' found.';
}
@@ -204,6 +204,7 @@ public function indexAction()
return new ViewModel(array(
'restore_params' => $this->restore_params,
'form' => $form,
+ 'errors' => $errors
));
}
diff --git a/module/Restore/view/restore/restore/index.phtml b/module/Restore/view/restore/restore/index.phtml
index 6e2b7f26ede..c2ce2949de6 100644
--- a/module/Restore/view/restore/restore/index.phtml
+++ b/module/Restore/view/restore/restore/index.phtml
@@ -31,7 +31,7 @@ $this->headTitle($title);
acl_alert) : echo $this->ACLAlert($this->required_commands); elseif(!$this->acl_alert) : ?>
errors)) {
+ if(isset($this->errors) && !empty($this->errors)) {
echo '
Error: '.$this->errors.'
';
}