Item11331: init from BEGIN doesn't help persistent perls

git-svn-id: http://svn.foswiki.org/trunk@13304 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Dec 5, 2011 · c548b21 · c548b21
1 parent 1cf1a96
commit c548b21
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/TablePlugin/data/System/TablePlugin.txt b/TablePlugin/data/System/TablePlugin.txt
@@ -195,6 +195,7 @@ Sort icons in the header are read from System.DocumentGraphics.
 |  Version: | %$VERSION% |
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- specify latest version first -->&nbsp; |
+|  05 Dec 2011 | 1.136: Paul Harvey: Foswikitask:Item11331: Further improvements for persistent perls. |
 |  20 Sep 2011 | 1.135: George Clark:  Foswikitask:Item10559: perl errors about non-numeric or uninitialized variables for the URL parameters. Foswikitask:item10971: reload settings in persistent perl environment. |
 |  27 Aug 2011 | 1.134: Arthur Clemens: Foswikitask:Item11083: table should sort if sort is off but initsort has a column number. |
 |  17 Jun 2011 | 1.133: Arthur Clemens: setting =databg= and =headerbg= to ="none"= now makes the cell transparent. |

diff --git a/TablePlugin/lib/Foswiki/Plugins/TablePlugin.pm b/TablePlugin/lib/Foswiki/Plugins/TablePlugin.pm
@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 our $VERSION = '$Rev$';
-our $RELEASE = '1.135';
+our $RELEASE = '1.136';
 our $SHORTDESCRIPTION =
   'Control attributes of tables and sorting of table columns';
 our $NO_PREFS_IN_TOPIC = 1;
@@ -62,8 +62,8 @@ sub preRenderingHandler {
     _readPluginSettings() if !%pluginAttributes;
 
     # on-demand inclusion
-    eval "use Foswiki::Plugins::TablePlugin::Core ()";
-    die $@ if $@;
+    require Foswiki::Plugins::TablePlugin::Core;
+    Foswiki::Plugins::TablePlugin::Core::_init();
     Foswiki::Plugins::TablePlugin::Core::handler(@_);
 }
 

diff --git a/TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm b/TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm
@@ -118,7 +118,7 @@ $TABLE_FRAME->{vsides} = 'border-style:none solid none solid';
 $TABLE_FRAME->{box}    = 'border-style:solid';
 $TABLE_FRAME->{border} = 'border-style:solid';
 
-BEGIN {
+sub _init {
     $translationToken = "\0";
 
     # the maximum number of columns we will handle