Dev Fixed usage of deprecated 't' alias for tables. http://static.yii…

…framework.com/files/UPGRADE-1.1.13.txt
LimeSurvey · Jun 25, 2013 · 0127071 · 0127071
1 parent dd647df
commit 0127071
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 20 deletions.
diff --git a/application/controllers/PluginsController.php b/application/controllers/PluginsController.php
@@ -163,6 +163,12 @@ public function __set($property, $value)
              $this->properties[$property] = $value;
          }
 
-
+
+
+		 public function actionTest()
+		 {
+			$response = Response::model(66957)->findByPk(11);
+			$this->renderText('test');
+		 }
     }
 ?>
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -88,7 +88,7 @@ protected function createQuestionIndex($LEMsessid, $surveyMode)
 		if ($_SESSION[$LEMsessid]['maxstep'] == $_SESSION[$LEMsessid]['totalsteps'])
 		{
 			echo "<input class='submit' type='submit' accesskey='l' onclick=\"javascript:document.limesurvey.move.value = 'movesubmit';\" value=' "
-			. $clang->gT("Submit") . " ' name='move2' />\n";
+			. gT("Submit") . " ' name='move2' />\n";
 		}
 
 		echo '</div></div>';

diff --git a/application/models/Answer.php b/application/models/Answer.php
@@ -57,9 +57,10 @@ public function primaryKey()
      */
     public function relations()
     {
+		$alias = $this->getTableAlias();
         return array(
             'questions' => array(self::HAS_ONE, 'Question', '',
-                'on' => 't.qid = questions.qid',
+                'on' => "$alias.qid = questions.qid",
             ),
             'groups' => array(self::HAS_ONE, 'QuestionGroup', '', 'through' => 'questions',
                 'on' => 'questions.gid = groups.gid'

diff --git a/application/models/Condition.php b/application/models/Condition.php
@@ -61,9 +61,10 @@ public function primaryKey()
         */
         public function relations()
         {
+			$alias = $this->getTableAlias();
             return array(
             'questions' => array(self::HAS_ONE, 'Question', '',
-            'on' => 't.cqid = questions.qid',
+            'on' => "$alias.cqid = questions.qid",
             ),
             );
         }

diff --git a/application/models/DefaultValue.php b/application/models/DefaultValue.php
@@ -58,9 +58,10 @@ public function primaryKey()
 	 */
 	public function relations()
 	{
+		$alias = $this->getTableAlias();
 		return array(
 			'question' => array(self::HAS_ONE, 'Question', '',
-						'on' => 't.qid = question.qid',
+						'on' => "$alias.qid = question.qid",
 			),
 		);
 	}

diff --git a/application/models/ParticipantAttributeName.php b/application/models/ParticipantAttributeName.php
@@ -307,7 +307,8 @@ function getnotaddedAttributes($attributeid)
     	}
 
         $criteria = new CDbCriteria();
-        $criteria->addNotInCondition('t.attribute_id', $attributeid);
+		$alias = $this->getTableAlias();
+        $criteria->addNotInCondition("$alias.attribute_id", $attributeid);
         $records = ParticipantAttributeName::model()->with('participant_attribute_names_lang')->findAll($criteria);
         foreach($records as $row) { //Iterate through each attribute
             $thisname="";

diff --git a/application/models/Question.php b/application/models/Question.php
@@ -62,12 +62,13 @@ public function primaryKey()
         */
         public function relations()
         {
+			$alias = $this->getTableAlias();
             return array(
             'groups' => array(self::HAS_ONE, 'QuestionGroup', '',
-            'on' => 't.gid = groups.gid AND t.language = groups.language'
+            'on' => "$alias.gid = groups.gid AND $alias.language = groups.language"
             ),
             'parents' => array(self::HAS_ONE, 'Question', '',
-            'on' => 't.parent_qid = parents.qid',
+            'on' => "$alias.parent_qid = parents.qid",
             ),
             );
         }

diff --git a/application/models/QuestionAttribute.php b/application/models/QuestionAttribute.php
@@ -58,9 +58,10 @@ public function primaryKey()
     */
     public function relations()
     {
+		$alias = $this->getTableAlias();
         return array(
         'qid' => array(self::HAS_ONE, 'Questions', '',
-            'on' => 't.qid = questions.qid',
+            'on' => "$alias.qid = questions.qid",
             ),
         );
     }

diff --git a/application/models/Quota.php b/application/models/Quota.php
@@ -58,9 +58,10 @@ public function primaryKey()
 	 */
 	public function relations()
 	{
+		$alias = $this->getTableAlias();
 		return array(
 			'languagesettings' => array(self::HAS_MANY, 'QuotaLanguageSetting', '',
-				'on' => 't.id = languagesettings.quotals_quota_id'),
+				'on' => "$alias.id = languagesettings.quotals_quota_id"),
 		);
 	}
 

diff --git a/application/models/QuotaLanguageSetting.php b/application/models/QuotaLanguageSetting.php
@@ -58,9 +58,10 @@ public function primaryKey()
 	 */
 	public function relations()
 	{
+		$alias = $this->getTableAlias();
 		return array(
 			'quota' => array(self::BELONGS_TO, 'Quota', '',
-				'on' => 'quota.id = t.quotals_quota_id'),
+				'on' => "quota.id = $alias.quotals_quota_id"),
 		);
 	}
 

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -93,9 +93,10 @@ public static function model($class = __CLASS__)
     */
     public function relations()
     {
+		$alias = $this->getTableAlias();
         return array(
-        'languagesettings' => array(self::HAS_MANY, 'SurveyLanguageSetting', 'surveyls_survey_id'),
-        'owner' => array(self::BELONGS_TO, 'User', '', 'on' => 't.owner_id = owner.uid'),
+			'languagesettings' => array(self::HAS_MANY, 'SurveyLanguageSetting', 'surveyls_survey_id'),
+			'owner' => array(self::BELONGS_TO, 'User', '', 'on' => "$alias.owner_id = owner.uid"),
         );
     }
 

diff --git a/application/models/SurveyDynamic.php b/application/models/SurveyDynamic.php
@@ -145,8 +145,9 @@ public function addTimingCriteria($condition)
         {
             $criteria->select = 't.*';
         }
+		$alias = $this->getTableAlias();
 
-        $newCriteria->join = "LEFT JOIN {{survey_" . self::$sid . "_timings}} survey_timings ON t.id = survey_timings.id";
+        $newCriteria->join = "LEFT JOIN {{survey_" . self::$sid . "_timings}} survey_timings ON $alias.id = survey_timings.id";
         $newCriteria->select = 'survey_timings.*';  // Otherwise we don't get records from the token table
         $newCriteria->mergeWith($criteria);
 
@@ -167,17 +168,18 @@ public function addTokenCriteria($condition)
         $aSelectFields=Yii::app()->db->schema->getTable('{{survey_' . self::$sid  . '}}')->getColumnNames();
         $aSelectFields=array_diff($aSelectFields, array('token'));
         $aSelect=array();
+		$alias = $this->getTableAlias();
         foreach($aSelectFields as $sField)
-            $aSelect[]='t.'.Yii::app()->db->schema->quoteColumnName($sField);
-        $aSelectFields=$aSelect;        
-        $aSelectFields[]='t.token';
+            $aSelect[]="$alias.".Yii::app()->db->schema->quoteColumnName($sField);
+        $aSelectFields=$aSelect;   
+		$aSelectFields[]='$alias.token';
 
         if ($criteria->select == '*')
         {
             $criteria->select = $aSelectFields;
         }
 
-        $newCriteria->join = "LEFT JOIN {{tokens_" . self::$sid . "}} tokens ON t.token = tokens.token";
+        $newCriteria->join = "LEFT JOIN {{tokens_" . self::$sid . "}} tokens ON $alias.token = tokens.token";
 
         $aTokenFields=Yii::app()->db->schema->getTable('{{tokens_' . self::$sid . '}}')->getColumnNames();
         $aTokenFields=array_diff($aTokenFields, array('token'));

diff --git a/application/models/SurveyLanguageSetting.php b/application/models/SurveyLanguageSetting.php
@@ -56,8 +56,9 @@ public static function model($class = __CLASS__)
 	 */
 	public function relations()
 	{
+		$alias = $this->getTableAlias();
 		return array(
-			'survey' => array(self::BELONGS_TO, 'Survey', '', 'on' => 't.surveyls_survey_id = survey.sid'),
+			'survey' => array(self::BELONGS_TO, 'Survey', '', 'on' => "$alias.surveyls_survey_id = survey.sid"),
             'owner' => array(self::BELONGS_TO, 'User', '', 'on' => 'survey.owner_id = owner.uid'),
 		);
 	}

diff --git a/application/models/SurveyTimingDynamic.php b/application/models/SurveyTimingDynamic.php
@@ -97,7 +97,7 @@ public function tableName()
     public function statistics()
     {
         $sid = self::$sid;
-        if(Yii::app()->db->schema->getTable($this->tableName())){
+		if(Yii::app()->db->schema->getTable($this->tableName())){
             $queryAvg=Yii::app()->db->createCommand()
                 ->select("AVG(interviewtime) AS avg, COUNT(*) as count")
                 ->from($this->tableName()." t")