From 353a078cca9d8606a820133e22eb38a673d05f14 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 9 Apr 2014 08:54:17 -0500
Subject: [PATCH] pjax: Fixup ticket.js inclusion
---
include/staff/header.inc.php | 2 +-
include/staff/ticket-view.inc.php | 1 -
scp/tickets.php | 2 ++
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/staff/header.inc.php b/include/staff/header.inc.php
index 9de588c43..888ec9fd1 100644
--- a/include/staff/header.inc.php
+++ b/include/staff/header.inc.php
@@ -116,7 +116,7 @@
<div id="content">
<?php } elseif ($pjax = $ost->getExtraPjax()) { # endif X_PJAX ?>
<script type="text/javascript">
- <?php foreach ($pjax as $s) echo $s.";"; ?>
+ <?php foreach (array_filter($pjax) as $s) echo $s.";"; ?>
</script>
<?php } # endif X_PJAX ?>
<?php if($errors['err']) { ?>
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 621365fc4..d155e040c 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -982,7 +982,6 @@ $tcount+= $ticket->getNumNotes();
</form>
<div class="clear"></div>
</div>
-<script type="text/javascript" src="js/ticket.js"></script>
<script type="text/javascript">
$(function() {
$(document).on('click', 'a.change-user', function(e) {
diff --git a/scp/tickets.php b/scp/tickets.php
index 3699015aa..c94ad4429 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -621,6 +621,8 @@ if($ticket) {
.($min*60000).");");
}
+$ost->addExtraHeader('<script type="text/javascript" src="js/ticket.js"></script>');
+
require_once(STAFFINC_DIR.'header.inc.php');
require_once(STAFFINC_DIR.$inc);
require_once(STAFFINC_DIR.'footer.inc.php');
--
GitLab