Don't rely on headers_sent

diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 464c931a4741b89de182d5fbce4f258fa3934870..dfad385aef59fcd3f588d09efeb538dcfb7bc5df 100644 (file)
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -78,6 +78,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
        if ($error) {
                echo "<div class='error'>$error</div>\n";
        }
+       define("PAGE_HEADER", 1);
 }
 
 /** Print HTML footer

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 2c62d12c3b5e53f86f1f9855c37c72bb20c92548..ded6952b1c630c88b97af1d9c12e631119c8baf4 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -215,7 +215,7 @@ function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
                while ($row = $result->fetch_assoc()) {
                        $return[] = $row;
                }
-       } elseif (!$result && $error && (headers_sent() || ob_get_level())) {
+       } elseif (!$result && $error && defined("PAGE_HEADER")) {
                echo $error . error() . "\n";
        }
        return $return;