Feature #23156 » 15086.diff

Administrator Admin, 2010-07-12 16:15

View differences:

typo3/sysext/indexed_search/ext_typoscript_setup.txt (working copy)
11 11
		modified =
12 12
	}
13 13

  
14
	pathCharacter = / |*| / |*|  
15

  
14 16
	show {
15 17
		rules = 1
16 18
		parsetimes = 0
typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php (working copy)
765 765
							$sectionTitleLinked = $this->pi_getLL('unnamedSection','',1).':';
766 766
						} else {
767 767
							$onclick = 'document.'.$this->prefixId.'[\''.$this->prefixId.'[_sections]\'].value=\''.$theRLid.'\';document.'.$this->prefixId.'.submit();return false;';
768
							$sectionTitleLinked = '<a href="#" onclick="'.htmlspecialchars($onclick).'">'.htmlspecialchars($sectionName).':</a>';
768
							$sectionTitleLinked = '<a href="#" onclick="'.htmlspecialchars($onclick).'">'.$sectionName.':</a>';
769 769
						}
770 770
						$this->resultSections[$id] = array($sectionName,count($resultRows));
771 771

  
......
2113 2113
				htmlspecialchars($row['data_filename']) .
2114 2114
				'</a>';
2115 2115
		} else {
2116
			$pathStr = htmlspecialchars($this->getPathFromPageId($pathId,$pathMP));
2116
			$pathStr = $this->getPathFromPageId($pathId,$pathMP);
2117 2117
			$tmplArray['path'] = $this->linkPage($pathId,$pathStr,array(
2118 2118
				'cHashParams' => $row['cHashParams'],
2119 2119
				'data_page_type' => $row['data_page_type'],
......
2287 2287
	 *
2288 2288
	 * @param	integer		Page ID
2289 2289
	 * @param	string		MP variable content
2290
	 * @return	string		Path
2290
	 * @return	string		Path (HTML-escaped)
2291 2291
	 */
2292 2292
	function getPathFromPageId($id,$pathMP='')	{
2293 2293

  
......
2299 2299
			$rl = $this->getRootLine($id,$pathMP);
2300 2300
			$hitRoot = 0;
2301 2301
			$path = '';
2302
			if (is_array($rl) && count($rl))	{
2302
			$pageCount = count($rl);
2303
			if (is_array($rl) && $pageCount) {
2304
				$index = 0;
2305
				$pathSeparator = isset($this->conf['pathCharacter']) ? $this->conf['pathCharacter'] : '/';
2306
				$pathSeparators = $GLOBALS['TSFE']->tmpl->splitConfArray(
2307
					array('separator' => $pathSeparator), $pageCount);
2303 2308
				foreach ($rl as $k => $v) {
2309

  
2304 2310
						// Check fe_user
2305 2311
					if ($v['fe_group'] && ($v['uid']==$id || $v['extendToSubpages']))	{
2306 2312
						$this->fe_groups_required[$id][]=$v['fe_group'];
......
2320 2326
					if ($v['uid']==$GLOBALS['TSFE']->config['rootLine'][0]['uid'])		{
2321 2327
						break;
2322 2328
					}
2323
					$path = '/'.$v['title'].$path;
2329
					$path = $pathSeparators[$index]['separator'] . htmlspecialchars($v['title']) . $path;
2330
					$index++;
2324 2331
				}
2332
				if (isset($this->conf['pathCharacter'])) {
2333
					$path .= $pathSeparators[$index]['separator'];
2334
				}
2325 2335
			}
2326 2336

  
2327 2337
			$this->cache_path[$identStr] = $path;
(1-1/2)