diff --git a/class2.php b/class2.php index 12a111c1f..a0dabcde8 100644 --- a/class2.php +++ b/class2.php @@ -908,7 +908,8 @@ if (!class_exists('e107table', false)) private $themeClass = ''; private $adminThemeClass = ''; public $frontend = null; - + private $uniqueId = null; + function __construct() { @@ -918,13 +919,23 @@ if (!class_exists('e107table', false)) /** - * @param $style + * Set the style mode for use in tablestyle() method/function + * @param string $style */ - function setStyle($style) + public function setStyle($style) { $this->eSetStyle = $style; } + /** + * Set a unique id for use in tablestyle() method/function + * @param string $id + */ + public function setUniqueId($id) + { + $this->uniqueId = $id; + } + /** * @param $caption string caption text @@ -948,6 +959,10 @@ if (!class_exists('e107table', false)) extract($result); } + + + + if ($return) { if(!empty($text) && $this->eMenuArea) @@ -998,13 +1013,14 @@ if (!class_exists('e107table', false)) if(is_object(vartrue($thm))) { - $thm->tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea, 'menuCount'=>$this->eMenuCount, 'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]), 'setStyle'=>$this->eSetStyle)); + $thm->tablestyle($caption, $text, $mode, array('uniqueId'=>$this->uniqueId, 'menuArea'=>$this->eMenuArea, 'menuCount'=>$this->eMenuCount, 'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]), 'setStyle'=>$this->eSetStyle)); } else { - tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea,'menuCount'=>$this->eMenuCount,'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]),'setStyle'=>$this->eSetStyle)); + tablestyle($caption, $text, $mode, array('uniqueId'=>$this->uniqueId, 'menuArea'=>$this->eMenuArea,'menuCount'=>$this->eMenuCount,'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]),'setStyle'=>$this->eSetStyle)); } + $this->uniqueId = null; } diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 43be7fc1d..17486a70b 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -507,7 +507,7 @@ class admin_shortcodes // $text .= ""; - + $ns->setUniqueId('e-latest-list'); return ($parm != 'norender') ? $ns -> tablerender(ADLAN_LAT_1, $text, '', TRUE) : $text; } @@ -983,6 +983,7 @@ class admin_shortcodes if ($pref['adminpwordchange'] && ((ADMINPWCHANGE+2592000) < time())) { $text = "