Improvement

diff --git a/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl
index a6d59255ae04a38fcc6cfcffb603b53834d76aeb..7102073cc492c3b4b80cd0122e1b7c7eb55a8421 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl
@@ -29,15 +29,13 @@ WHERE option_group_id = @option_group_id_notePrivacy AND value = 1;
 
 --These labels were never translated so just copy them over as names
 {if $multilingual}
-  {foreach from=$locales item=locale}
-    UPDATE civicrm_option_value v, civicrm_option_group g
-      SET v.name = v.label_{$locale}
-    WHERE g.id = v.option_group_id AND g.name IN
-    ('group_type', 'safe_file_extension', 'wysiwyg_editor');
-  {/foreach}
+  UPDATE civicrm_option_value v, civicrm_option_group g
+  SET v.name = v.label_{$locales.0}
+  WHERE g.id = v.option_group_id AND g.name IN
+  ('group_type', 'safe_file_extension', 'wysiwyg_editor');
 {else}
   UPDATE civicrm_option_value v, civicrm_option_group g
-    SET v.name = v.label
+  SET v.name = v.label
   WHERE g.id = v.option_group_id AND g.name IN
   ('group_type', 'safe_file_extension', 'wysiwyg_editor');
 {/if}