From 2e1d5ac4ff73ca1847bf7d1dcfa1044ea2f4a4a4 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Thu, 31 Jan 2008 18:09:08 +0000
Subject: * Update CHANGELOG * Backport fixes to XXV-1.0.2 * Remove query of
 revision by svnversion (Use maximum of modul version) * TIMERS: Drop used
 function getEvents * CHANNELS: Don't redirect if deletion of channel failed *
 widget/list: avoid theoretical wrong item selection * popularity: change
 layout of database table for smaller memory using

---
 lib/XXV/MODULES/CHANNELS.pm | 2 +-
 lib/XXV/MODULES/TIMERS.pm   | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/XXV/MODULES/CHANNELS.pm b/lib/XXV/MODULES/CHANNELS.pm
index 755108b..c8771a1 100644
--- a/lib/XXV/MODULES/CHANNELS.pm
+++ b/lib/XXV/MODULES/CHANNELS.pm
@@ -1004,7 +1004,7 @@ sub deleteChannel {
         $self->readData($watcher,$console);
 
         $console->redirect({url => '?cmd=clist', wait => 1})
-            if(ref $console and $console->typ eq 'HTML');
+            if(ref $console and $console->typ eq 'HTML' and !$self->{svdrp}->err);
     } else {
         con_err($console, gettext("No channel defined for deletion!"));
     }
diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm
index 5d25b14..150bc71 100644
--- a/lib/XXV/MODULES/TIMERS.pm
+++ b/lib/XXV/MODULES/TIMERS.pm
@@ -1470,15 +1470,6 @@ where
     return $erg ? $erg->{pos} : 0;
 }
 
-# ------------------
-sub getEvents {
-# ------------------
-    my $obj = shift || return error('No object defined!');
-    my $sql = "SELECT SQL_CACHE id, flags & 1 as activ, eventid from TIMERS where eventid > 0";
-    my $erg = $obj->{dbh}->selectall_hashref($sql, 'eventid');
-    return $erg;
-}
-
 # ------------------
 sub getEpgDesc {
 # ------------------
-- 
cgit v1.2.3