From 286f98830c7cf417e64a435de2d1a8acc713abd4 Mon Sep 17 00:00:00 2001
From: Chris Nighswonger <chris.nighswonger@gmail.com>
Date: Wed, 22 Feb 2012 14:44:29 -0500
Subject: [PATCH] Revert "Bug 6875 de-nesting C4::Koha.pm"

This reverts commit c29850630d22c75bd85352b8bd169158f23eaa89.
-Unstable code
---
 C4/Koha.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 976b46a07f..789f674efb 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -23,7 +23,10 @@ package C4::Koha;
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
+use C4::Output;
+use URI::Split qw(uri_split);
 use Memoize;
+use Business::ISBN;
 
 use vars qw($VERSION @ISA @EXPORT $DEBUG);
 
@@ -469,9 +472,8 @@ sub getitemtypeimagelocation($$) {
 	my ( $src, $image ) = @_;
 
 	return '' if ( !$image );
-    require URI::Split;
 
-	my $scheme = ( URI::Split::uri_split( $image ) )[0];
+	my $scheme = ( uri_split( $image ) )[0];
 
 	return $image if ( $scheme );
 
@@ -1313,7 +1315,6 @@ sub _normalize_match_point {
 }
 
 sub _isbn_cleanup {
-    require Business::ISBN;
     my $isbn = Business::ISBN->new( $_[0] );
     if ( $isbn ) {
         $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
-- 
2.39.5