Revision: 1505
http://mrbs.svn.sourceforge.net/mrbs/?rev=1505&view=rev
Author: cimorrison
Date: 2010-10-15 16:26:19 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
Property Changed:
----------------
mrbs/branches/provisional_bookings_new_style/
mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/provisional_bookings_new_style
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1407-1501
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1407-1504
Modified: mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
2010-10-15 16:09:25 UTC (rev 1504)
+++ mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
2010-10-15 16:26:19 UTC (rev 1505)
@@ -538,8 +538,8 @@
// Created by
$body .= "\n" . get_mail_vocab("createdby") . ": " .
- compareEntries($data['create_by'],
- $mail_previous['createdby'],
+ compareEntries(convertToMailCharset($data['create_by']),
+ convertToMailCharset($mail_previous['createdby']),
$new_entry) . "\n";
// Custom fields
@@ -561,7 +561,9 @@
}
}
$body .= get_mail_field_name($tbl_entry, $key) . ": ";
- $body .= compareEntries($value, $mail_previous[$key], $new_entry) .
"\n";
+ $body .= compareEntries(convertToMailCharset($value),
+ convertToMailCharset($mail_previous[$key]),
+ $new_entry) . "\n";
}
}
Property changes on:
mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1407-1501
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1407-1504
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
