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

Merge pull request #16768 from mauriciofauth/php81-htmlspecialchars

Browse Source 
Fix PHP 8.1 failing tests
This commit is contained in:
Maurício Meneghini Fauth 2021-03-27 15:51:09 -03:00 committed by GitHub
commit cb141f2092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/classes/Html/Generator.php
View File

@ -606,7 +606,7 @@ class Generator
. '</pre></code>';
} elseif ($query_too_big) {
$query_base = '<code class="sql"><pre>' . "\n" .
htmlspecialchars($query_base) .
htmlspecialchars($query_base, ENT_COMPAT) .
'</pre></code>';
} else {
$query_base = self::formatSql($query_base);
@ -1309,7 +1309,7 @@ class Generator
}
return '<code class="sql"><pre>' . "\n"
. htmlspecialchars($sqlQuery) . "\n"
. htmlspecialchars($sqlQuery, ENT_COMPAT) . "\n"
. '</pre></code>';
}

9
libraries/classes/InsertEdit.php
View File

@ -10,6 +10,7 @@ namespace PhpMyAdmin;
use PhpMyAdmin\Controllers\Table\ChangeController;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Plugins\TransformationsPlugin;
use const ENT_COMPAT;
use const PASSWORD_DEFAULT;
use function array_fill;
use function array_flip;
@ -2067,7 +2068,7 @@ class InsertEdit
: Util::addMicroseconds(
$current_row[$column['Field']]
);
$special_chars = htmlspecialchars($current_row[$column['Field']]);
$special_chars = htmlspecialchars($current_row[$column['Field']], ENT_COMPAT);
} elseif (in_array($column['True_Type'], $gis_data_types)) {
// Convert gis data to Well Know Text format
$current_row[$column['Field']] = $as_is
@ -2076,7 +2077,7 @@ class InsertEdit
$current_row[$column['Field']],
true
);
$special_chars = htmlspecialchars($current_row[$column['Field']]);
$special_chars = htmlspecialchars($current_row[$column['Field']], ENT_COMPAT);
} else {
// special binary "characters"
if ($column['is_binary']
@ -2088,7 +2089,7 @@ class InsertEdit
$current_row[$column['Field']]
);
}
$special_chars = htmlspecialchars($current_row[$column['Field']]);
$special_chars = htmlspecialchars($current_row[$column['Field']], ENT_COMPAT);
//We need to duplicate the first \n or otherwise we will lose
//the first newline entered in a VARCHAR or TEXT column
@ -2115,7 +2116,7 @@ class InsertEdit
// it's better to set a fields_prev in this situation
$backup_field = '<input type="hidden" name="fields_prev'
. $column_name_appendix . '" value="'
. htmlspecialchars($current_row[$column['Field']]) . '">';
. htmlspecialchars($current_row[$column['Field']], ENT_COMPAT) . '">';
return [
$real_null_value,

3
libraries/classes/Message.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use const ENT_COMPAT;
use function array_unshift;
use function count;
use function htmlspecialchars;
@ -462,7 +463,7 @@ class Message
if ($param instanceof self || is_float($param) || is_int($param)) {
$this->params[] = $param;
} else {
$this->params[] = htmlspecialchars((string) $param);
$this->params[] = htmlspecialchars((string) $param, ENT_COMPAT);
}
}

5
libraries/classes/Util.php
View File

@ -1524,7 +1524,7 @@ class Util
}
// for the case ENUM('&#8211;','&ldquo;')
$displayed_type = htmlspecialchars($printtype);
$displayed_type = htmlspecialchars($printtype, ENT_COMPAT);
if (mb_strlen($printtype) > $GLOBALS['cfg']['LimitChars']) {
$displayed_type = '<abbr title="' . htmlspecialchars($printtype) . '">';
$displayed_type .= htmlspecialchars(
@ -1532,7 +1532,8 @@ class Util
$printtype,
0,
(int) $GLOBALS['cfg']['LimitChars']
) . '...'
) . '...',
ENT_COMPAT
);
$displayed_type .= '</abbr>';
}