[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm

raeburn raeburn@source.lon-capa.org
Fri, 27 May 2011 18:36:52 -0000


raeburn		Fri May 27 18:36:52 2011 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - Duplicate declarations.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1005 loncom/interface/loncommon.pm:1.1006
--- loncom/interface/loncommon.pm:1.1005	Wed May  4 01:49:08 2011
+++ loncom/interface/loncommon.pm	Fri May 27 18:36:51 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1005 2011/05/04 01:49:08 www Exp $
+# $Id: loncommon.pm,v 1.1006 2011/05/27 18:36:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8929,7 +8929,7 @@
                 if ($allfiles{$ref}) {
                     my $newname =  $orig;
                     my ($attrib_regexp,$codebase);
-                    my $attrib_regexp = &unescape($env{'form.embedded_attrib_'.$i});
+                    $attrib_regexp = &unescape($env{'form.embedded_attrib_'.$i});
                     if ($attrib_regexp =~ /:/) {
                         $attrib_regexp =~ s/\:/|/g;
                     }
@@ -8938,7 +8938,7 @@
                         $count += $numchg;
                     }
                     if ($env{'form.embedded_codebase_'.$i} ne '') {
-                        my $codebase = &unescape($env{'form.embedded_codebase_'.$i});
+                        $codebase = &unescape($env{'form.embedded_codebase_'.$i});
                         my $numchg = ($content =~ s/(codebase\s*=\s*["']?)\Q$codebase\E(["']?)/$1.$2/i); #' stupid emacs
                         $codebasecount ++;
                     }