Skip to content

Commit

Permalink
Item10677: several core plugins doesn't set $NO_PREFS_IN_TOPIC
Browse files Browse the repository at this point in the history
Merge over 1.1.5 updates to trunk.
Maintained the different approach to the bin script so trunk is not the release 1.1.5!


git-svn-id: http://svn.foswiki.org/trunk@11704 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
KennethLavrsen authored and KennethLavrsen committed May 17, 2011
1 parent a37a576 commit 8696399
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
3 changes: 2 additions & 1 deletion CompareRevisionsAddOn/data/System/CompareRevisionsAddOn.txt
Expand Up @@ -138,13 +138,14 @@ This Add-On comes pre-installed on Foswiki. You should only need to re-install i
| Version: | %$VERSION% |
| Release: | %$RELEASE% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 17 May 2011 (1.1.5) | Foswikitask:Item10677 - Speed optimization by avoiding doing pointless lookup for settings in plugin topic |
| 30 Apr 2011 (1.1.4) | Foswikitask:Item10566 - Add =compareauth= script for !ApacheLogin users %BR%\
- Switch to x.y.z version numbering %BR%\
- Moved dependency list from documentation into DEPENDENCIES manifest \
- Modernize system topic for !BuildContrib |
| 10 Apr 2011 | Foswikitask:Item10401 - Call logEvent in compare %BR% Foswikitask:Item10402 - Don't use obsolete template for missing web/topic. %BR% Version shipping with 1.1.3 |
| 21 Oct 2010 | Added dependency of HTML::Tree to installer and to core MANIFEST so you see it listed in configure |
| 04 Oct 2010 | Foswikitask:Item9774: Add CompareRevisionsAddOn.pm stub module to provide Version & Release strings |
| 04 Oct 2010 | Foswikitask:Item9774 - Add CompareRevisionsAddOn.pm stub module to provide Version & Release strings |
| 31 Jul 2010 | Paul Harvey: Foswikitask:Item9415 - Documentation updates |
| 19 Sep 2009 | Kenneth Lavrsen: Expert settings in plugins makes configure fail to save. Using the hidden (H) setting instead which is much better anyway as this is not a setting to be altered by a user. |
| 18 Sep 2009 | Kenneth Lavrsen: Expert settings in plugins makes configure fail to save. Settings therefore un-experted again |
Expand Down
Expand Up @@ -32,6 +32,11 @@ Test: <nop>CompareRevisionsAddOnPlugin is %IF{"context CompareRevisionsAddOnPlug
| Version: | %$VERSION% |
| Release: | %$RELEASE% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 17 May 2011 (1.1.5) | Foswikitask:Item10677 - Speed optimization by avoiding doing pointless lookup for settings in plugin topic |
| 30 Apr 2011 (1.1.4) | Foswikitask:Item10566 - Add =compareauth= script for !ApacheLogin users %BR%\
- Switch to x.y.z version numbering %BR%\
- Moved dependency list from documentation into DEPENDENCIES manifest \
- Modernize system topic for !BuildContrib |
| 10 Apr 2011 | Foswikitask:Item10401 - Call logEvent in compare <br /> Foswikitask:Item10402 - Don't use obsolete template for missing web/topic. <br /> Version shipping with 1.1.3 |
| 21 Oct 2010 | Version shipping with 1.1.1 |
| 12 Sep 2009 | Kenneth Lavrsen: Fixed problem with tables always showing up as changed even when they were not |
Expand Down
Expand Up @@ -9,7 +9,7 @@ our $VERSION = '$Rev$ (2011-04-30)';
# This is a free-form string you can use to "name" your own plugin version.
# It is *not* used by the build automation tools, but is reported as part
# of the version number in PLUGINDESCRIPTIONS.
our $RELEASE = '1.1.4';
our $RELEASE = '1.1.5';

our $SHORTDESCRIPTION = 'Compares two revisions of a document. In contrast to normal _rdiff_, the comparison is done with the rendered HTML output.';

Expand Down
Expand Up @@ -17,22 +17,23 @@ use warnings;

use Foswiki;

# $VERSION is referred to by Foswiki, and is the only global variable that
# *must* exist in this package
use vars qw( $VERSION $RELEASE $debug $pluginName );

# This should always be $Rev$ so that Foswiki can determine the checked-in
# status of the plugin. It is used by the build automation tools, so
# you should leave it alone.
$VERSION = '$Rev$ (2011-04-30)';
our $VERSION = '$Rev$ (2011-04-30)';

# This is a free-form string you can use to "name" your own plugin version.
# It is *not* used by the build automation tools, but is reported as part
# of the version number in PLUGINDESCRIPTIONS.
$RELEASE = '1.1.4';
our $RELEASE = '1.1.5';

# Name of this Plugin, only used in this module
$pluginName = 'CompareRevisionsAddonPlugin';
our $pluginName = 'CompareRevisionsAddonPlugin';

# We have no prefs in plugin topic
our $NO_PREFS_IN_TOPIC = 1;

our $debug = 0;

sub initPlugin {
my ( $topic, $web, $user, $installWeb ) = @_;
Expand Down

0 comments on commit 8696399

Please sign in to comment.