[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20503-g0ad7567

Madhura Jayaratne madhuracj at users.sourceforge.net
Wed Sep 28 14:54:54 CEST 2011


The branch, master has been updated
       via  0ad7567d3f89e1e2481de5a588bfd0d93e8c5f1c (commit)
       via  37dff129010b54c90156f55e8e61ef4e7ac850d1 (commit)
      from  192b534b95db07714dd392a4e0fd9759fdad8920 (commit)


- Log -----------------------------------------------------------------
commit 0ad7567d3f89e1e2481de5a588bfd0d93e8c5f1c
Merge: 192b534 37dff12
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Wed Sep 28 18:20:07 2011 +0530

    Merge branch 'QA_3_4'

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

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

diff --git a/ChangeLog b/ChangeLog
index 04ce19b..bc7d5b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,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 dc3d1a1..e941b7c 100644
--- a/sql.php
+++ b/sql.php
@@ -677,7 +677,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




More information about the Git mailing list