[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /interface londocs.pm

raeburn raeburn@source.lon-capa.org
Wed, 18 Mar 2009 21:57:58 -0000


raeburn		Wed Mar 18 21:57:58 2009 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/interface	londocs.pm 
  Log:
  - Backport 1.340.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.314.2.4 loncom/interface/londocs.pm:1.314.2.5
--- loncom/interface/londocs.pm:1.314.2.4	Sun Dec 21 16:15:39 2008
+++ loncom/interface/londocs.pm	Wed Mar 18 21:57:58 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.314.2.4 2008/12/21 16:15:39 raeburn Exp $
+# $Id: londocs.pm,v 1.314.2.5 2009/03/18 21:57:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1888,6 +1888,7 @@
     }
     
     my $orig_url = $url;
+    $orig_url=~s{http(:|:)//https(:|:)//}{https$2//};
     my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/});
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
 	my $symb=&Apache::lonnet::symbclean(