From 800235f6826ef6109c23974463d4c4d497987b4f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 6 Apr 2016 12:25:01 +0200
Subject: [PATCH] Fix compatibility with older PHP versions by not using
 empty(fn())

---
 plugins/emoticons/emoticons.php               | 4 ++--
 plugins/newmail_notifier/newmail_notifier.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/emoticons/emoticons.php b/plugins/emoticons/emoticons.php
index 5de5f91e9..d5f0e9a16 100644
--- a/plugins/emoticons/emoticons.php
+++ b/plugins/emoticons/emoticons.php
@@ -175,10 +175,10 @@ class emoticons extends rcube_plugin
         $dont_override = $rcube->config->get('dont_override', array());
 
         if ($args['section'] == 'mailview' && !in_array('emoticons_display', $dont_override)) {
-            $args['prefs']['emoticons_display'] = !empty(rcube_utils::get_input_value('_emoticons_display', rcube_utils::INPUT_POST));
+            $args['prefs']['emoticons_display'] = rcube_utils::get_input_value('_emoticons_display', rcube_utils::INPUT_POST) ? true : false;
         }
         else if ($args['section'] == 'compose' && !in_array('emoticons_compose', $dont_override)) {
-            $args['prefs']['emoticons_compose'] = !empty(rcube_utils::get_input_value('_emoticons_compose', rcube_utils::INPUT_POST));
+            $args['prefs']['emoticons_compose'] = rcube_utils::get_input_value('_emoticons_compose', rcube_utils::INPUT_POST) ? true : false;
         }
 
         return $args;
diff --git a/plugins/newmail_notifier/newmail_notifier.php b/plugins/newmail_notifier/newmail_notifier.php
index 63a2cf884..74a091381 100644
--- a/plugins/newmail_notifier/newmail_notifier.php
+++ b/plugins/newmail_notifier/newmail_notifier.php
@@ -159,7 +159,7 @@ class newmail_notifier extends rcube_plugin
         foreach (array('basic', 'desktop', 'sound') as $type) {
             $key = 'newmail_notifier_' . $type;
             if (!in_array($key, $dont_override)) {
-                $args['prefs'][$key] = !empty(rcube_utils::get_input_value('_' . $key, rcube_utils::INPUT_POST));
+                $args['prefs'][$key] = rcube_utils::get_input_value('_' . $key, rcube_utils::INPUT_POST) ? true : false;
             }
         }