MDL-74823 lib: normalize line endings for HTMLPurifier
Prior to this change, all the line endings in the imported HTMLPurifier library were using CRLF (\r\n aka Windows style), but the HTMLPurifier source and also the downloadable artefacts use LF (\n aka Linux style) as line endings. This has been the case since510d190382when with the commit "MDL-38672 import HTML Purifier 4.5.0" all line endings were changed from LF to CRLF. There was no comment in the commit on why this change was done. As the original source uses LF, this commit partly reverts510d190382and goes back to LF as line endings. Signed-off-by: Daniel Ziegenberg <[email protected]>
This commit is contained in:
@@ -1,38 +1,38 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* This variable parser uses PHP's internal code engine. Because it does
|
||||
* this, it can represent all inputs; however, it is dangerous and cannot
|
||||
* be used by users.
|
||||
*/
|
||||
class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
|
||||
{
|
||||
|
||||
/**
|
||||
* @param mixed $var
|
||||
* @param int $type
|
||||
* @param bool $allow_null
|
||||
* @return null|string
|
||||
*/
|
||||
protected function parseImplementation($var, $type, $allow_null)
|
||||
{
|
||||
return $this->evalExpression($var);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $expr
|
||||
* @return mixed
|
||||
* @throws HTMLPurifier_VarParserException
|
||||
*/
|
||||
protected function evalExpression($expr)
|
||||
{
|
||||
$var = null;
|
||||
$result = eval("\$var = $expr;");
|
||||
if ($result === false) {
|
||||
throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
|
||||
}
|
||||
return $var;
|
||||
}
|
||||
}
|
||||
|
||||
// vim: et sw=4 sts=4
|
||||
<?php
|
||||
|
||||
/**
|
||||
* This variable parser uses PHP's internal code engine. Because it does
|
||||
* this, it can represent all inputs; however, it is dangerous and cannot
|
||||
* be used by users.
|
||||
*/
|
||||
class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
|
||||
{
|
||||
|
||||
/**
|
||||
* @param mixed $var
|
||||
* @param int $type
|
||||
* @param bool $allow_null
|
||||
* @return null|string
|
||||
*/
|
||||
protected function parseImplementation($var, $type, $allow_null)
|
||||
{
|
||||
return $this->evalExpression($var);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $expr
|
||||
* @return mixed
|
||||
* @throws HTMLPurifier_VarParserException
|
||||
*/
|
||||
protected function evalExpression($expr)
|
||||
{
|
||||
$var = null;
|
||||
$result = eval("\$var = $expr;");
|
||||
if ($result === false) {
|
||||
throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
|
||||
}
|
||||
return $var;
|
||||
}
|
||||
}
|
||||
|
||||
// vim: et sw=4 sts=4
|
||||
|
||||
Reference in New Issue
Block a user