From 68ef3ece64f3b54acc531fd81bdc53934cbca6e8 Mon Sep 17 00:00:00 2001 From: Jakub Skoczen Date: Thu, 7 Apr 2011 11:20:56 +0200 Subject: [PATCH] Workaround Drupal prepending '/' --- mkdru.module | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mkdru.module b/mkdru.module index ae66e65..7ad7479 100644 --- a/mkdru.module +++ b/mkdru.module @@ -20,15 +20,15 @@ function mkdru_node_info() { function mkdru_ting_search_tab($keys) { error_log("TING SEARCH TAB invoked"); $path = drupal_get_path('module', 'mkdru'); - // Include client library. - // D6 seems not to be able to handle external scripts - // assume one if path starts with http: - // assume alias if path starts with / + // D6 is not to be able to handle external scripts and always + // prepends '/' (so we cannot keep pz2.js on remote host) + // we will try to be even smarter :) $pz2_js_path = variable_get('pz2_js_path', 'pazpar2/js'); - if (preg_match('/^http:/', $pz2_js_path) - || preg_match('/^\//', $pz2_js_path)) { + if (preg_match('/^\//', $pz2_js_path)) { + $pz2_js_path = trim($pz2_js_path, '/'); drupal_add_js($pz2_js_path.'/pz2.js', 'module', 'footer', - TRUE, TRUE, FALSE); + TRUE, TRUE, FALSE); + error_log("Pz2.js added as alias script '".$pz2_js_path); } else { drupal_add_js($path.'/'.$pz2_js_path.'/pz2.js', 'module', 'footer'); } -- 1.7.10.4