Revision: 2952
https://sourceforge.net/p/mrbs/code/2952/
Author: cimorrison
Date: 2015-01-18 11:26:08 +0000 (Sun, 18 Jan 2015)
Log Message:
-----------
Tidied code
Modified Paths:
--------------
mrbs/branches/repeat_id_fk/web/functions_table.inc
mrbs/branches/repeat_id_fk/web/month.php
mrbs/branches/repeat_id_fk/web/mrbs_sql.inc
Modified: mrbs/branches/repeat_id_fk/web/functions_table.inc
===================================================================
--- mrbs/branches/repeat_id_fk/web/functions_table.inc 2015-01-18 11:17:16 UTC
(rev 2951)
+++ mrbs/branches/repeat_id_fk/web/functions_table.inc 2015-01-18 11:26:08 UTC
(rev 2952)
@@ -116,7 +116,7 @@
// fill in the id, type and start time
$column[$s][$n]["id"] = $row['entry_id'];
- $column[$s][$n]["is_repeat"] = !empty($row['repeat_id']);
+ $column[$s][$n]["is_repeat"] = isset($row['repeat_id']);
$column[$s][$n]["is_multiday_start"] = $is_multiday_start;
$column[$s][$n]["is_multiday_end"] = $is_multiday_end;
$column[$s][$n]["status"] = $row['status'];
Modified: mrbs/branches/repeat_id_fk/web/month.php
===================================================================
--- mrbs/branches/repeat_id_fk/web/month.php 2015-01-18 11:17:16 UTC (rev
2951)
+++ mrbs/branches/repeat_id_fk/web/month.php 2015-01-18 11:26:08 UTC (rev
2952)
@@ -278,7 +278,7 @@
}
$d[$day_num]["id"][] = $row['id'];
$d[$day_num]["color"][] = $row['type'];
- $d[$day_num]["is_repeat"][] = !empty($row['repeat_id']);
+ $d[$day_num]["is_repeat"][] = isset($row['repeat_id']);
// Handle private events
if (is_private_event($row['status'] & STATUS_PRIVATE))
Modified: mrbs/branches/repeat_id_fk/web/mrbs_sql.inc
===================================================================
--- mrbs/branches/repeat_id_fk/web/mrbs_sql.inc 2015-01-18 11:17:16 UTC (rev
2951)
+++ mrbs/branches/repeat_id_fk/web/mrbs_sql.inc 2015-01-18 11:26:08 UTC (rev
2952)
@@ -1221,7 +1221,7 @@
if (!$series && !array_key_exists($field['name'], $rep_fields))
{
// If this is the entry table then check that the custom field also
- // exists in the rpeat table
+ // exists in the repeat table
fatal_error(0, "Custom fields problem, '".$field['name']."' exists
in entry table but not in repeat table");
}
@@ -1284,7 +1284,7 @@
else
{
// Get the repeat information
- if (empty($row['repeat_id']))
+ if (!isset($row['repeat_id']))
{
$row['rep_type'] = REP_NONE; // just as a precaution
$row['repeat_info_time'] = '';
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
