Changeset 301


Ignore:
Timestamp:
Dec 13, 2003, 11:15:11 AM (18 years ago)
Author:
Ivor Williams
Message:

Changed to use CGI::Wiki::Plugin::Diff instead of OpenGuides::Diff

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Changes

    r300 r301  
    1919        Added multiple install and pretty URL notes to INSTALL.
    2020        Removed pubcrawl stuff from distro for now - it doesn't really work.
     21        Changed to use CGI::Wiki::Plugin::Diff instead of OpenGuides::Diff.
    2122
    22230.29    8 November 2003
  • trunk/wiki.cgi

    r300 r301  
    1414use CGI::Wiki::Plugin::GeoCache;
    1515use CGI::Wiki::Plugin::Locator::UK;
     16use CGI::Wiki::Plugin::Diff;
    1617use Config::Tiny;
    1718use Geography::NationalGrid;
     
    2021use OpenGuides::RDF;
    2122use OpenGuides::Utils;
    22 use OpenGuides::Diff;
    2323use OpenGuides::Template;
    2424use Time::Piece;
     
    3636$script_url .= "/" unless $script_url =~ /\/$/;
    3737
    38 my ($wiki, $formatter, $locator, $q);
     38my ($wiki, $formatter, $locator, $diff_plugin, $q);
    3939eval {
    4040    $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
     
    4242    $locator = CGI::Wiki::Plugin::Locator::UK->new;
    4343    $wiki->register_plugin( plugin => $locator );
     44    $diff_plugin = CGI::Wiki::Plugin::Diff->new;
     45    $wiki->register_plugin( plugin => $diff_plugin );
    4446
    4547    # Get CGI object, find out what to do.
     
    128130            my $other_ver = $q->param("diffversion");
    129131            if ( $other_ver ) {
    130                 my %diff_vars = OpenGuides::Diff->formatted_diff_vars(
    131                     wiki     => $wiki,
    132                     node     => $node,
    133                     versions => [ $version, $other_ver ]
     132                my %diff_vars = $diff_plugin->differences(
     133                    node          => $node,
     134                    left_version  => $version,
     135                    right_version => $other_ver
    134136                );
    135137                print OpenGuides::Template->output(
Note: See TracChangeset for help on using the changeset viewer.