From 154e644554f3d1ce164d9003bb7865a998b2c365 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 25 Apr 2014 17:32:24 -0500
Subject: [PATCH] tips: Fixup small merge conflict
---
scp/kb.php | 2 +-
scp/tickets.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scp/kb.php b/scp/kb.php
index 4b083c055..0194beb26 100644
--- a/scp/kb.php
+++ b/scp/kb.php
@@ -25,7 +25,7 @@ if($category && $_REQUEST['a']!='search') {
}
$nav->setTabActive('kbase');
$ost->addExtraHeader('<meta name="tip-namespace" content="knowledgebase.faqs" />',
- "$('#content').data('tipNamespace', '".$tip_namespace."');");
+ "$('#content').data('tipNamespace', 'knowledgebase.faqs');");
require_once(STAFFINC_DIR.'header.inc.php');
require_once(STAFFINC_DIR.$inc);
require_once(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/tickets.php b/scp/tickets.php
index 81f9984ac..b19b872e7 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -623,7 +623,7 @@ if($ticket) {
$ost->addExtraHeader('<script type="text/javascript" src="js/ticket.js"></script>');
$ost->addExtraHeader('<meta name="tip-namespace" content="tickets.open" />',
- "$('#content').data('tipNamespace', 'tickets.open');");
+ "$('#content').data('tipNamespace', 'tickets.queue');");
require_once(STAFFINC_DIR.'header.inc.php');
require_once(STAFFINC_DIR.$inc);
--
GitLab