From d2b7549cc96edc7232c525496491814c6ee62e7c Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Wed, 19 Mar 2008 08:09:49 +0000 Subject: [PATCH] Merged in from DEV trunk... --- config/dmsDefaults.php | 6 +++++- customerrorpage.php | 8 ++++++-- plugins/search2/ExternalDashlet.php | 5 ++++- search2.php | 4 ++-- templates/ktcore/search2/external_resources.smarty | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/config/dmsDefaults.php b/config/dmsDefaults.php index 0a00a39..68abe28 100644 --- a/config/dmsDefaults.php +++ b/config/dmsDefaults.php @@ -393,7 +393,11 @@ function catchFatalErrors($p_OnOff='On'){ $phperror='>>
+ $sUrl = KTInit::guessRootUrl(); + global $default; + $sRootUrl = ($default->sslEnabled ? 'https' : 'http') .'://'.$_SERVER['HTTP_HOST'].$sUrl; + + $phperror='>
'; ini_set('error_append_string',$phperror); } diff --git a/customerrorpage.php b/customerrorpage.php index 82ccbd8..2f4cdc4 100644 --- a/customerrorpage.php +++ b/customerrorpage.php @@ -13,19 +13,23 @@ if (array_key_exists('Error_MessageOne', $_POST) && array_key_exists('Error_Mess } session_start(); +require_once("config/dmsDefaults.php"); + if (array_key_exists('sErrorMessage', $_SESSION)) { $phperror = $_SESSION['sErrorMessage']; } +global $default; +$sUrl = $default->rootUrl; ?> Knowledgetree - Desklet - +