4.6 Upgrade Error Fix

diff --git a/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl
index 453acd81438db9c0719493426f59b00662cc9c6a..a6d59255ae04a38fcc6cfcffb603b53834d76aeb 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl
@@ -28,12 +28,21 @@ SET name = 'Author Only'
 WHERE option_group_id = @option_group_id_notePrivacy AND value = 1;
 
 --These labels were never translated so just copy them over as names
-UPDATE civicrm_option_value v, civicrm_option_group g
-SET v.name = {localize field='label'}v.label{/localize} 
-WHERE g.id = v.option_group_id AND g.name IN
-('group_type', 'safe_file_extension', 'wysiwyg_editor');
+{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}
+{else}
+  UPDATE civicrm_option_value v, civicrm_option_group g
+    SET v.name = v.label
+  WHERE g.id = v.option_group_id AND g.name IN
+  ('group_type', 'safe_file_extension', 'wysiwyg_editor');
+{/if}
 
 --This one is wierd. What the heck is this anyway?
 UPDATE civicrm_option_value v, civicrm_option_group g
 SET v.name = v.value
-WHERE g.id = v.option_group_id AND g.name = 'redaction_rule';
\ No newline at end of file
+WHERE g.id = v.option_group_id AND g.name = 'redaction_rule';