b897ed8 rolled back

Author: dovg

main/DAOs/GenericDAO.class.php

@@ -18,7 +18,7 @@ abstract class GenericDAO extends Singleton implements BaseDAO
 	{
 		private $identityMap	= array();
 
-		private $linkName		= null;
+		protected $linkName		= null;
 
 		abstract public function getTable();
 		abstract public function getObjectName();
@@ -73,7 +73,7 @@ public function completeObject(Identifiable $object)
 		**/
 		public function getLinkName()
 		{
-			return $this->getDefaultLinkName();
+			return $this->linkName;
 		}
 
 		public function getIdName()
@@ -361,11 +361,6 @@ public function registerWorkerUncacher(UncacherBase $uncacher)
 			DBPool::getByDao($this)->registerUncacher($uncacher);
 		}
 
-		final protected function getDefaultLinkName()
-		{
-			return $this->linkName;
-		}
-		
 		protected function inject(
 			InsertOrUpdateQuery $query,
 			Identifiable $object