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

Merge branch 'QA_4_1'

Browse Source 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
This commit is contained in:
Ann + J.M 2014-04-02 11:33:27 +02:00
commit 98fa0cd96d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -50,7 +50,6 @@ phpMyAdmin - ChangeLog
4.1.13.0 (not yet released)
- bug #4279 CTRL + up or down moves 2 fields
- bug #4336 List server css style wrong
- bug #4345 Privileges editor shows databases with underscore backslash-escaped
- bug Missing value on the Status > Server page
- bug #4347 Fixed PHP Parse error in Advisor
@ -61,7 +60,7 @@ phpMyAdmin - ChangeLog
- bug #4326 Cannot find the import plugins which start with uppercase 'I'
4.1.11.0 (2014-03-23)
- bug #4335 reCaptcha problem (4.1.10 regression)
- bug #4335 reCaptcha problem (4.1.10 regression)
4.1.10.0 (2014-03-22)
- bug #4301 Grid edit: "SELECT" query is replaced by "UPDATE" query after edit
@ -69,11 +68,11 @@ phpMyAdmin - ChangeLog
- bug #4324 Datepicker not showing up on insert page
- bug #3991 Problem selecting item in select boxes with the ENTER keystroke in some browsers
- bug #4323 QueryWindow ignores CodeMirror
- bug None of the live charts shown on "Status -> Monitor" (Chrome)
- bug None of the live charts shown on "Status -> Monitor" (Chrome)
4.1.9.0 (2014-03-06)
- bug #4279 CTRL + up or down moves two fields (part one)
- bug #4294 output as text radio clickable for "OpenDocument Text" export
- bug #4294 output as text radio clickable for "OpenDocument Text" export
- bug #4297 DROP DATABASE tick box in export no longer works
- bug #4291 Unable to export comments in OpenDocument text format
- bug #4299 Deletion even when the user says "No" to the confirmation message
@ -99,7 +98,7 @@ phpMyAdmin - ChangeLog
- Fixed altering table to DOUBLE/FLOAT field
- bug #4292 Success message and failure message being shown together
- bug #4293 opening new tab (using selflink) for import.php based actions
results in error and logout
results in error and logout
4.1.7.0 (2014-02-09)
- bug #4245 initial Browse query does not match sorting order

11
libraries/server_privileges.lib.php
View File

@ -2537,7 +2537,7 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
)
)
. '">'
. htmlspecialchars(stripslashes($dbname)) . ': '
. htmlspecialchars($dbname) . ': '
. PMA_Util::getTitleForTarget(
$GLOBALS['cfg']['DefaultTabDatabase']
)
@ -2692,7 +2692,7 @@ function PMA_getHtmlForUserRights($db_rights, $dbname,
$html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
. '<td>'
. htmlspecialchars(
(! strlen($dbname)) ? stripslashes($row['Db']) : $row['Table_name']
(! strlen($dbname)) ? $row['Db'] : $row['Table_name']
)
. '</td>' . "\n"
. '<td><code>' . "\n"
@ -2799,7 +2799,7 @@ function PMA_getHtmlForAllTableSpecificRights(
// table body
// get data
// we also want privileges for this user not in table `db` but in other table
// we also want privielgs for this user not in table `db` but in other table
$tables = $GLOBALS['dbi']->fetchResult('SHOW TABLES FROM `mysql`;');
/**
@ -3785,14 +3785,13 @@ function PMA_getHtmlHeaderForUserProperties(
'tablename' => '',
)
)
. '">' . htmlspecialchars(stripslashes($dbname))
. '">' . htmlspecialchars($dbname)
. '</a></i>';
$html_output .= ' - ' . __('Table')
. ' <i>' . htmlspecialchars($tablename) . '</i>';
} else {
$html_output .= ' <i>' . htmlspecialchars(stripslashes($dbname))
. '</i>';
$html_output .= ' <i>' . htmlspecialchars($dbname) . '</i>';
}
} else {