mirror of
https://github.com/e107inc/e107.git
synced 2025-08-01 12:20:44 +02:00
Moved list detection to class2.
This commit is contained in:
@@ -1188,6 +1188,10 @@ if (!class_exists('e107table', false))
|
||||
$thm = new $this->themeClass();
|
||||
}
|
||||
|
||||
// Automatic list detection .
|
||||
$isList = (strpos(ltrim($text), '<ul ') !== false) ? true : false;
|
||||
$this->setContent('list', $isList);
|
||||
|
||||
$options = $this->getContent();
|
||||
|
||||
$options['uniqueId'] = $this->uniqueId;
|
||||
|
@@ -908,17 +908,7 @@ class e_news_tree extends e_front_tree_model
|
||||
}
|
||||
|
||||
$mod = true === $tablerender ? 'news_latest_menu' : $tablerender;
|
||||
|
||||
if(strpos($ret,'<ul ') !== false)
|
||||
{
|
||||
e107::getRender()->setUniqueId(varset($parms['mode'], $mod))->setContent('list', true);
|
||||
}
|
||||
|
||||
$text = e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
|
||||
|
||||
|
||||
|
||||
return $text;
|
||||
return e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
|
||||
}
|
||||
|
||||
if($return) return $ret;
|
||||
@@ -1144,17 +1134,7 @@ class e_news_category_tree extends e_front_tree_model
|
||||
}
|
||||
|
||||
$mod = true === $tablerender ? 'news_categories_menu' : $tablerender;
|
||||
|
||||
if(strpos($ret,'<ul ') !== false)
|
||||
{
|
||||
e107::getRender()->setUniqueId($mod)->setContent('list', true);
|
||||
}
|
||||
|
||||
$text = e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
|
||||
|
||||
|
||||
|
||||
return $text;
|
||||
return e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
|
||||
}
|
||||
|
||||
if($return) return $ret;
|
||||
|
@@ -151,11 +151,6 @@ if (USER == TRUE || ADMIN == TRUE)
|
||||
$caption = LAN_LOGINMENU_5.' '.USERNAME;
|
||||
}
|
||||
|
||||
//render
|
||||
if(strpos($text,'<ul ') !== false)
|
||||
{
|
||||
$ns->setUniqueId('login-menu')->setContent('list', true);
|
||||
}
|
||||
|
||||
$ns->tablerender($caption, $text, 'login');
|
||||
|
||||
|
@@ -104,12 +104,6 @@ e107::plugLan('news');
|
||||
|
||||
$caption = !empty($parm['caption'][e_LANGUAGE]) ? $parm['caption'][e_LANGUAGE] : LAN_NEWSARCHIVE_MENU_TITLE;
|
||||
|
||||
|
||||
if(strpos($start,'<ul ') !== false)
|
||||
{
|
||||
e107::getRender()->setUniqueId('news-archive-menu')->setContent('list', true);
|
||||
}
|
||||
|
||||
e107::getRender()->tablerender($caption, $start.$text.$end, 'news-archive-menu');
|
||||
|
||||
|
||||
|
@@ -135,11 +135,6 @@ if(false === $cached)
|
||||
|
||||
}
|
||||
|
||||
if(strpos($cached,'<ul ') !== false)
|
||||
{
|
||||
e107::getRender()->setUniqueId('news-months-menu')->setContent('list', true);
|
||||
}
|
||||
|
||||
$cached = $ns->tablerender(BLOGCAL_L1." ".$req_year, $cached, 'news_months_menu', true);
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user