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 2012-09-25 20:36:38 +02:00
commit 43fde053c9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/Advisor.class.php
View File

@ -353,7 +353,7 @@ class Advisor
*/
static function parseRulesFile()
{
$file = file('libraries/advisory_rules.txt');
$file = file('libraries/advisory_rules.txt', FILE_IGNORE_NEW_LINES);
$errors = array();
$rules = array();
$lines = array();
@ -367,7 +367,7 @@ class Advisor
for ($i = 0; $i < $numLines; $i++) {
$line = $file[$i];
if ($line[0] == '#' || $line[0] == "\n") {
if ($line == "" || $line[0] == '#') {
continue;
}

2
libraries/config/FormDisplay.tpl.php
View File

@ -328,7 +328,7 @@ function PMA_displayInput($path, $name, $type, $value, $description = '',
if ($is_setup_script && isset($opts['userprefs_allow'])) {
echo '<td class="userprefs-allow" title="' .
__('Allow users to customize this value') . '">';
echo '<input type="checkbox" name="' . $path . '>-userprefs-allow" ';
echo '<input type="checkbox" name="' . $path . '-userprefs-allow" ';
if ($opts['userprefs_allow']) {
echo 'checked="checked"';
};

4
libraries/database_interface.lib.php
View File

@ -123,7 +123,7 @@ function PMA_DBI_query($query, $link = null, $options = 0,
*
* @return void
*/
function PMA_DBI_DBG_query($query, $result, $time)
function PMA_DBI_DBG_query($query, $link, $result, $time)
{
$hash = md5($query);
@ -190,7 +190,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0,
if ($GLOBALS['cfg']['DBG']['sql']) {
$time = microtime(true) - $time;
PMA_DBI_DBG_query($query, $result, $time);
PMA_DBI_DBG_query($query, $link, $result, $time);
}
if ($result != false && PMA_Tracker::isActive() == true ) {