Fix PHP warning in html_table::set_row_attribs() in PHP 5.4 (#1489094)

2 files changed, 6 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 99e5db377..b36788c36 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix PHP warning in html_table::set_row_attribs() in PHP 5.4 (#1489094)
 - Fix invalid option selected in default_font selector when font is unset (#1489112)
 - Fix displaying contact with ID divisible by 100 in sql addressbook (#1489121)
 - Fix browser warnings on PDF plugin detection (#1489118)
diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php
index b437a9928..1a4c3beba 100644
--- a/program/lib/Roundcube/html.php
+++ b/program/lib/Roundcube/html.php
@@ -771,6 +771,11 @@ class html_table extends html
             $index = $this->rowindex;
         }
 
+        // make sure row object exists (#1489094)
+        if (!$this->rows[$index]) {
+            $this->rows[$index] = new stdClass;
+        }
+
         $this->rows[$index]->attrib = $attr;
     }