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

Merge pull request #749 from Tithugues/fix-unitialized

Browse Source 
Minor: Fix unitialized variables
This commit is contained in:
Marc Delisle 2013-11-11 11:02:21 -08:00
commit 5f5b49d27e
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/DisplayResults.class.php
View File

@ -5426,18 +5426,18 @@ class PMA_DisplayResults
$result = '[' . $category;
if (is_null($content)) {
$result .= ' - NULL';
$size = 0;
} elseif (isset($content)) {
if (isset($content)) {
$size = strlen($content);
$display_size
= PMA_Util::formatByteDown($size, 3, 1);
= PMA_Util::formatByteDown($size, 3, 1);
$result .= ' - '. $display_size[0] . ' ' . $display_size[1];
} else {
$result .= ' - NULL';
$size = 0;
}
$result .= ']';

2
libraries/plugins/export/ExportOdt.class.php
View File

@ -717,8 +717,6 @@ class ExportOdt extends ExportPlugin
} else {
$column['Default'] = '';
}
} else {
$column['Default'] = $column['Default'];
}
$definition .= '<table:table-cell office:value-type="string">'
. '<text:p>'

1
libraries/plugins/import/ImportCsv.class.php
View File

@ -233,6 +233,7 @@ class ImportCsv extends AbstractImportCsv
// Defaults for parser
$i = 0;
$len = 0;
$lastlen = null;
$line = 1;
$lasti = -1;
$values = array();

4
libraries/tbl_tracking.lib.php
View File

@ -545,6 +545,8 @@ function PMA_getHtmlForDataManipulationStatement($entry, $filter_users,
$statement = PMA_Util::formatSql($entry['statement'], true);
$timestamp = strtotime($entry['date']);
$filtered_user = in_array($entry['username'], $filter_users);
$html = null;
if ($timestamp >= $filter_ts_from
&& $timestamp <= $filter_ts_to
&& (in_array('*', $filter_users) || $filtered_user)
@ -638,6 +640,8 @@ function PMA_getHtmlForDataDefinitionStatement($entry, $filter_users,
$statement = PMA_Util::formatSql($entry['statement'], true);
$timestamp = strtotime($entry['date']);
$filtered_user = in_array($entry['username'], $filter_users);
$html = null;
if ($timestamp >= $filter_ts_from
&& $timestamp <= $filter_ts_to
&& (in_array('*', $filter_users) || $filtered_user)