Revision: 2111
http://mrbs.svn.sourceforge.net/mrbs/?rev=2111&view=rev
Author: cimorrison
Date: 2011-10-18 09:43:49 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/draggable_bookings/web/Themes/default/header.inc
mrbs/branches/draggable_bookings/web/edit_area_room.php
Property Changed:
----------------
mrbs/branches/draggable_bookings/
mrbs/branches/draggable_bookings/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/draggable_bookings
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datatables:1863-2063
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datatables:1863-2063
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:2074-2110
Modified: mrbs/branches/draggable_bookings/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-18 09:33:31 UTC (rev 2110)
+++ mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-18 09:43:49 UTC (rev 2111)
@@ -2612,8 +2612,10 @@
}
else
{
- $logo_size = getimagesize($mrbs_company_logo);
- echo "<img src=\"$mrbs_company_logo\" " . $logo_size[3] . "
alt=\"logo\">\n";
+ // Suppress error messages in case the logo is a URL and
allow_url_fopen
+ // is not enabled in php.ini
+ $logo_size = @getimagesize($mrbs_company_logo);
+ echo "<img src=\"$mrbs_company_logo\" " . $logo_size[3] . "
alt=\"$mrbs_company\">\n";
}
if (!empty($mrbs_company_url))
{
Modified: mrbs/branches/draggable_bookings/web/edit_area_room.php
===================================================================
--- mrbs/branches/draggable_bookings/web/edit_area_room.php 2011-10-18
09:33:31 UTC (rev 2110)
+++ mrbs/branches/draggable_bookings/web/edit_area_room.php 2011-10-18
09:43:49 UTC (rev 2111)
@@ -936,7 +936,7 @@
(($default_duration_all_day) ? " checked=\"checked\"" : "") .
">\n";
?>
- <label class="secondary" "for="area_def_duration_all_day"><?php echo
get_vocab("all_day") ?></label>
+ <label class="secondary" for="area_def_duration_all_day"><?php echo
get_vocab("all_day") ?></label>
</div>
<?php
echo "<div id=\"last_slot\">\n";
Property changes on: mrbs/branches/draggable_bookings/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datatables/web/upgrade/5/pgsql.sql:1863-2063
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datatables/web/upgrade/5/pgsql.sql:1863-2063
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:2074-2110
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
