From d924ebebf752bd694dc171c1ea259c9b77dcb405 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 16 Jan 2014 09:02:22 +0100
Subject: Fix compatibility with PHP 5.2 in html.php file (#1489514)

---
 CHANGELOG                      | 1 +
 program/lib/Roundcube/html.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f45bb0402..6beb463d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix compatibility with PHP 5.2 in html.php file (#1489514)
 - Remove expand/collapse with plus/minus keys (on numeric keypad) (#1489513)
 - Fix issue where filesystem path was added to all-attachments (zip) file (#1489507)
 - Fix case-sensitivity of email addresses handling on compose (#1485499)
diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php
index 587b030ce..33517fbcd 100644
--- a/program/lib/Roundcube/html.php
+++ b/program/lib/Roundcube/html.php
@@ -880,7 +880,7 @@ class html_table extends html
     private function _row_tagname()
     {
         static $row_tagnames = array('table' => 'tr', 'ul' => 'li', '*' => 'div');
-        return $row_tagnames[$this->tagname] ?: $row_tagnames['*'];
+        return $row_tagnames[$this->tagname] ? $row_tagnames[$this->tagname] : $row_tagnames['*'];
     }
 
     /**
@@ -889,7 +889,7 @@ class html_table extends html
     private function _col_tagname()
     {
         static $col_tagnames = array('table' => 'td', '*' => 'span');
-        return $col_tagnames[$this->tagname] ?: $col_tagnames['*'];
+        return $col_tagnames[$this->tagname] ? $col_tagnames[$this->tagname] : $col_tagnames['*'];
     }
 
 }
-- 
cgit v1.2.3