Index: t3lib/class.t3lib_tstemplate.php --- t3lib/class.t3lib_tstemplate.php Base (revision 8741) +++ t3lib/class.t3lib_tstemplate.php Locally Modified (Based On LOCAL) @@ -483,31 +483,26 @@ $c=count($this->absoluteRootLine); for ($a=0;$a<$c;$a++) { if ($this->nextLevel) { // If some template loaded before has set a template-id for the next level, then load this template first! - $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_template', 'uid='.intval($this->nextLevel).' '.$this->whereClause); + list($row) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'sys_template', 'uid='.intval($this->nextLevel).' '.$this->whereClause); $this->nextLevel = 0; - if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) { + if (is_array($row)) { $this->versionOL($row); - if (is_array($row)) { - $this->processTemplate($row,'sys_'.$row['uid'],$this->absoluteRootLine[$a]['uid'],'sys_'.$row['uid']); - $this->outermostRootlineIndexWithTemplate=$a; - } + $this->processTemplate($row,'sys_'.$row['uid'],$this->absoluteRootLine[$a]['uid'],'sys_'.$row['uid']); + $this->outermostRootlineIndexWithTemplate=$a; } - $GLOBALS['TYPO3_DB']->sql_free_result($res); } $addC=''; if ($a==($c-1) && $start_template_uid) { // If first loop AND there is set an alternative template uid, use that $addC=' AND uid='.intval($start_template_uid); } - $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_template', 'pid='.intval($this->absoluteRootLine[$a]['uid']).$addC.' '.$this->whereClause,'','sorting',1); - if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) { + list($row) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'sys_template', 'pid=' . intval($this->absoluteRootLine[$a]['uid']) . $addC . ' ' . $this->whereClause, '', 'root DESC, sorting', 1); + if (is_array($row)) { $this->versionOL($row); - if (is_array($row)) { - $this->processTemplate($row,'sys_'.$row['uid'],$this->absoluteRootLine[$a]['uid'],'sys_'.$row['uid']); - $this->outermostRootlineIndexWithTemplate=$a; - } + $this->processTemplate($row,'sys_'.$row['uid'],$this->absoluteRootLine[$a]['uid'],'sys_'.$row['uid']); + $this->outermostRootlineIndexWithTemplate=$a; } - $GLOBALS['TYPO3_DB']->sql_free_result($res); + $this->rootLine[] = $this->absoluteRootLine[$a]; } $this->processIncludes();