mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 04:38:27 +01:00
Code Issues Releases Wiki Activity

Shortcode parser: variable/methods name fix, news event trigger mentioned by the recent commit

Browse Source
This commit is contained in:
secretr 2010-04-25 15:04:53 +00:00
parent e0c8e76f70
commit 78e85fb0ed
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/e_parse_class.php
View File

@ -550,9 +550,9 @@ class e_parse
}
function parseTemplate($text, $parseSCFiles = TRUE, $extraCodes = '', $eVars = null)
function parseTemplate($text, $parseSCFiles = TRUE, $extraCodes = null, $eVars = null)
{
return $this->e_sc->parseCodes($text, $parseSCFiles, $extraCodes, $eVars);
return e107::getScParser()->parseCodes($text, $parseSCFiles, $extraCodes, $eVars);
}
/**

25
e107_handlers/shortcode_handler.php
View File

@ -291,7 +291,7 @@ class e_parse_shortcode
if (is_readable($path))
{
require_once($path);
if (class_exists($_class, false)) // don't allow __autload()
if (class_exists($_class, false)) // don't allow __autoload()
{
// register instance directly to allow override
$this->scClasses[$className] = new $_class();
@ -485,7 +485,7 @@ class e_parse_shortcode
return in_array($code, $this->scOverride);
}
function parseCodes($text, $useSCFiles = true, $extraCodes = '', $eVars = null)
function parseCodes($text, $useSCFiles = true, $extraCodes = null, $eVars = null)
{
$saveParseSCFiles = $this->parseSCFiles; // In case of nested call
$this->parseSCFiles = $useSCFiles;
@ -507,7 +507,7 @@ class e_parse_shortcode
$this->scClasses[$classname] = $extraCodes;
// auto-register eVars if possible - call it manually?
// $this->callScFunc($classname, 'setVars', $this->eVars);
// $this->callScFunc($classname, 'setParserVars', $this->eVars);
}
elseif (is_array($extraCodes))
{
@ -621,13 +621,13 @@ class e_parse_shortcode
}
// egister passed eVars object on init - call it manually?
// $this->callScFunc($_class, 'setVars', $this->eVars);
// $this->callScFunc($_class, 'setVars', $this->eParserVars);
}
// FIXME - register passed eVars object - BAD solution - called on EVERY sc method call
// XXX - removal candidate - I really think it should be done manually (outside the parser)
// via e107::getScBatch(name)->setVars($eVars);
// $this->callScFunc($_class, 'setVars', $this->eVars);
// via e107::getScBatch(name)->setParserVars($eVars);
// $this->callScFunc($_class, 'setParserVars', $this->eVars);
$ret = $this->callScFuncA($_class, $_method, array($parm, $sc_mode));
/*if (method_exists($this->scClasses[$_class], $_method))
@ -827,7 +827,7 @@ class e_shortcode
* Stores passed to shortcode handler simple parser object
* @var e_vars
*/
protected $eVars = null;
protected $eParserVars = null;
/**
* Storage for shortcode values
@ -846,11 +846,9 @@ class e_shortcode
* @param e_vars $eVars
* @return e_shortcode
*/
public function setVars($eVars)
public function setParserVars($eVars)
{
if (null === $eVars)
$eVars = new e_vars();
$this->eVars = $eVars;
$this->eParserVars = $eVars;
return $this;
}
@ -859,9 +857,10 @@ class e_shortcode
*
* @return e_vars
*/
public function getVars()
public function getParserVars()
{
return $this->eVars;
if(null === $this->eParserVars) $this->eParserVars = new e_vars();
return $this->eParserVars;
}
/**

5
news.php
View File

@ -204,7 +204,10 @@ if ($action == 'cat' || $action == 'all')
$param['catlink'] = (defined("NEWSLIST_CATLINK")) ? NEWSLIST_CATLINK : "";
$param['caticon'] = (defined("NEWSLIST_CATICON")) ? NEWSLIST_CATICON : ICONSTYLE;
$param['current_action'] = $action;
// NEW - allow news batch shortcode override (e.g. e107::getScBatch('news', 'myplugin', true); )
e107::getEvent()->trigger('news_list_parse', $newsList);
foreach($newsList as $row)
{
$text .= $ix->render_newsitem($row, 'return', '', $NEWSLISTSTYLE, $param);