From 6ffa29840f4e4ba13c8a20d0f23b0e61adb3be81 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 5 Oct 2011 14:55:47 +0000
Subject: [PATCH] [gh-239] Merging from testing into staging
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1117 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
sites/all/modules/unl/unl_migration.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sites/all/modules/unl/unl_migration.php b/sites/all/modules/unl/unl_migration.php
index a8364610..92622aae 100644
--- a/sites/all/modules/unl/unl_migration.php
+++ b/sites/all/modules/unl/unl_migration.php
@@ -804,8 +804,13 @@ class Unl_Migration_Tool
substr($absoluteUrl, 0, strlen($this->_baseUrl)) == $this->_baseUrl &&
in_array(basename($parts['path']), $this->_frontierIndexFiles)
) {
+ $parts['path'] = isset($parts['path']) ? dirname($parts['path']) . '/' : '';
+ if (substr($parts['path'], 0, 1) == '/') {
+ $parts['path'] = substr($parts['path'], 1);
+ }
+
$absoluteUrl = $parts['scheme'] . '://' . $parts['host'];
- $absoluteUrl .= isset($parts['path']) ? dirname($parts['path']) . '/' : '';
+ $absoluteUrl .= $parts['path'];
$absoluteUrl .= isset($parts['query']) ? '?' . $parts['query'] : '';
$absoluteUrl .= isset($parts['fragment']) ? '#'.$parts['fragment'] : '';
}
--
GitLab