Fixed issue #5909: Re-uploading files after deletions and other probl…

…ems with File Upload question type and Expression Manager
LimeSurvey · Mar 20, 2012 · 273baf9 · 273baf9
1 parent c88a74c
commit 273baf9
Show file tree

Hide file tree

Showing 5 changed files with 6,953 additions and 6,931 deletions.
diff --git a/admin/translate_google_api.php b/admin/translate_google_api.php
@@ -17,13 +17,13 @@
 $sTolang  = str_replace($aSearch,$aReplace,$sTolang);
 
 try {
-    
+
     $objGt         = new Gtranslate;
     // Gtranslate requires you to run function named XXLANG_to_XXLANG
     $sProcedure       = $sBaselang."_to_".$sTolang;
-    
+
     $parts = LimeExpressionManager::SplitStringOnExpressions($sToconvert);
-    
+
     $sparts = array();
     foreach($parts as $part)
     {
@@ -35,7 +35,7 @@
         {
             $convertedPart = $objGt->$sProcedure($part[0]);
             $convertedPart  = str_replace("<br>","\r\n",$convertedPart);
-            $convertedPart  = html_entity_decode(stripcslashes($convertedPart));      
+            $convertedPart  = html_entity_decode(stripcslashes($convertedPart));
             $sparts[] = $convertedPart;
         }
     }
@@ -47,7 +47,7 @@
         'tolang'    =>  $sTolang,
         'converted' =>  $sConverted
     );
-    
+
 }   catch (GTranslateException $ge){
 
     // Get the error message and build the ouput array

diff --git a/delete.php b/delete.php
@@ -78,7 +78,7 @@
            $iFileIndex++;
         }
         if ($found==true) unset($aFiles[$iFileIndex]);
-       $_SESSION[$sFieldname] = json_encode($aFiles);
+       $_SESSION[$sFieldname] = str_replace('{','{ ',json_encode($aFiles));
     }
 
     if (@unlink($sFileDir.$sFilename))