From 63f54fa9a52a666351cb0df9466edc24207a6c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Amor=20Garc=C3=ADa?= <jamor@zentyal.com>
Date: Fri, 30 Aug 2013 10:07:50 +0200
Subject: [PATCH 1/2] Fixed regression on logs search caused by autoFilter
 changes

---
 main/core/ChangeLog        | 2 ++
 main/core/src/EBox/Logs.pm | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/main/core/ChangeLog b/main/core/ChangeLog
index 2fd28f47c6a..87b40e0033d 100644
--- a/main/core/ChangeLog
+++ b/main/core/ChangeLog
@@ -1,3 +1,5 @@
+HEAD
+	+ Fixed regression on logs search caused by autoFilter changes
 3.0.25
 	+ Remove unnecessary and problematic desktop services code
 	+ No-committed changes does not appear in configuration changes
diff --git a/main/core/src/EBox/Logs.pm b/main/core/src/EBox/Logs.pm
index bb1c8a0c448..ff96a4893d2 100644
--- a/main/core/src/EBox/Logs.pm
+++ b/main/core/src/EBox/Logs.pm
@@ -455,9 +455,13 @@ sub search
     if ($filters and %{$filters}) {
         while (my ($field, $filterValue) = each %{$filters}) {
             $field or next;
-            (defined $filterValue and ($filterValue eq 0)) or next;
+	    if (not $field) {
+		next;
+	    } elsif ((not defined $filterValue) or ($filterValue =~ m/^\s*$/)) {
+		next;
+	    }
 
-            if (($field eq 'event') or ($filterValue eq 0)) {
+            if (($field eq 'event') or (not $filterValue)) {
                 $self->{'sqlselect'}->{'filter'}->{$field} = $filterValue;
             } else {
                 my $type = exists $tableinfo->{types}->{$field} ?

From 9dd90f864b52d9ca78e6b60ee2cc074a0f612170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Amor=20Garc=C3=ADa?= <jamor@zentyal.com>
Date: Fri, 30 Aug 2013 15:16:01 +0200
Subject: [PATCH 2/2] typo fixes

---
 main/core/src/EBox/Logs.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/main/core/src/EBox/Logs.pm b/main/core/src/EBox/Logs.pm
index ff96a4893d2..67de50b4fcc 100644
--- a/main/core/src/EBox/Logs.pm
+++ b/main/core/src/EBox/Logs.pm
@@ -454,12 +454,11 @@ sub search
     }
     if ($filters and %{$filters}) {
         while (my ($field, $filterValue) = each %{$filters}) {
-            $field or next;
-	    if (not $field) {
-		next;
-	    } elsif ((not defined $filterValue) or ($filterValue =~ m/^\s*$/)) {
-		next;
-	    }
+            if (not $field) {
+                next;
+            } elsif ((not defined $filterValue) or ($filterValue =~ m/^\s*$/)) {
+                next;
+            }
 
             if (($field eq 'event') or (not $filterValue)) {
                 $self->{'sqlselect'}->{'filter'}->{$field} = $filterValue;