[LON-CAPA-cvs] cvs: rat(version_2_9_X) / lonwrapper.pm

[raeburn]

raeburn		Thu Feb 11 15:12:12 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /rat	lonwrapper.pm 
  Log:
  - Backport 1.35 (previous commit was backport of 1.34).
  
  
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.32.2.1 rat/lonwrapper.pm:1.32.2.2
--- rat/lonwrapper.pm:1.32.2.1	Thu Feb 11 15:10:01 2010
+++ rat/lonwrapper.pm	Thu Feb 11 15:12:11 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.32.2.1 2010/02/11 15:10:01 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.32.2.2 2010/02/11 15:12:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -147,7 +147,9 @@
 	    $ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/;
             $ENV{'QUERY_STRING'} =~ s/\&$//;
 	}
-	$url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; 
+        unless ($ENV{'QUERY_STRING'} eq '') {
+            $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};
+        }
 	# reappend the query arguments
 	$r->print(&wrapper($orgurl,$url));
     } # not just the menu