Dev Increased separation by making Dynamic::tableName private.

LimeSurvey · Sep 3, 2013 · 018f0d9 · 018f0d9
1 parent 253f5be
commit 018f0d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/application/models/Dynamic.php b/application/models/Dynamic.php
@@ -9,7 +9,7 @@ class Dynamic extends CActiveRecord
 
         private $_md;								// meta data
 
-        protected $tableName;
+        private $tableName;
 
         /**
          * @param string $scenario

diff --git a/application/models/Token.php b/application/models/Token.php
@@ -6,6 +6,15 @@ public function __construct($scenario = 'insert', $surveyId = null)
 		{
 			parent::__construct($scenario, $surveyId);
 		}
+
+		/**
+		 * The model factory. Standard argument $className is not used but I kept
+		 * it to keep it compatible with the normal signature.
+		 * @param type $className
+		 * @param int $surveyId SurveyId must be passed otherwise an exception will be thrown.
+		 * @return type
+		 * @throws Exception
+		 */
 		public static function model($className = null, $surveyId = null)
 		{
 			if (!is_numeric($surveyId))
@@ -41,7 +50,8 @@ public function summary()
 		}
 
 		public function tableName() {
-			return "{{tokens_{$this->tableName}}}";
+			$tableName = parent::tableName();
+			return "{{tokens_{$tableName}}}";
 		}
 
 	}