From bf2395b25694e678a995f6b65ca1b28ffd92231a Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 25 Mar 2016 22:41:01 -0500
Subject: [PATCH] oops: Fix client login fail
---
include/class.config.php | 2 +-
include/class.user.php | 7 -------
include/staff/ticket-view.inc.php | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/include/class.config.php b/include/class.config.php
index 95c5c2ff1..165ad0846 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -1442,7 +1442,7 @@ class OsticketConfig extends Config {
if (isset($vars['delete-backdrop']))
foreach ($vars['delete-backdrop'] as $id)
- if (($vars['selected-logo'] != $id)
+ if (($vars['selected-backdrop'] != $id)
&& ($f = AttachmentFile::lookup((int) $id)))
$f->delete();
diff --git a/include/class.user.php b/include/class.user.php
index bc36bd7bc..24cae58b9 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -963,13 +963,6 @@ class UserAccount extends VerySimpleModel {
}
function getUser() {
- // FIXME: The ORM will expect a ClientAccount instance as the
- // User.account relationship is defined thusly; however, $this is an
- // instance of UserAccount. Therefore we will (cast) to a
- // ClientAccount instance first. This could be better rectified by
- // collapsing UserAccount into ClientAccount.
- $acct = new ClientAccount($this->ht);
- $this->user->set('account', $acct);
return $this->user;
}
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index ffa44110d..c634971b3 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -897,7 +897,7 @@ if ($errors['err'] && isset($_POST['a'])) {
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
<font color="red"><strong><?php echo sprintf(
- __('Are you sure you want to DELETE %s?', __('this ticket')));?></strong></font>
+ __('Are you sure you want to DELETE %s?'), __('this ticket'));?></strong></font>
<br><br><?php echo __('Deleted data CANNOT be recovered, including any associated attachments.');?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
--
GitLab