From b5e57657db75fb4ee4584cd6825c31c45f1ef05d Mon Sep 17 00:00:00 2001
From: Sam Mousa <sam@mousa.nl>
Date: Thu, 9 Aug 2012 11:50:09 +0200
Subject: [PATCH 1/2] Fixed issue: #6456 Fixed the issue, editing now works.

---
 application/controllers/admin/tokens.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
index 0d53112acb4..b1fafb5512a 100644
--- a/application/controllers/admin/tokens.php
+++ b/application/controllers/admin/tokens.php
@@ -588,7 +588,8 @@ function editToken($iSurveyId)
             //            {
             //                $sLang = Yii::app()->request->getPost('language');
             //            }
-            Tokens_dynamic::model()->sid($iSurveyId);
+            Tokens_dynamic::model($iSurveyId);
+            
 
             echo $from . ',' . $until;
             $aData = array(

From f54047240d9ce48bcc69d7e2343dcc8fb726722d Mon Sep 17 00:00:00 2001
From: Sam Mousa <sam@mousa.nl>
Date: Thu, 9 Aug 2012 14:09:54 +0200
Subject: [PATCH 2/2] Fixed issue #6453: The generic image url was used instead
 of the adminimage url. The generic one does not take styles into account, the
 admin-one does.

---
 application/controllers/admin/conditionsaction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
index 40d14a0a8f3..0eb7f68a751 100644
--- a/application/controllers/admin/conditionsaction.php
+++ b/application/controllers/admin/conditionsaction.php
@@ -2051,7 +2051,7 @@ private function _showSpeaker($hinttext)
     {
         global $max;
         $clang = Yii::app()->lang;
-        $imageurl = Yii::app()->getConfig("imageurl");
+        $imageurl = Yii::app()->getConfig("adminimageurl");
 
         if(!isset($max))
         {