Index: branches/5.2.x/core/kernel/managers/rewrite_url_processor.php
===================================================================
diff -u -N -r15374 -r15408
--- branches/5.2.x/core/kernel/managers/rewrite_url_processor.php	(.../rewrite_url_processor.php)	(revision 15374)
+++ branches/5.2.x/core/kernel/managers/rewrite_url_processor.php	(.../rewrite_url_processor.php)	(revision 15408)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: rewrite_url_processor.php 15374 2012-05-30 15:27:07Z alex $
+* @version	$Id: rewrite_url_processor.php 15408 2012-06-14 10:07:22Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -233,7 +233,7 @@
 	 */
 	protected function _getCachedUrl($url)
 	{
-		if (!$url) {
+		if ( !$url || (defined('DBG_CACHE_URLS') && !DBG_CACHE_URLS) ) {
 			return false;
 		}
 
@@ -242,9 +242,9 @@
 				WHERE Hash = ' . kUtil::crc32($url) . ' AND DomainId = ' . (int)$this->Application->siteDomainField('DomainId');
 		$data = $this->Conn->GetRow($sql);
 
-		if ($data) {
+		if ( $data ) {
 			$lifetime = (int)$data['LifeTime']; // in seconds
-			if (($lifetime > 0) && ($data['Cached'] + $lifetime < adodb_mktime())) {
+			if ( ($lifetime > 0) && ($data['Cached'] + $lifetime < TIMENOW) ) {
 				// delete expired
 				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'CachedUrls
 						WHERE UrlId = ' . $data['UrlId'];
@@ -269,16 +269,16 @@
 	 */
 	protected function _setCachedUrl($url, $data)
 	{
-		if (!$url) {
-			return ;
+		if ( !$url || (defined('DBG_CACHE_URLS') && !DBG_CACHE_URLS) ) {
+			return;
 		}
 
 		$vars = $data['vars'];
 		$passed = $data['passed'];
 		sort($passed);
 
 		// get expiration
-		if ($vars['m_cat_id'] > 0) {
+		if ( $vars['m_cat_id'] > 0 ) {
 			$sql = 'SELECT PageExpiration
 					FROM ' . TABLE_PREFIX . 'Categories
 					WHERE CategoryId = ' . $vars['m_cat_id'];
@@ -289,10 +289,10 @@
 		$prefixes = Array ();
 		$m_index = array_search('m', $passed);
 
-		if ($m_index !== false) {
+		if ( $m_index !== false ) {
 			unset($passed[$m_index]);
 
-			if ($vars['m_cat_id'] > 0) {
+			if ( $vars['m_cat_id'] > 0 ) {
 				$prefixes[] = 'c:' . $vars['m_cat_id'];
 			}
 
@@ -301,7 +301,7 @@
 		}
 
 		foreach ($passed as $prefix) {
-			if (array_key_exists($prefix . '_id', $vars) && is_numeric($vars[$prefix . '_id'])) {
+			if ( array_key_exists($prefix . '_id', $vars) && is_numeric($vars[$prefix . '_id']) ) {
 				$prefixes[] = $prefix . ':' . $vars[$prefix . '_id'];
 			}
 			else {