Pull request #825 broke the Ajax messages. This commit fixes it.

When there were no messages, but there was HTML for the ESI Ajax container, it was thrown. When that happened, there was no ESI container on that page, so messages would never work on that cached page.
nexcess · Aug 26, 2015 · cb986e1 · cb986e1
1 parent 3f30eb9
commit cb986e1
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;
     }