calendar/inc/class.calendar_wizard_import_ical.inc.php 1 location
|
@@ 69-72 (lines=4) @@
|
| 66 |
|
{ |
| 67 |
|
$content['text'] = $this->steps['wizard_step55']; |
| 68 |
|
$content['step'] = 'wizard_step55'; |
| 69 |
|
if(!$content['skip_conflicts'] && array_key_exists('skip_conflicts', $content['plugin_options'])) |
| 70 |
|
{ |
| 71 |
|
$content['skip_conflicts'] = $content['plugin_options']['skip_conflicts']; |
| 72 |
|
} |
| 73 |
|
$preserv = $content; |
| 74 |
|
unset ($preserv['button']); |
| 75 |
|
|
calendar/inc/class.calendar_wizard_import_csv.inc.php 1 location
|
@@ 72-75 (lines=4) @@
|
| 69 |
|
'id' => 'Calendar ID' |
| 70 |
|
); |
| 71 |
|
|
| 72 |
|
if(!$content['skip_conflicts'] && $content['plugin_options']['skip_conflicts']) |
| 73 |
|
{ |
| 74 |
|
$content['skip_conflicts'] = $content['plugin_options']['skip_conflicts']; |
| 75 |
|
} |
| 76 |
|
return $result; |
| 77 |
|
} |
| 78 |
|
} |