From f4542f506a5258c7ba667489db1a12a1d6041aa1 Mon Sep 17 00:00:00 2001
From: bryndivey <bryndivey@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Wed, 24 May 2006 14:39:30 +0000
Subject: [PATCH] Fixed disclaimers after help change.

---
 plugins/ktstandard/KTDisclaimers.php           | 10 ++++------
 plugins/ktstandard/admin/manageDisclaimers.php | 19 +++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/plugins/ktstandard/KTDisclaimers.php b/plugins/ktstandard/KTDisclaimers.php
index 27cbde0..30ac5dc 100644
--- a/plugins/ktstandard/KTDisclaimers.php
+++ b/plugins/ktstandard/KTDisclaimers.php
@@ -61,12 +61,10 @@ class KTDisclaimersPlugin extends KTPlugin {
 	$sDisclaimer = false;
 
 	if($this->isRegistered()) {
-	    $help_path = KTHelp::getHelpSubPath($sLocation);
-	    $oReplacementHelp = KTHelpReplacement::getByName($help_path);
-
-
-	    if(!PEAR::isError($oReplacementHelp) && strlen(trim($oReplacementHelp->getDescription()))) {
-		$sDisclaimer = $oReplacementHelp->getDescription();
+	    $aHelp = KTHelp::getHelpInfo($sLocation);
+	    
+	    if(!PEAR::isError($aHelp) && strlen(trim($aHelp['body']))) {
+		$sDisclaimer = $aHelp['body'];
 	    }
 	}
 
diff --git a/plugins/ktstandard/admin/manageDisclaimers.php b/plugins/ktstandard/admin/manageDisclaimers.php
index 63422e4..6e93acc 100644
--- a/plugins/ktstandard/admin/manageDisclaimers.php
+++ b/plugins/ktstandard/admin/manageDisclaimers.php
@@ -106,19 +106,15 @@ class ManageDisclaimersDispatcher extends KTAdminDispatcher {
 
     function do_customise() {
         $name = KTUtil::arrayGet($_REQUEST, 'name');
-        $subname = KTHelp::getHelpSubPath($name);
-        $oHelpReplacement = KTHelpReplacement::getByName($subname);
+
+	$subname = KTHelp::_getLocationInfo($name);
+        $oHelpReplacement = KTHelpReplacement::getByName($subname['internal']);
 
         if (!PEAR::isError($oHelpReplacement)) {
             return $this->redirectTo('edit', 'id=' .  $oHelpReplacement->getId());
         }
 
-	$info = KTHelp::getHelpFromFile($name);
-        if ($info === false) { 
-            $info = array('name' => $name);
-            $info['title'] = _kt('New Help File');
-            $info['body'] = _kt('New Help File');
-        }
+	$info = KTHelp::getHelpInfo($name);
 
         $oHelpReplacement = KTHelpReplacement::createFromArray(array(
             'name' => $info['name'],
@@ -127,6 +123,9 @@ class ManageDisclaimersDispatcher extends KTAdminDispatcher {
         ));
 
         if (PEAR::isError($oHelpReplacement)) {
+	    print '<pre>';
+	    var_dump($info);
+	    exit(0);
             return $this->errorRedirectToMain(_kt("Unable to create disclaimer"));
         }
 
@@ -135,8 +134,8 @@ class ManageDisclaimersDispatcher extends KTAdminDispatcher {
 
     function do_clear() {
         $name = KTUtil::arrayGet($_REQUEST, 'name');
-        $subname = KTHelp::getHelpSubPath($name);
-        $oHelpReplacement = KTHelpReplacement::getByName($subname);
+	$subname = KTHelp::_getLocationInfo($name);
+        $oHelpReplacement = KTHelpReplacement::getByName($subname['internal']);
 
         if (PEAR::isError($oHelpReplacement)) {
             return $this->errorRedirectToMain(_kt("Could not find specified item"));
--
libgit2 0.21.4