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

Simple parse via parseTemplate added, small improvements

Browse Source
This commit is contained in:
secretr
2010-02-19 15:10:40 +00:00
parent 994ddd0c30
commit 0488a2b70c
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/e_parse_class.php
View File

@@ -568,10 +568,10 @@ class e_parse
} }
function parseTemplate($text, $parseSCFiles = TRUE, $extraCodes = "") function parseTemplate($text, $parseSCFiles = TRUE, $extraCodes = '', $eVars = null)
{ {
//$this->sch_load(); //$this->sch_load();
return $this->e_sc->parseCodes($text, $parseSCFiles, $extraCodes); return $this->e_sc->parseCodes($text, $parseSCFiles, $extraCodes, $eVars);
} }
function simpleParse(&$template, &$vars, $replaceUnset=true) function simpleParse(&$template, &$vars, $replaceUnset=true)

5
e107_handlers/shortcode_handler.php
View File

@@ -340,11 +340,12 @@ class e_shortcode
return in_array($code, $this->scOverride); return in_array($code, $this->scOverride);
} }
function parseCodes($text, $useSCFiles = true, $extraCodes = '', &$eVars='') function parseCodes($text, $useSCFiles = true, $extraCodes = '', $eVars = null)
{ {
$saveParseSCFiles = $this->parseSCFiles; // In case of nested call $saveParseSCFiles = $this->parseSCFiles; // In case of nested call
$this->parseSCFiles = $useSCFiles; $this->parseSCFiles = $useSCFiles;
$this->eVars = null;
if(is_object($eVars)) { if(is_object($eVars)) {
$this->eVars = $eVars; $this->eVars = $eVars;
} }
@@ -379,7 +380,7 @@ class e_shortcode
{ {
global $pref, $e107cache, $menu_pref, $sc_style, $parm, $sql; global $pref, $e107cache, $menu_pref, $sc_style, $parm, $sql;
if(is_object($this->eVars)) { if($this->eVars) {
if($this->eVars->$matches[1]) { if($this->eVars->$matches[1]) {
return $this->eVars->$matches[1]; return $this->eVars->$matches[1];
} }