[Vtigercrm-commits] [vtiger-commits] r10086 - in /vtigercrm/branches/5.0.3: Smarty/templates/Settings/Announcements.tpl modules/Settings/SettingsAjax.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Jan 18 06:34:05 2007
New Revision: 10086

Log:
* Fixed the issues in announcement when we give & , Fixes #2918

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl
    vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/Announcements.tpl Thu Jan 18 06:34:05 2007
@@ -18,6 +18,10 @@
 {
 	$("an_busy").style.display="inline";
 	var announcement=$("announcement").value;
+
+	//Replace & with ##$## and do vice versa in modules/Settings/SettingsAjax.php. if we pass as it is, request of announcement will be skipped after &
+	announcement = announcement.replace(/&/g,"##$##");//replace('&','##$##');
+
 	new Ajax.Request(
 	'index.php',
         {queue: {position: 'end', scope: 'command'},

Modified: vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/SettingsAjax.php Thu Jan 18 06:34:05 2007
@@ -21,6 +21,9 @@
 {
         $date_var = date('YmdHis');
         $announcement = $_REQUEST['announcement'];
+	//Change ##$## to & (reverse process has done in Smarty/templates/Settings/Announcements.tpl)
+	$announcement = str_replace("##$##","&",$announcement);
+
         $title = $_REQUEST['title_announcement'];
         $sql="select * from vtiger_announcement where creatorid=".$current_user->id;
         $is_announce=$adb->query($sql);