[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-30-g37dff12

[Madhura Jayaratne]

The branch, QA_3_4 has been updated
       via  37dff129010b54c90156f55e8e61ef4e7ac850d1 (commit)
      from  2e101cc7336f2a448dd1682a49f8b343386f8c07 (commit)


- Log -----------------------------------------------------------------
commit 37dff129010b54c90156f55e8e61ef4e7ac850d1
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Wed Sep 28 10:14:24 2011 +0530

    bug #3390832 [display] Delete records from last page breaks search

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    1 +
 sql.php   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a45a6ca..ec2549f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
 - bug #3413743 [interface] Display options link missing after search
 - bug #3324161 [core] CSP policy causing designer JS buttons to fail
 - bug #3412862 [relation] Relations/constraints are dropped/created on every change
+- bug #3390832 [display] Delete records from last page breaks search
 
 3.4.5.0 (2011-09-14)
 - bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/sql.php b/sql.php
index 83900ab..6caeb7b 100644
--- a/sql.php
+++ b/sql.php
@@ -580,7 +580,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
 } // end else "didn't ask to see php code"
 
 // No rows returned -> move back to the calling page
-if (0 == $num_rows || $is_affected) {
+if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
     if ($is_delete) {
         $message = PMA_Message::deleted_rows($num_rows);
     } elseif ($is_insert) {


hooks/post-receive
-- 
phpMyAdmin