Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5

LimeSurvey · Dec 9, 2015 · 9ea6949 · 9ea6949
2 parents 799dd96 + f8ded04
commit 9ea6949
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -2195,7 +2195,7 @@ function import($iSurveyId)
                         }
                         if (!$bDuplicateFound && $aWriteArray['email'] != '')
                         {
-                            $aEmailaddresses = preg_split( "/(,|;)/", $aWriteArray['email'] );
+                            $aEmailAddresses = preg_split( "/(,|;)/", $aWriteArray['email'] );
                             foreach ($aEmailAddresses as $sEmailaddress)
                             {
                                 if (!validateEmailAddress($sEmailaddress))