Changeset:
        6c316a697ab5
        
https://sourceforge.net/p/mrbs/hg-code/ci/6c316a697ab57c17e42d9cd8ec0c007730c04294
Author:
        Campbell Morrison <[email protected]>
Date:
        Wed Oct 21 17:03:13 2015 +0100
Log message:

Fixed bug causing ical_uid not to be generated for a series when conflicts are 
skipped (see SF Bugs #334).  Still need to provide a script to give existing 
entries an ical_uid.

diffstat:

 web/edit_entry_handler.php |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 5c583da27452 -r 6c316a697ab5 web/edit_entry_handler.php
--- a/web/edit_entry_handler.php        Wed Oct 21 13:55:55 2015 +0100
+++ b/web/edit_entry_handler.php        Wed Oct 21 17:03:13 2015 +0100
@@ -777,10 +777,13 @@
       // See the comment at the top of the page about array formats
       foreach ($$var as $value)
       {
-        echo "<input type=\"hidden\" name=\"${var}[]\" value=\"" . 
htmlspecialchars($value) . "\">\n";
+        if (isset($value))
+        {
+          echo "<input type=\"hidden\" name=\"${var}[]\" value=\"" . 
htmlspecialchars($value) . "\">\n";
+        }
       }
     }
-    else
+    elseif (isset($$var))
     {
       echo "<input type=\"hidden\" name=\"$var\" value=\"" . 
htmlspecialchars($$var) . "\">\n";
     }
@@ -788,7 +791,7 @@
   // Then the custom fields
   foreach($fields as $field)
   {
-    if (array_key_exists($field['name'], $custom_fields))
+    if (array_key_exists($field['name'], $custom_fields) && 
isset($custom_fields[$field['name']]))
     {
       echo "<input type=\"hidden\"" .
                   " name=\"" . VAR_PREFIX . $field['name'] . "\"" .

------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits

Reply via email to