merge from 3.0 branch till 1463.

3 files changed, 8 insertions, 3 deletions

diff --git a/framework/Collections/TList.php b/framework/Collections/TList.php
index f22d6e7b..e646e203 100644
--- a/framework/Collections/TList.php
+++ b/framework/Collections/TList.php
@@ -134,7 +134,7 @@ class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countabl
 	public function add($item)

 	{

 		$this->insertAt($this->_c,$item);

-		return $this->_c;

+		return $this->_c-1;

 	}

 

 	/**

diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 93bdd084..4cfedb09 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -340,6 +340,11 @@ class PradoBase
 		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;

 	}

 

+	protected static function getPathAliases()

+	{

+		return self::$_aliases;

+	}

+

 	/**

 	 * @param string alias to the path

 	 * @param string the path corresponding to the alias

diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index 087cb12a..ac4787f2 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -240,7 +240,7 @@ class TPageService extends TService
 		{

 			$configCached=true;

 			$currentTimestamp=array();

-			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$pagePath);

+			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);

 			if(is_array($arr))

 			{

 				list($pageConfig,$timestamps)=$arr;

@@ -284,7 +284,7 @@ class TPageService extends TService
 				if($config!==null)

 					$pageConfig->loadXmlElement($config,$application->getBasePath(),null);

 				$pageConfig->loadConfigurationFiles($pagePath,$this->getBasePath());

-				$cache->set(self::CONFIG_CACHE_PREFIX.$pagePath,array($pageConfig,$currentTimestamp));

+				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath,array($pageConfig,$currentTimestamp));

 			}

 		}

 		return $pageConfig;