Merge pull request #894 from jeroenvermeulen/bugfix/messages_bug_pr825

Pull request #825 broke the ESI messages. This commit fixes it.
nexcess · Aug 27, 2015 · ad76b25 · ad76b25
2 parents 3f30eb9 + cb986e1
commit ad76b25
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/app/code/community/Nexcessnet/Turpentine/Block/Core/Messages.php b/app/code/community/Nexcessnet/Turpentine/Block/Core/Messages.php
@@ -198,16 +198,17 @@ protected function _toHtml() {
             } else {
                 $this->_loadMessages();
                 $this->_loadSavedMessages();
-                $html = $this->_real_toHtml();
+                if ( count($this->getMessages()) ) {
+                    $html = $this->_real_toHtml();
+                } else {
+                    // Prevent returning an empty <ul></ul>
+                    $html = '';
+                }
             }
         } else {
             $html = $this->_real_toHtml();
         }
         $this->_directCall = false;
-
-        if (count($this->getMessages()) == 0) {
-            return '';
-        }
         return $html;
     }