Index: branches/RC/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r11711 -r11760
--- branches/RC/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 11711)
+++ branches/RC/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 11760)
@@ -1183,9 +1183,7 @@
 			$data = $content->GetField('Content');
 		}
 
-		$data = $this->_transformContentBlockData($data, $params);
-
-		return $edit_code_before . $this->_replacePageIds($data) . $edit_code_after;
+		return $edit_code_before . $this->_transformContentBlockData($data, $params) . $edit_code_after;
 	}
 
 	/**
@@ -1200,38 +1198,6 @@
 	}
 
 	/**
-	 * Replace links like "@@ID@@" to actual template names in given text
-	 *
-	 * @param string $text
-	 * @return string
-	 */
-	function _replacePageIds($text)
-	{
-		if (!preg_match_all('/@@(\\d+)@@/', $text, $regs)) {
-			return $text;
-		}
-
-		$page_ids = $regs[1];
-
-		$sql = 'SELECT NamedParentPath, CategoryId
-				FROM ' . TABLE_PREFIX . 'Category
-				WHERE CategoryId IN (' . implode(',', $page_ids) . ')';
-
-		$templates = $this->Conn->GetCol($sql, 'CategoryId');
-
-		foreach ($page_ids as $page_id) {
-			if (!array_key_exists($page_id, $templates)) {
-				// internal page was deleted, but link to it was found in given content block data
-				continue;
-			}
-
-			$text = preg_replace('/@@' . $page_id . '@@/', $this->Application->HREF(strtolower($templates[$page_id]), '', Array ('pass' => 'm')), $text);
-		}
-
-		return $text;
-	}
-
-	/**
 	 * Returns current page name or page based on page/page_id parameters
 	 *
 	 * @param Array $params