additional, request_options and view_options attributes of Maypole::Config are...

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@575 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index 8794fc22207c281c8a51af77e35148b3b9e7d427..c884209c384d013a698990abfec6793f13a93cf1 100644 (file)
--- a/Changes
+++ b/Changes
@@ -5,6 +5,7 @@ For information about current developments and future releases, see:
 2.121
 Bug Fixes :
    Apache::Request is fetched with a new object instead of instance if request options are provided
+   additional, request_options and view_options attributes of Maypole::Config are initialised with hashref
 
 2.12  22 June 2007 
 

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 4954ec74cb09747c180e21972e6b65a8d27fc271..8e24f8a8f13c0aeeb7ecee8d606a270b85309901 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -187,7 +187,7 @@ __PACKAGE__->mk_accessors(
         user session)
 );
 
-__PACKAGE__->config( Maypole::Config->new() );
+__PACKAGE__->config( Maypole::Config->new({additional => { }, request_options => { }, view_options => { },}) );
 
 __PACKAGE__->init_done(0);
 

diff --git a/lib/Maypole/Config.pm b/lib/Maypole/Config.pm
index 247398675015cdec1ac1aa1f66acec45f4f711f9..3e8081177b2a276965072fdad92b96c2f43cf20e 100644 (file)
--- a/lib/Maypole/Config.pm
+++ b/lib/Maypole/Config.pm
@@ -5,14 +5,19 @@ use attributes ();
 use strict;
 use warnings;
 
-our $VERSION = "1." . sprintf "%04d", q$Rev$ =~ /: (\d+)/;
+our $VERSION = 2.121;
 
 # Public accessors.
 __PACKAGE__->mk_accessors(
-     qw( view view_options uri_base template_root template_extension model
-         loader display_tables ok_tables rows_per_page dsn user pass opts
-         application_name additional build_form_elements request_options)
-);
+                         qw(
+                             view view_options template_root template_extension build_form_elements
+                             uri_base rows_per_page application_name
+                             model loader display_tables ok_tables
+                             dsn user pass opts
+                             additional
+                             request_options
+                            )
+                         );
 
 # Should only be modified by model.
 __PACKAGE__->mk_ro_accessors(qw( classes tables));