From eb451604af5aa144eaf75721c7914f96eac8aa4a Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Mon, 10 Dec 2012 10:51:46 +0100
Subject: [PATCH] [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not
 automatically copied

---
 .../controllers/cms/helpers/form/form.tpl         | 15 ++++++++++++++-
 .../cms_categories/helpers/form/form.tpl          | 15 ++++++++++++++-
 .../admin/AdminCmsCategoriesController.php        |  2 +-
 controllers/admin/AdminCmsController.php          |  4 ++--
 js/admin.js                                       |  3 +++
 5 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
index dca7b479c..8b43b1153 100644
--- a/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
@@ -24,7 +24,20 @@
 *}
 
 {extends file="helpers/form/form.tpl"}
-
+{block name="input"}
+	{if $input.name == "link_rewrite"}
+		<script type="text/javascript">
+		{if isset($PS_ALLOW_ACCENTED_CHARS_URL) && $PS_ALLOW_ACCENTED_CHARS_URL}
+			var PS_ALLOW_ACCENTED_CHARS_URL = 1;
+		{else}
+			var PS_ALLOW_ACCENTED_CHARS_URL = 0;
+		{/if}
+		</script>
+		{$smarty.block.parent}
+	{else}
+		{$smarty.block.parent}
+	{/if}
+{/block}
 {block name="script"}
 	$(document).ready(function() {
 		if (btn_submit.length > 0)
diff --git a/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
index 6c5c3de00..7a3381f36 100644
--- a/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
@@ -24,7 +24,20 @@
 *}
 
 {extends file="helpers/form/form.tpl"}
-
+{block name="input"}
+	{if $input.name == "link_rewrite"}
+		<script type="text/javascript">
+		{if isset($PS_ALLOW_ACCENTED_CHARS_URL) && $PS_ALLOW_ACCENTED_CHARS_URL}
+			var PS_ALLOW_ACCENTED_CHARS_URL = 1;
+		{else}
+			var PS_ALLOW_ACCENTED_CHARS_URL = 0;
+		{/if}
+		</script>
+		{$smarty.block.parent}
+	{else}
+		{$smarty.block.parent}
+	{/if}
+{/block}
 {block name="input"}
 	{if $input.type == 'select_category'}
 		<select name="id_parent">
diff --git a/controllers/admin/AdminCmsCategoriesController.php b/controllers/admin/AdminCmsCategoriesController.php
index ae64435f6..4bf9b4737 100644
--- a/controllers/admin/AdminCmsCategoriesController.php
+++ b/controllers/admin/AdminCmsCategoriesController.php
@@ -302,7 +302,7 @@ class AdminCmsCategoriesControllerCore extends AdminController
 				'class' => 'button'
 			)
 		);
-
+		$this->tpl_form_vars['PS_ALLOW_ACCENTED_CHARS_URL'] = (int)Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL');
 		return parent::renderForm();
 	}
 }
diff --git a/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php
index 1e55ede0a..abc24370d 100644
--- a/controllers/admin/AdminCmsController.php
+++ b/controllers/admin/AdminCmsController.php
@@ -180,9 +180,9 @@ class AdminCmsControllerCore extends AdminController
 		}
 
 		$this->tpl_form_vars = array(
-			'active' => $this->object->active
+			'active' => $this->object->active,
+			'PS_ALLOW_ACCENTED_CHARS_URL', (int)Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL')
 		);
-
 		return parent::renderForm();
 	}
 
diff --git a/js/admin.js b/js/admin.js
index 9949dbfee..8d159c6c8 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -52,6 +52,9 @@ function str2url(str,encoding,ucfirst)
 
 function copy2friendlyURL()
 {
+	if (typeof(id_product) == 'undefined')
+		id_product = false;
+	
 	if (!$('#link_rewrite_' + id_language).val().length || !id_product)//check if user didn't type anything in rewrite field, to prevent overwriting
 	{
 		$('#link_rewrite_' + id_language).val(str2url($('#name_' + id_language).val().replace(/^[0-9]+\./, ''), 'UTF-8').replace('%', ''));