X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FModel%2FCDBI.pm;fp=lib%2FMaypole%2FModel%2FCDBI.pm;h=3705331c8ec74de51de6f50ab4562591752bcc83;hb=7249c53d755f2eb5b8b5bb471ff49b8dd6f3dbf0;hp=da6f16224c69b0d4073be5e3be66f38918182640;hpb=a183ff6bda2ae98ef8f4a4f979647052e0020dea;p=maypole.git

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index da6f162..3705331 100644
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -158,10 +158,14 @@ This method replaces the, now deprecated, delete method provided in prior versio
 sub delete : Exported {
   my $self = shift;
   my ($sub) = (caller(1))[3];
+  # So subclasses can still send delete down ...
   $sub =~ /^(.+)::([^:]+)$/;
-  # So subclasses can still send search down ...
-  return ($1 ne "Maypole::Model::Base" && $2 ne "delete") ?
-    $self->SUPER::search(@_) : $self->do_delete(@_);
+  if ($1 ne "Maypole::Model::Base" && $2 ne "delete") {
+    $self->SUPER::delete(@_);
+  } else {
+    warn "Maypole::Model::CDBI delete method is deprecated\n";
+    $self->do_delete(@_);
+  }
 }
 
 sub do_delete {