Revision: 2656
          https://sourceforge.net/p/mrbs/code/2656/
Author:   cimorrison
Date:     2013-01-25 16:38:12 +0000 (Fri, 25 Jan 2013)
Log Message:
-----------
Replaced the ' - ' string with the $area_room_separator config variable

Modified Paths:
--------------
    mrbs/branches/linked_bookings/web/functions.inc

Modified: mrbs/branches/linked_bookings/web/functions.inc
===================================================================
--- mrbs/branches/linked_bookings/web/functions.inc     2013-01-23 12:20:07 UTC 
(rev 2655)
+++ mrbs/branches/linked_bookings/web/functions.inc     2013-01-25 16:38:12 UTC 
(rev 2656)
@@ -1672,9 +1672,10 @@
 function get_full_room_names($rooms)
 {
   global $tbl_room, $tbl_area;
+  global $area_room_separator;
   
   $strings = array("A.area_name",
-                   "'" . sql_escape(' - ') . "'",
+                   "'" . sql_escape($area_room_separator) . "'",
                    "R.room_name");
   $sql = "SELECT " . sql_syntax_concat($strings) . "
             FROM $tbl_room R, $tbl_area A
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits

Reply via email to