Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -N -r14428 -r14560
--- branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 14428)
+++ branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 14560)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 14428 2011-07-05 16:31:44Z alex $
+* @version	$Id: application.php 14560 2011-09-19 21:01:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -774,12 +774,13 @@
 	 *
 	 * @param int $key key name from cache
 	 * @param bool $store_locally store data locally after retrieved
+	 * @param int $max_rebuild_seconds
 	 * @return mixed
 	 * @access public
 	 */
-	public function getCache($key, $store_locally = true)
+	public function getCache($key, $store_locally = true, $max_rebuild_seconds = 0)
 	{
-		return $this->cacheManager->getCache($key, $store_locally);
+		return $this->cacheManager->getCache($key, $store_locally, $max_rebuild_seconds);
 	}
 
 	/**
@@ -796,6 +797,18 @@
 	}
 
 	/**
+	 * Sets rebuilding mode for given cache
+	 *
+	 * @param string $name
+	 * @param int $mode
+	 * @param int $max_rebuilding_time
+	 */
+	public function rebuildCache($name, $mode = null, $max_rebuilding_time = 0)
+	{
+		$this->cacheManager->rebuildCache($name, $mode, $max_rebuilding_time);
+	}
+
+	/**
 	 * Deletes key from cache
 	 *
 	 * @param string $key
@@ -820,20 +833,21 @@
 	 * Returns value from database cache
 	 *
 	 * @param string $name key name
+	 * @param int $max_rebuild_seconds
 	 * @return mixed
 	 * @access public
 	 */
-	public function getDBCache($name)
+	public function getDBCache($name, $max_rebuild_seconds = 0)
 	{
-		return $this->cacheManager->getDBCache($name);
+		return $this->cacheManager->getDBCache($name, $max_rebuild_seconds);
 	}
 
 	/**
 	 * Sets value to database cache
 	 *
 	 * @param string $name
 	 * @param mixed $value
-	 * @param int $expiration
+	 * @param int|bool $expiration
 	 * @access public
 	 */
 	public function setDBCache($name, $value, $expiration = false)
@@ -842,6 +856,18 @@
 	}
 
 	/**
+	 * Sets rebuilding mode for given cache
+	 *
+	 * @param string $name
+	 * @param int $mode
+	 * @param int $max_rebuilding_time
+	 */
+	public function rebuildDBCache($name, $mode = null, $max_rebuilding_time = 0)
+	{
+		$this->cacheManager->rebuildDBCache($name, $mode, $max_rebuilding_time);
+	}
+
+	/**
 	 * Deletes key from database cache
 	 *
 	 * @param string $name