From 5938d0a901cf96f3539cded669a975f5b174e369 Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Fri, 3 Apr 2009 14:08:58 +0000 Subject: [PATCH] Read style from phpMinAdmin.css if exists git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@573 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- _compile.php | 4 ++-- changes.txt | 1 + design.inc.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/_compile.php b/_compile.php index 28f13555..c23f4b75 100644 --- a/_compile.php +++ b/_compile.php @@ -109,8 +109,8 @@ if ($_COOKIE["lang"]) { } else { $file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file); } -$file = preg_replace("~favicon\\.ico|default\\.css|(up|down|plus|minus)\\.gif~", '', $file); -$file = str_replace("arrow.gif", '" . preg_replace("~\\\\?.*~", "", $_SERVER["REQUEST_URI"]) . "?file=arrow.gif', $file); +$file = preg_replace('~favicon\\.ico|(up|down|plus|minus)\\.gif~', '', $file); +$file = preg_replace('~default\\.css|arrow\\.gif~', '" . preg_replace("~\\\\\\\\?.*~", "", $_SERVER["REQUEST_URI"]) . "?file=\\0', $file); $file = str_replace('error_reporting(E_ALL & ~E_NOTICE);', 'error_reporting(E_ALL & ~E_NOTICE); if (isset($_GET["file"])) { header("Expires: " . gmdate("D, d M Y H:i:s", filemtime(__FILE__) + 365*24*60*60) . " GMT"); diff --git a/changes.txt b/changes.txt index 901f2393..c091d3d2 100644 --- a/changes.txt +++ b/changes.txt @@ -6,6 +6,7 @@ Option to stop on error in SQL command (thanks to Vaclav Marik) Cross links to select and table (bug #2236232), link new item Suhosin compatibility (thanks to Klemens Hackel) Remove max_allowed_packet from export +Read style from phpMinAdmin.css if exists phpMinAdmin 1.9.1: Update translations diff --git a/design.inc.php b/design.inc.php index 51df16ab..2cae5729 100644 --- a/design.inc.php +++ b/design.inc.php @@ -11,7 +11,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") { <?php echo $title . (strlen($title2) ? ": " . htmlspecialchars($title2) : "") . " - " . lang('phpMinAdmin') . " 1.10.0-dev"; ?> - +" />