From ecfba4699dc86278226843b36551947225c6f7d6 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 22 Feb 2008 18:31:05 +0000
Subject: [PATCH] forward porting Testing fix

---
 docs/changelog/7.x.x.txt | 6 ++++++
 t/lib/WebGUI/Test.pm     | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 8bd38477b..ed7b05ac4 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,12 @@
  - prevent HTML and Macro injection in usernames
  - Fixed a problem that caused all Cron job parameters to return an empty hash
    ref.
+
+7.4.26
+ - fixed: rich text editor image uploads deleted immediately
+ - fixed: Running WebGUI Tests on Windows (William McKee, Knowmad Technologies)
+
+7.4.25
  - fixed: creating new ad spaces is broken
  - don't write .wgaccess files for public uploads, allowing WRE optimizations
  - More i18n for Gallery templates
diff --git a/t/lib/WebGUI/Test.pm b/t/lib/WebGUI/Test.pm
index 17f47b6cb..33c98284b 100644
--- a/t/lib/WebGUI/Test.pm
+++ b/t/lib/WebGUI/Test.pm
@@ -89,7 +89,8 @@ BEGIN {
     $WEBGUI_ROOT = File::Spec->canonpath($WEBGUI_ROOT);
     $WEBGUI_TEST_COLLATERAL = File::Spec->catdir($WEBGUI_ROOT, 't', 'supporting_collateral');
 
-    $WEBGUI_LIB  ||= File::Spec->catpath( (File::Spec->splitpath($WEBGUI_ROOT))[0], $WEBGUI_ROOT, 'lib' );
+    my ($volume,$directories) = File::Spec->splitpath( $WEBGUI_ROOT, 'no_file' );
+    $WEBGUI_LIB ||= File::Spec->catpath( $volume, $directories, 'lib' );
 
     push (@INC,$WEBGUI_LIB);