Item175: more patches for backwards compatibility. Added a request sp…

…ec to CompareRevisionsAddOn git-svn-id: http://svn.foswiki.org/trunk@837 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 20, 2008 · 15ce55a · 15ce55a
1 parent 208357e
commit 15ce55a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CompareRevisionsAddOn/lib/TWiki/Contrib/CompareRevisionsAddOn/Compare.pm b/CompareRevisionsAddOn/lib/TWiki/Contrib/CompareRevisionsAddOn/Compare.pm
@@ -139,7 +139,7 @@ sub compare {
     $tmpl = TWiki::Func::renderText( $tmpl, $webName );
 	$tmpl =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois
       ;
-      
+
     my (
         $tmpl_before, $tmpl_us, $tmpl_u, $tmpl_c,
         $tmpl_a,      $tmpl_d,  $tmpl_after
@@ -154,7 +154,7 @@ sub compare {
 
     # Start the output
 
-    print $query->header;
+    print CGI::header();
     print $tmpl_before;
 
     # Compare the trees
@@ -285,7 +285,7 @@ sub compare {
       ;    # remove <nop> and <noautolink> tags
 
     print $tmpl_after;
-    print $query->end_html;
+    print CGI::end_html;
 
 }
 

diff --git a/CompareRevisionsAddOn/lib/TWiki/Contrib/CompareRevisionsAddOn/MANIFEST b/CompareRevisionsAddOn/lib/TWiki/Contrib/CompareRevisionsAddOn/MANIFEST
@@ -5,6 +5,7 @@ data/TWiki/CompareRevisionsAddOn.txt 0644
 data/TWiki/CompareRevisionsAddonPlugin.txt 0644
 lib/TWiki/Plugins/CompareRevisionsAddonPlugin.pm 0444
 lib/TWiki/Contrib/CompareRevisionsAddOn/Compare.pm 0444
+lib/TWiki/Contrib/CompareRevisionsAddOn/Config.spec 0444
 pub/TWiki/CompareRevisionsAddOn/interweave.png 0644
 pub/TWiki/CompareRevisionsAddOn/sidebyside.png 0644
 templates/compare.tmpl 0444

diff --git a/TWikiCompatibilityPlugin/lib/TWiki/Plugins.pm b/TWikiCompatibilityPlugin/lib/TWiki/Plugins.pm
@@ -14,6 +14,7 @@ our $VERSION = 1.2;
 
     sub TIESCALAR { return bless({}, shift) }
     sub FETCH { return $Foswiki::Plugins::SESSION; }
+    sub STORE { } # no way, Jose!
 };
 
 tie($SESSION, 'TWiki::Plugins::SESSION_TIE');

diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -1376,6 +1376,7 @@ sub new {
     $query ||= new Foswiki::Request();
     my $this = bless( {}, $class );
     $this->{request}  = $query;
+    $this->{cgiQuery}  = $query; # for backwards compatibility in contribs
     $this->{response} = new Foswiki::Response();
 
     # Tell Foswiki::Response which charset we are using if not default