From e2fd556e414e34aabace94b647dfce571bcd49de Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <c_schmitz@users.sourceforge.net>
Date: Tue, 4 Feb 2014 13:04:59 +0100
Subject: [PATCH] Fixed issue #8656: OPTOUTURL from invitation email not
 working

---
 application/controllers/OptoutController.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/application/controllers/OptoutController.php b/application/controllers/OptoutController.php
index 4d7975d2163..4f28cf77138 100644
--- a/application/controllers/OptoutController.php
+++ b/application/controllers/OptoutController.php
@@ -48,10 +48,9 @@ function actiontokens()
         }
         else
         {
-            $sLanguageCode = sanitize_languagecode($sLanguageCode);
+            $sBaseLanguage = sanitize_languagecode($sLanguageCode);
             Yii::import('application.libraries.Limesurvey_lang', true);
-            $clang = new Limesurvey_lang($sLanguageCode);
-            $sBaseLanguage = $sLanguageCode;
+            $clang = new Limesurvey_lang($sBaseLanguage);
         }
 
         Yii::app()->lang = $clang;
@@ -63,7 +62,7 @@ function actiontokens()
         }
         else
         {
-            $oToken = Token::model($iSurveyID)->findByAttributes($sToken);
+            $oToken = Token::model($iSurveyID)->findByAttributes(array('token'=>$sToken));
 
             if (!isset($oToken))
             {