mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-24 07:03:06 +02:00
Code Issues Releases Wiki Activity

Parser fix and FAQ 'ask a question' permissions fix.

Browse Source
This commit is contained in:
Cameron
2015-06-19 09:52:29 -07:00
parent 7e4c26e458
commit 9964def818
3 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/e_parse_class.php
View File

@@ -829,11 +829,9 @@ class e_parse extends e_parser
{
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);
$text = $this->simpleParse($text, $extraCodes, false);
}
return e107::getScParser()->parseCodes($text, $parseSCFiles, $extraCodes, $eVars);
}
@@ -851,15 +849,23 @@ class e_parse extends e_parser
}
foreach ($extraCodes as $sc => $code)
{
if(!strpos($code, 'return '))
{
if(preg_match('/return(.*);/',$code)) // still problematic. 'return;' Might be used in common speech.
{
return false;
}
else
{
return true;
}
/* if(!strpos($code, 'return '))
{
return true;
}
else
{
return false;
}
}*/
}
}