diff --git a/ChangeLog b/ChangeLog
index ffb0cc9ff..6afc9c7ff 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ $Id$
 $Source$
 
 2005-06-22 Garvin Hicking
+    * server_databases.php: Bug #1225315, wrong message displayed
+      when no databases were dropped.
     * tbl_properties.inc.php: Patch #1225452, JS error for
       getting the value of a select field in certain browsers.
 
diff --git a/server_databases.php b/server_databases.php
index d70d7bc8f..b790e0b8f 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -80,7 +80,11 @@ if ((!empty($drop_selected_dbs) || isset($query_type)) && ($is_superuser || $cfg
         $submit_mult = 'drop_db' ;
         $err_url = 'server_databases.php?' . PMA_generate_common_url();
         require('./mult_submits.inc.php');
-        $message = sprintf($strDatabasesDropped, count($selected));
+        if ($mult_btn == $strYes) {
+            $message = sprintf($strDatabasesDropped, count($selected));
+        } else {
+            $message = sprintf($strDatabasesDropped, 0);
+        }
         // we need to reload the database list now.
         PMA_availableDatabases();
         $reload = 1;