diff includes/locale.inc @ 19:3edae6ecd6c6 6.9

Drupal 6.9
author Franck Deroche <franck@defr.org>
date Thu, 15 Jan 2009 10:15:56 +0100
parents 4347c45bb494
children
line wrap: on
line diff
--- a/includes/locale.inc	Tue Dec 23 14:32:55 2008 +0100
+++ b/includes/locale.inc	Thu Jan 15 10:15:56 2009 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: locale.inc,v 1.174.2.5 2008/12/10 21:29:36 goba Exp $
+// $Id: locale.inc,v 1.174.2.7 2009/01/06 15:36:51 goba Exp $
 
 /**
  * @file
@@ -665,6 +665,7 @@
   else {
     drupal_set_message(t('File to import not found.'), 'error');
     $form_state['redirect'] = 'admin/build/translate/import';
+    return;
   }
 
   $form_state['redirect'] = 'admin/build/translate';
@@ -1368,7 +1369,7 @@
   }
   elseif ($mode == LOCALE_IMPORT_OVERWRITE) {
     // Empty translation, remove existing if instructed.
-    db_query("DELETE FROM {locales_target} WHERE language = '%s' AND lid = %d AND plid = %d AND plural = %d", $translation, $langcode, $lid, $plid, $plural);
+    db_query("DELETE FROM {locales_target} WHERE language = '%s' AND lid = %d AND plid = %d AND plural = %d", $langcode, $lid, $plid, $plural);
     $report['deletes']++;
   }