dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Remove support for StartProfiler.php"
[lhc/web/wiklou.git]
/
includes
/
TemplateParser.php
diff --git
a/includes/TemplateParser.php
b/includes/TemplateParser.php
index
2293dab
..
4210a96
100644
(file)
--- a/
includes/TemplateParser.php
+++ b/
includes/TemplateParser.php
@@
-46,7
+46,7
@@
class TemplateParser {
protected $compileFlags = LightnCandy::FLAG_ERROR_EXCEPTION;
/**
protected $compileFlags = LightnCandy::FLAG_ERROR_EXCEPTION;
/**
- * @param string $templateDir
+ * @param string
|null
$templateDir
* @param bool $forceRecompile
*/
public function __construct( $templateDir = null, $forceRecompile = false ) {
* @param bool $forceRecompile
*/
public function __construct( $templateDir = null, $forceRecompile = false ) {
@@
-67,7
+67,7
@@
class TemplateParser {
}
/**
}
/**
- * Constructs the location of the
the
source Mustache template
+ * Constructs the location of the source Mustache template
* @param string $templateName The name of the template
* @return string
* @throws UnexpectedValueException If $templateName attempts upwards directory traversal
* @param string $templateName The name of the template
* @return string
* @throws UnexpectedValueException If $templateName attempts upwards directory traversal
@@
-209,8
+209,11
@@
class TemplateParser {
* );
* @endcode
* @param string $templateName The name of the template
* );
* @endcode
* @param string $templateName The name of the template
+ * @param-taint $templateName exec_misc
* @param mixed $args
* @param mixed $args
+ * @param-taint $args none
* @param array $scopes
* @param array $scopes
+ * @param-taint $scopes none
* @return string
*/
public function processTemplate( $templateName, $args, array $scopes = [] ) {
* @return string
*/
public function processTemplate( $templateName, $args, array $scopes = [] ) {