dev: fixed dynamic models to refresh when sid changes

LimeSurvey · May 8, 2012 · aee8bd7 · aee8bd7
1 parent e3d0e66
commit aee8bd7
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php
@@ -41,10 +41,17 @@ public static function sid($sid)
 	 */
 	public static function model($sid = null)
 	{
-        if (!is_null($sid))
-            self::sid($sid);
+            $refresh = false;
+            if (!is_null($sid)) {
+                self::sid($sid);
+                $refresh = true;
+            }
+
+            $model = parent::model(__CLASS__);
 
-		return parent::model(__CLASS__);
+            //We need to refresh if we changed sid
+            if ($refresh === true) $model->refreshMetaData();
+            return $model;
 	}
 
 	/**