From 5d32db6d02d9f5c869684823e39fb1025b8275ea Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 4 Sep 2014 14:46:43 -0500
Subject: [PATCH] i18n: Fix install crash because of error installing dept
If there is a problem installing some of the items with the system, try not
to crash simply because the error is passed into another ::create()
function.
---
include/class.i18n.php | 4 +++-
setup/css/wizard.css | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/class.i18n.php b/include/class.i18n.php
index f0be4e6a3..787a89c1f 100644
--- a/include/class.i18n.php
+++ b/include/class.i18n.php
@@ -68,12 +68,14 @@ class Internationalization {
'sequence.yaml' => 'Sequence::__create',
);
- $errors = array();
foreach ($models as $yaml=>$m) {
if ($objects = $this->getTemplate($yaml)->getData()) {
foreach ($objects as $o) {
if ($m && is_callable($m))
@call_user_func_array($m, array($o, &$errors));
+ // TODO: Add a warning to the success page for errors
+ // found here
+ $errors = array();
}
}
}
diff --git a/setup/css/wizard.css b/setup/css/wizard.css
index 391f85f71..838f2de0f 100644
--- a/setup/css/wizard.css
+++ b/setup/css/wizard.css
@@ -16,7 +16,7 @@ a { color: #2a67ac; }
#header .info { font-size: 11pt; font-weight: bold; border-bottom: 1px solid #2a67ac; color: #444; text-align: right; float: right; }
#header ul { margin: 0; padding: 0; text-align: right; }
#header ul li { list-style: none; margin: 5px 0 0 0; padding: 0; }
-#header ul li a { color: #F3811C; text-decoration: none; }
+#header ul li a { color: #F3811C; text-decoration: none; white-space: nowrap; }
#header ul li a:hover { color: #2a67ac; }
#sidebar { width: 180px; padding: 10px; border: 1px solid #C8DDFA; float: right; background: #F7FBFE; }
--
GitLab