Follow-up to #12381: Scheduler: BLOB database fields may not be NOT NULL
[Packages/TYPO3.CMS.git] / typo3 / class.webpagetree.php
index 1d8b628..9ba5bba 100644 (file)
@@ -56,9 +56,6 @@
  */
 
 
-require_once(PATH_t3lib.'class.t3lib_browsetree.php');
-
-
 /**
  * Extension class for the t3lib_browsetree class, specially made
  * for browsing pages in the Web module
@@ -157,13 +154,15 @@ class webPageTree extends t3lib_browseTree {
         * @access      private
         */
        function wrapTitle($title,$row,$bank=0) {
-               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.webPageTree.php']['pageTitleOverlay'])) {
+                       // Hook for overriding the page title
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.webpagetree.php']['pageTitleOverlay'])) {
                        $_params = array('title' => &$title, 'row' => &$row);
-                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.webPageTree.php']['pageTitleOverlay'] as $_funcRef) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.webpagetree.php']['pageTitleOverlay'] as $_funcRef) {
                                t3lib_div::callUserFunction($_funcRef, $_params, $this);
                        }
                        unset($_params);
                }
+
                $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->domIdPrefix.$this->getId($row).'\','.$bank.');';
                $CSM = '';
                if ($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler'])       {
@@ -223,7 +222,7 @@ class webPageTree extends t3lib_browseTree {
                        // if this item is the start of a new level,
                        // then a new level <ul> is needed, but not in ajax mode
                        if($v['isFirst'] && !($doCollapse) && !($doExpand && $expandedPageUid == $uid)) {
-                               $itemHTML = '</div><ul>';
+                               $itemHTML = '<ul>';
                        }
 
                        // add CSS classes to the list item
@@ -233,10 +232,10 @@ class webPageTree extends t3lib_browseTree {
                        $itemHTML .='
                                <li id="'.$idAttr.'"'.($classAttr ? ' class="'.$classAttr.'"' : '').'><div class="treeLinkItem">'.
                                        $v['HTML'].
-                                       $this->wrapTitle($this->getTitleStr($v['row'],$titleLen),$v['row'],$v['bank'])."\n";
+                                       $this->wrapTitle($this->getTitleStr($v['row'],$titleLen),$v['row'],$v['bank'])."</div>\n";
 
 
-                       if(!$v['hasSub']) { $itemHTML .= '</div></li>'; }
+                       if(!$v['hasSub']) { $itemHTML .= '</li>'; }
 
                        // we have to remember if this is the last one
                        // on level X so the last child on level X+1 closes the <ul>-tag