git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2…

…661 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Mar 31, 2007 · f121ef7 · f121ef7
1 parent 047db38
commit f121ef7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/admin/importsurvey.php b/admin/importsurvey.php
@@ -569,7 +569,7 @@
 		// set the new language
 		if ($importversion<=100)
             {
-            $labelsetrowdata['languages']=$newlanguage.' ';
+            $labelsetrowdata['languages']=$newlanguage;
             } 
         unset($labelsetrowdata['lid']);
         $newvalues=array_values($labelsetrowdata);

diff --git a/common.php b/common.php
@@ -892,7 +892,7 @@ function getlabelsets($languages=null)
         $query .=" where ";
         foreach  ($languagesarray as $item)
         {
-        $query .=" languages like '%$item %' and ";
+        $query .=" ((languages like '% $item %') or (languages='$item') or (languages like '% $item') or (languages like '$item %')) and ";
         }
         $query .=" 1=1 ";
     }