Save bytes

diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index c347271e51b23b488cf8d935ecb4a8eab3a3dd4b..a74b69139ab81f011ff74f311d682e9f2560c0bb 100644 (file)
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -64,7 +64,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
        }
        echo "<h2>$title_all</h2>\n";
        restart_session();
-       $uri = preg_replace('~^[^?]*/~', '', $_SERVER["REQUEST_URI"]);
+       $uri = preg_replace('~^[^?]*~', '', $_SERVER["REQUEST_URI"]);
        $messages = $_SESSION["messages"][$uri];
        if ($messages) {
                echo "<div class='message'>" . implode("</div>\n<div class='message'>", $messages) . "</div>\n";

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 7ec5dbb6d11847f7f9e33041f323db7c9eba3298..44958a834918adabb302f0c4a5a97f6e97549335 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -348,8 +348,7 @@ function drop_create($drop, $create, $location, $message_drop, $message_alter, $
        $dropped = $name != "" && ($_POST["dropped"] || queries($drop));
        $created = queries($create);
        if (!queries_redirect($location, ($name != "" ? $message_alter : $message_create), $created) && $dropped) {
-               restart_session();
-               $_SESSION["messages"][preg_replace('~^[^?]*/~', '', $_SERVER["REQUEST_URI"])][] = $message_drop;
+               redirect(null, $message_drop);
        }
        return $dropped;
 }

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 54d504ef6d883b8b3615c02ff577bc1d668b75b8..75795c739e87a739e26f153bbc09f1ff9ca181a2 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -384,7 +384,7 @@ function is_ajax() {
 function redirect($location, $message = null) {
        if (isset($message)) {
                restart_session();
-               $_SESSION["messages"][preg_replace('~^[^?]*/~', '', $location)][] = $message;
+               $_SESSION["messages"][preg_replace('~^[^?]*~', '', (isset($location) ? $location : $_SERVER["REQUEST_URI"]))][] = $message;
        }
        if (isset($location)) {
                if ($location == "") {