mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2024-12-23 00:41:52 +00:00
Make magic quotes fix play more nicely with PHP 5.3, but it's now untested.
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1583 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
parent
240b565513
commit
d682a59a68
@ -419,7 +419,7 @@ class HTMLPurifier_Config
|
|||||||
*/
|
*/
|
||||||
public static function prepareArrayFromForm($array, $index, $allowed = true, $mq_fix = true, $schema = null) {
|
public static function prepareArrayFromForm($array, $index, $allowed = true, $mq_fix = true, $schema = null) {
|
||||||
$array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
|
$array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
|
||||||
$mq = get_magic_quotes_gpc() && $mq_fix;
|
$mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
|
||||||
|
|
||||||
$allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
|
$allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
|
||||||
$ret = array();
|
$ret = array();
|
||||||
|
@ -403,7 +403,7 @@ class HTMLPurifier_ConfigTest extends HTMLPurifier_Harness
|
|||||||
$config_result = HTMLPurifier_Config::loadArrayFromForm(
|
$config_result = HTMLPurifier_Config::loadArrayFromForm(
|
||||||
$get, 'breakfast',
|
$get, 'breakfast',
|
||||||
array('Pancake.Served', 'Toppings', '-Toppings.Protected'),
|
array('Pancake.Served', 'Toppings', '-Toppings.Protected'),
|
||||||
true, // mq fix
|
false, // mq fix
|
||||||
$this->schema
|
$this->schema
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user