Changeset 584

Timestamp:

12/14/04 13:32:21 (4 years ago)

Author:

kake

Message:

Fix bug with diff display on nodes containing macros.

Location:

trunk

Files:

• Build.PL (modified) (1 diff)
• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• PREREQUISITES (modified) (1 diff)
• lib/OpenGuides/Utils.pm (modified) (3 diffs)
• t/56_diffs_with_macros.t (added)

trunk/Build.PL

@@ -302 +302 @@
         $drivers{$dbtype}                 => 0,
         'File::Spec::Functions'           => 0,
+        'File::Temp'                      => 0,
         'Geography::NationalGrid'         => 0,
         'LWP::Simple'                     => 0,

trunk/Changes

@@ -5 +5 @@
         Added new CSS class "node_name" for inline non-hyperlink references
          to node names - see README.CSS for details.
+        Fix bug with diff display on nodes containing macros.
         
 0.45    1 December 2004

trunk/MANIFEST

@@ -72 +72 @@
 t/54_redirect.t
 t/55_node_history.t
+t/56_diffs_with_macros.t
 t/61_bug_textareas.t
 t/62_bug_os_coords.t

trunk/PREREQUISITES

@@ -23 +23 @@
 )
 File::Spec::Functions
+File::Temp
 (
   Geography::NationalGrid::GB

trunk/lib/OpenGuides/Utils.pm

@@ -120 +120 @@
         qr/\@INDEX_LINK\s+\[\[(Category|Locale)\s+([^\]|]+)\|?([^\]]+)?\]\]/ =>
             sub {
-                  my $wiki = shift;
+                  # We may be being called by CGI::Wiki::Plugin::Diff,
+                  # which doesn't know it has to pass us $wiki - and
+                  # we don't use it anyway.
+                  if ( UNIVERSAL::isa( $_[0], "CGI::Wiki" ) ) {
+                      shift; # just throw it away
+                  }
                   my $link_title = $_[2] || "View all pages in $_[0] $_[1]";
                   return qq(<a href="$script_name?action=index;index_type=) . uri_escape(lc($_[0])) . qq(;index_value=) . uri_escape($_[1]) . qq(">$link_title</a>);
@@ -127 +132 @@
              sub {
                    my ($wiki, $type, $value) = @_;
+
+                   # We may be being called by CGI::Wiki::Plugin::Diff,
+                   # which doesn't know it has to pass us $wiki
+                   unless ( UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) {
+                       return "(unprocessed INDEX_LIST macro)";
+                   }
+
                    my @nodes = sort $wiki->list_nodes_by_metadata(
                        metadata_type  => $type,
@@ -148 +160 @@
                  },
         qr/\@RSS\s+(.+)/ => sub {
-                    my ($wiki, $url) = @_;
+                    # We may be being called by CGI::Wiki::Plugin::Diff,
+                    # which doesn't know it has to pass us $wiki - and
+                    # we don't use it anyway.
+                    if ( UNIVERSAL::isa( $_[0], "CGI::Wiki" ) ) {
+                        shift; # just throw it away
+                    }
+
+                    my $url = shift;
 
                     # The URL will already have been processed as an inline