[TWiki-Dev] [SVN] ThomasWeigert r11834 - in twiki/branches/MAIN/lib: . TWiki/UI

[<de...@de...>]

Author: ThomasWeigert
Date: 2006-10-26 07:21:23 -0500 (Thu, 26 Oct 2006)
New Revision: 11834

Modified:
   twiki/branches/MAIN/lib/TWiki.pm
   twiki/branches/MAIN/lib/TWiki/UI/Oops.pm
Log:
Item3060: Avoid conflict with the template parameter needed in edit.

Modified: twiki/branches/MAIN/lib/TWiki/UI/Oops.pm
===================================================================
--- twiki/branches/MAIN/lib/TWiki/UI/Oops.pm	2006-10-26 05:17:48 UTC (rev 11833)
+++ twiki/branches/MAIN/lib/TWiki/UI/Oops.pm	2006-10-26 12:21:23 UTC (rev 11834)
@@ -89,7 +89,7 @@
             push( @params, $keep->{params} );
         }
     } else {
-        $tmplName = $query->param( 'template' );
+        $tmplName = $query->param( 'oopstemplate' );
         $def = $query->param( 'def' );
         while( defined( my $param = $query->param( 'param'.$n ) )) {
             push( @params, $param );

Modified: twiki/branches/MAIN/lib/TWiki.pm
===================================================================
--- twiki/branches/MAIN/lib/TWiki.pm	2006-10-26 05:17:48 UTC (rev 11833)
+++ twiki/branches/MAIN/lib/TWiki.pm	2006-10-26 12:21:23 UTC (rev 11834)
@@ -1111,7 +1111,7 @@
 
     ASSERT($this->isa( 'TWiki')) if DEBUG;
 
-    my @urlParams = ( template => 'oops'.$template );
+    my @urlParams = ( oopstemplate => 'oops'.$template );
 
     push( @urlParams, def => $def ) if $def;