Fix to Maypole::Model::CDBI order sub from list

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

diff --git a/Changes b/Changes
index 1791765f51f386b5fb2e37b965ff8f8b3cadca07..c7ecde13fd67a091f02c848b04afb31dfff09fab 100644 (file)
--- a/Changes
+++ b/Changes
@@ -9,6 +9,8 @@ For information about current developments and future releases, see:
     Maypole::Model::CDBI::Plain / Maypole Config issue ( http://rt.cpan.org/NoAuth/Bug.html?id=11530 )
     Repeat Submission detection support ( Bug #6500 )
     Fix to setup_database in Maypole::Model::CDBI ( Bug #12384 )
+    Fix to plugin to allow Maypole::Plugin::Config::YAML to work
+    Fix to Maypole::Model::CDBI order sub from list
 
     Additional Requirements : Digest::MD5
 

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index 0678adbb43b31d942b71a5806cd9386d90a5ba4d..cd4318f9c48f786f1490225eccea642064d6553a 100644 (file)
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -44,6 +44,7 @@ sub import {
                 my $plugin = "Maypole::Plugin::$_";
                 if ($plugin->require) {
                     push @plugin_modules, "Maypole::Plugin::$_";
+                   unshift @ISA, "Maypole::Plugin::$_";
                     warn "Loaded plugin: $plugin for $caller"
                         if $caller->can('debug') && $caller->debug;
                 } else {

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 8904a425321f9ed4780fcf076426087bc5c79c5c..c1d37516aa07eb18cd2bd61819ac3d1577779bd7 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -202,12 +202,12 @@ sub do_pager {
 
 sub order {
     my ( $self, $r ) = @_;
-    my $order;
     my %ok_columns = map { $_ => 1 } $self->columns;
-    if ( $order = $r->query->{order} and $ok_columns{$order} ) {
-        $order .= ( $r->query->{o2} eq "desc" && " DESC" );
-    }
-    $order;
+    my $q = $r->query;
+    my $order = $q->{order};
+    return unless $order and $ok_columns{$order};
+    $order .= ' DESC' if $q->{o2} and $q->{o2} eq 'desc';
+    return $order;
 }
 
 sub list : Exported {