mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-06-04 18:06:58 +02:00
Code Issues Releases Wiki Activity

Issue #1669 - incorrect shortcode object

Browse Source
This commit is contained in:
Cameron 2016-05-24 11:08:22 -07:00
parent be41e46306
commit f91eaacda9
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/e_parse_class.php
View File

@ -824,7 +824,7 @@ class e_parse extends e_parser
/**
* @param $text - template to parse.
* @param boolean $parseSCFiles - parse core 'single' shortcodes
* @param array $extraCodes - support legacy shortcode content (eg. content within .sc) as well as simpleParse array format.
* @param object|array $extraCodes - shortcode class containing sc_xxxxx methods or an array of key/value pairs or legacy shortcode content (eg. content within .sc)
* @param object $eVars - XXX more info needed.
* @return string
*/

26
e107_handlers/theme_handler.php
View File

@ -852,7 +852,8 @@ class themeHandler
$itext = '';
// New in 0.8 WORK IN PROGRESS ----
if($theme['layouts'])
@ -1335,9 +1336,30 @@ class themeHandler
$itext .= "</td>
<td style='vertical-align:top'>";
// Default
$itext .= ($pref['sitetheme_deflayout'] != $key) ? $custompage_diz."<div class='e-hideme' id='element-to-be-shown-{$key}'><textarea style='width:97%' rows='6' placeholder='usersettings.php' cols='20' name='custompages[".$key."]' >".(isset($pref['sitetheme_custompages'][$key]) ? implode("\n", $pref['sitetheme_custompages'][$key]) : "")."</textarea></div>\n" : TPVLAN_55;
if($pref['sitetheme_deflayout'] != $key)
{
$itext .= $custompage_diz."<div class='e-hideme' id='element-to-be-shown-{$key}'>
<textarea style='width:97%' rows='6' placeholder='usersettings.php' cols='20' name='custompages[".$key."]' >".(isset($pref['sitetheme_custompages'][$key]) ? implode("\n", $pref['sitetheme_custompages'][$key]) : "")."</textarea>";
//TODO Later.
// $itext .= e107::getForm()->userclass('layoutUserclass['.$key.']',null, null, array('options'=>'public,member,admin,classes,no-excludes','size'=>'xxlarge'));
$itext .= "
</div>\n";
}
else
{
$itext .= TPVLAN_55;
}
$itext .= "</td>";
$itext .= "<td>";

9
user.php
View File

@ -258,9 +258,9 @@ if (isset($id))
else
{
// $userList = $sql->db_getList();
$text = $tp->parseTemplate($USER_SHORT_TEMPLATE_START, TRUE, $user_shortcodes);
$sc = e107::getScBatch('user');
$text = $tp->parseTemplate($USER_SHORT_TEMPLATE_START, TRUE, $sc);
foreach ($data as $row)
{
$loop_uid = $row['user_id'];
@ -269,9 +269,10 @@ if (isset($id))
$sc->setVars($row);
$sc->wrapper('user/list');
$text .= $tp->parseTemplate($USER_SHORT_TEMPLATE, TRUE, $user_shortcodes);
$text .= $tp->parseTemplate($USER_SHORT_TEMPLATE, TRUE, $sc);
}
$text .= $tp->parseTemplate($USER_SHORT_TEMPLATE_END, TRUE, $user_shortcodes);
$text .= $tp->parseTemplate($USER_SHORT_TEMPLATE_END, TRUE, $sc);
}
$ns->tablerender(LAN_USER_52, $text);