database_setup fix applied

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

diff --git a/Changes b/Changes
index 4c0ff4a04e425efdf277033e494c2e1c1fb212ae..1791765f51f386b5fb2e37b965ff8f8b3cadca07 100644 (file)
--- a/Changes
+++ b/Changes
@@ -7,7 +7,8 @@ For information about current developments and future releases, see:
     Small fix to templates/factory/frontpage ( http://rt.cpan.org/NoAuth/Bug.html?id=11236 )
     MasonX support in Maypole::Application ( https://rt.cpan.org/NoAuth/Bug.html?id=12383 )
     Maypole::Model::CDBI::Plain / Maypole Config issue ( http://rt.cpan.org/NoAuth/Bug.html?id=11530 )
-    Repeat Submission detection support
+    Repeat Submission detection support ( Bug #6500 )
+    Fix to setup_database in Maypole::Model::CDBI ( Bug #12384 )
 
     Additional Requirements : Digest::MD5
 

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index a02f36fc6b1102a7d2a58d85e82a956099d81e8c..8904a425321f9ed4780fcf076426087bc5c79c5c 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -236,7 +236,7 @@ sub setup_database {
             dsn       => $dsn,
             user      => $u,
             password  => $p,
-            options   => $opts,
+           %$opts,
         )
     );
     $config->{classes} = [ $config->{loader}->classes ];