Merge remote-tracking branch 'origin/master'

2012-08-02 12:42:11 +02:00 · 2012-08-02 12:42:11 +02:00 · 45777e6311
commit 45777e6311
parent 9b6846d550 ede98d1fe2
1 changed files with 2 additions and 1 deletions
--- a/libraries/Footer.class.php
+++ b/libraries/Footer.class.php
@ -326,7 +326,8 @@ class PMA_Footer
                    $retval .= ob_get_contents();
                    ob_end_clean();
                }
-            } else if (! $this->_isAjax) {
+            }
+            if (! $this->_isAjax) {
                $retval .= "</body></html>";
            }
        }