From e6f79607e4452cdf2cedbee2bea9bca3b39e439d Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Fri, 25 Jul 2014 12:54:24 -0600
Subject: [PATCH] [mms] Fix whups-mail-filter binary.

Looks like the result of a botched merge.
---
 whups/bin/whups-mail-filter | 7 +++++++
 whups/docs/CHANGES          | 1 +
 whups/package.xml           | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/whups/bin/whups-mail-filter b/whups/bin/whups-mail-filter
index e61d5a506a5..5168c6b3179 100755
--- a/whups/bin/whups-mail-filter
+++ b/whups/bin/whups-mail-filter
@@ -56,6 +56,13 @@ function _dump($hash)
     return $dump;
 }
 
+function _error()
+{
+    foreach (imap_errors() as $error) {
+        $GLOBALS['cli']->message($error, 'cli.warning');
+    }
+}
+
 if (file_exists(__DIR__ . '/../../whups/lib/Application.php')) {
     $baseDir = __DIR__ . '/../';
 } else {
diff --git a/whups/docs/CHANGES b/whups/docs/CHANGES
index 0389d024597..4e7951b018d 100644
--- a/whups/docs/CHANGES
+++ b/whups/docs/CHANGES
@@ -2,6 +2,7 @@
 v3.0.1-git
 ----------
 
+[mms] Fix whups-mail-filter binary.
 
 
 ------
diff --git a/whups/package.xml b/whups/package.xml
index 9cfffebe47b..c3d4950575c 100644
--- a/whups/package.xml
+++ b/whups/package.xml
@@ -27,7 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsdl.php">BSD-2-Clause</license>
  <notes>
-* 
+* [mms] Fix whups-mail-filter binary.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1115,7 +1115,7 @@
    <date>2014-03-10</date>
    <license uri="http://www.horde.org/licenses/bsdl.php">BSD-2-Clause</license>
    <notes>
-* 
+* [mms] Fix whups-mail-filter binary.
    </notes>
   </release>
  </changelog>