Dev Some minor fixes

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@9614 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Dec 9, 2010 · 9a5bda1 · 9a5bda1
1 parent 3ba9f44
commit 9a5bda1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/admin/importquestion.php b/admin/importquestion.php
@@ -139,11 +139,13 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid)
     else    // unknown file - show error message
     {
         $results['fatalerror'] = $clang->gT("This file is not a LimeSurvey question file. Import failed.");
+        return  $results;
     }
 
     if  ((int)$importversion<112)
     {
         $results['fatalerror'] = $clang->gT("This file is too old. Only files from LimeSurvey version 1.50 (DBVersion 112) and newer are supported.");
+        return  $results;
     }
 
     for ($i=0; $i<9; $i++) //skipping the first lines that are not needed

diff --git a/common.php b/common.php
@@ -6038,7 +6038,7 @@ function  bDoesImportarraySupportsLanguage($csvarray,$idkeysarray,$langfieldnum,
         {
             $rowid .= $rowcontents[$idfieldnum]."-";
         }
-        $rowlangarray = split (" ", $rowcontents[$langfieldnum]);
+        $rowlangarray = explode (" ", $rowcontents[$langfieldnum]);
         if (!isset($objlangsupportarray[$rowid]))
         {
             if (array_search($langcode,$rowlangarray)!== false)