1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 03:24:20 +02:00

Login page template/shortcode fixes.

This commit is contained in:
Cameron
2016-02-29 15:13:32 -08:00
parent 8c0680a18a
commit b4c4352080
7 changed files with 69 additions and 73 deletions

View File

@@ -828,13 +828,18 @@ class e_parse extends e_parser
* @param object $eVars - XXX more info needed.
* @return string
*/
function parseTemplate($text, $parseSCFiles = TRUE, $extraCodes = null, $eVars = null)
function parseTemplate($text, $parseSCFiles = true, $extraCodes = null, $eVars = null)
{
if(!empty($extraCodes) && $this->isSimpleParse($extraCodes)) // support for a combined simple and standard template parse. - (eg. used by signup email template.)
{
$text = $this->simpleParse($text, $extraCodes, false);
}
if(!is_bool($parseSCFiles))
{
trigger_error("\$parseSCFiles in parseTemplate() was given incorrect data");
}
return e107::getScParser()->parseCodes($text, $parseSCFiles, $extraCodes, $eVars);
}