From 65225262f6bb524b93feb49178509cada3390ee3 Mon Sep 17 00:00:00 2001
From: Kyle Francis <franck6@rpi.edu>
Date: Sat, 02 Apr 2016 18:33:17 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into compose_focus
---
program/lib/Roundcube/rcube_result_index.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/lib/Roundcube/rcube_result_index.php b/program/lib/Roundcube/rcube_result_index.php
index 5ea390b..2f73c5e 100644
--- a/program/lib/Roundcube/rcube_result_index.php
+++ b/program/lib/Roundcube/rcube_result_index.php
@@ -134,7 +134,7 @@
*/
public function is_error()
{
- return $this->raw_data === null ? true : false;
+ return $this->raw_data === null;
}
/**
@@ -144,7 +144,7 @@
*/
public function is_empty()
{
- return empty($this->raw_data) ? true : false;
+ return empty($this->raw_data);
}
/**
--
Gitblit v1.9.1