gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-09-28 16:40:06 +02:00
commit c73384e07f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

2
sql.php
View File

@ -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) {