diff --git a/t3lib/class.t3lib_befunc.php b/t3lib/class.t3lib_befunc.php
index 822c69ccf83036ea68deca9cbfca2c15641e4e91..d1117bb71e21c3c69b03f0ba7efdc61ce96d14be 100755
--- a/t3lib/class.t3lib_befunc.php
+++ b/t3lib/class.t3lib_befunc.php
@@ -544,7 +544,13 @@ class t3lib_BEfunc	{
 		$output = $fullOutput = '/';
 		while ($uid!=0 && $loopCheck>0)	{
 			$loopCheck--;
-			$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('pid,title', 'pages', 'uid='.intval($uid).t3lib_BEfunc::deleteClause('pages').' AND '.$clause);
+			$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+						'pid,title',
+						'pages',
+						'uid='.intval($uid).
+							t3lib_BEfunc::deleteClause('pages').
+							(strlen(trim($clause)) ? ' AND '.$clause : '')
+					);
 			if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))	{
 				$uid = $row['pid'];
 				$output = '/'.t3lib_div::fixed_lgd(strip_tags($row['title']),$titleLimit).$output;
diff --git a/typo3/sysext/cms/tslib/class.tslib_pibase.php b/typo3/sysext/cms/tslib/class.tslib_pibase.php
index f39c895a09b8a7e8b3e207520273d362e974825f..9440652944510d22fd6baa02306d7b3a13746843 100755
--- a/typo3/sysext/cms/tslib/class.tslib_pibase.php
+++ b/typo3/sysext/cms/tslib/class.tslib_pibase.php
@@ -268,7 +268,7 @@ class tslib_pibase {
 	/**
 	 * Link a string to some page.
 	 * Like pi_getPageLink() but takes a string as first parameter which will in turn be wrapped with the URL including target attribute
-	 * Simple example: $this->pi_getPageLink('My link', 123) to get something like <a href="index.php?id=123&type=1">My link</a> (or <a href="123.1.html">My link</a> if simulateStaticDocuments is set)
+	 * Simple example: $this->pi_linkToPage('My link', 123) to get something like <a href="index.php?id=123&type=1">My link</a> (or <a href="123.1.html">My link</a> if simulateStaticDocuments is set)
 	 *
 	 * @param	string		The content string to wrap in <a> tags
 	 * @param	integer		Page id