diff --git a/ChangeLog b/ChangeLog
index 369557caa..c23f58a31 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ $Source$
     * main.php: Correct ALT attribute for image (bug #1232124).
     * mult_submits.inc.php, libraries/display_tbl.lib.php: Don't forget
       browsing state while deleting multiple rows (bug #1232624).
+    * tbl_row_action.php: Fix undefined variable warning.
 
 2005-07-10 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_tbl.lib.php: bug #1235473 display_tbl.lib.php,
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 1682a1639..cf8f52d42 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -113,7 +113,8 @@ if (!empty($submit_mult)) {
             /**
              * Show result of multi submit operation
              */
-            if (!empty($submit_mult) || isset($mult_btn)) {
+            // sql_query is not set when user does not confirm multi-delete
+            if ((!empty($submit_mult) || isset($mult_btn)) && isset($sql_query)) {
                 $disp_message = $strSuccess;
                 $disp_query = $sql_query;
             }