mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Moved list detection to class2.

Browse Source
This commit is contained in:
Cameron
2019-06-16 13:45:05 -07:00
parent fa6852ea8e
commit a9292caef0
5 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
class2.php
View File

@@ -1188,6 +1188,10 @@ if (!class_exists('e107table', false))
$thm = new $this->themeClass(); $thm = new $this->themeClass();
} }
// Automatic list detection .
$isList = (strpos(ltrim($text), '<ul ') !== false) ? true : false;
$this->setContent('list', $isList);
$options = $this->getContent(); $options = $this->getContent();
$options['uniqueId'] = $this->uniqueId; $options['uniqueId'] = $this->uniqueId;

24
e107_handlers/news_class.php
View File

@@ -908,17 +908,7 @@ class e_news_tree extends e_front_tree_model
} }
$mod = true === $tablerender ? 'news_latest_menu' : $tablerender; $mod = true === $tablerender ? 'news_latest_menu' : $tablerender;
return e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
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;
} }
if($return) return $ret; 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; $mod = true === $tablerender ? 'news_categories_menu' : $tablerender;
return e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
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;
} }
if($return) return $ret; if($return) return $ret;

5
e107_plugins/login_menu/login_menu.php
View File

@@ -151,11 +151,6 @@ if (USER == TRUE || ADMIN == TRUE)
$caption = LAN_LOGINMENU_5.' '.USERNAME; $caption = LAN_LOGINMENU_5.' '.USERNAME;
} }
//render
if(strpos($text,'<ul ') !== false)
{
$ns->setUniqueId('login-menu')->setContent('list', true);
}
$ns->tablerender($caption, $text, 'login'); $ns->tablerender($caption, $text, 'login');

6
e107_plugins/news/news_archive_menu.php
View File

@@ -104,12 +104,6 @@ e107::plugLan('news');
$caption = !empty($parm['caption'][e_LANGUAGE]) ? $parm['caption'][e_LANGUAGE] : LAN_NEWSARCHIVE_MENU_TITLE; $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'); e107::getRender()->tablerender($caption, $start.$text.$end, 'news-archive-menu');

5
e107_plugins/news/news_months_menu.php
View File

@@ -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); $cached = $ns->tablerender(BLOGCAL_L1." ".$req_year, $cached, 'news_months_menu', true);