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:
Weblate 2013-01-21 19:30:51 +01:00
commit 5bfc03a84c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server_privileges.php
View File

@ -423,7 +423,10 @@ if (isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'db') {
if (isset($_REQUEST['export'])
|| (isset($_REQUEST['submit_mult']) && $_REQUEST['submit_mult'] == 'export')
) {
list($title, $export) = PMA_getHtmlForExportUserDefinition($username, $hostname);
list($title, $export) = PMA_getHtmlForExportUserDefinition(
isset($username) ? $username : null,
isset($hostname) ? $hostname : null
);
unset($username, $hostname, $grants, $one_grant);

2
server_status.php
View File

@ -122,7 +122,7 @@ function getServerTrafficHtml($ServerStatusData)
$retval .= __('Replication status');
$retval .= '</a></h3>';
foreach ($GLOBALS['replication_types'] as $type) {
if (${"server_{$type}_status"}) {
if (isset(${"server_{$type}_status"}) && ${"server_{$type}_status"}) {
PMA_replication_print_status_table($type);
}
}

7
tbl_chart.php
View File

@ -29,11 +29,10 @@ if (isset($_REQUEST['ajax_request'])
exit;
}
$sql_limit_to_append = ' LIMIT ' . $_REQUEST['pos'] . ', '
. $_REQUEST['session_max_rows'] . " ";
$sql_query .= $sql_limit_to_append;
$sql_with_limit = 'SELECT * FROM( ' . $sql_query . ' ) AS `temp_res` LIMIT '
. $_REQUEST['pos'] . ', ' . $_REQUEST['session_max_rows'];
$data = array();
$result = PMA_DBI_try_query($sql_query);
$result = PMA_DBI_try_query($sql_with_limit);
while ($row = PMA_DBI_fetch_assoc($result)) {
$data[] = $row;
}