diff options
| author | fisharebest <fisharebest@gmail.com> | 2011-11-10 10:25:54 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2011-11-10 10:25:54 +0000 |
| commit | 8adbfb6e547a29a36bb50b712c5a0a445ac47baa (patch) | |
| tree | f31af9bdbb97cf62b61bd63555b96087d3e2733d | |
| parent | 4b26022c3b07c3f1157856d15ed0fac44dc2db45 (diff) | |
| download | webtrees-8adbfb6e547a29a36bb50b712c5a0a445ac47baa.tar.gz webtrees-8adbfb6e547a29a36bb50b712c5a0a445ac47baa.tar.bz2 webtrees-8adbfb6e547a29a36bb50b712c5a0a445ac47baa.zip | |
#887417 - Path not changed in GEDCOM export.
| -rw-r--r-- | downloadgedcom.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions_export.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/downloadgedcom.php b/downloadgedcom.php index facb69eb27..613b9e47b7 100644 --- a/downloadgedcom.php +++ b/downloadgedcom.php @@ -39,7 +39,7 @@ $action = safe_GET('action', 'download'); $convert = safe_GET('convert', 'yes', 'no'); $zip = safe_GET('zip', 'yes', 'no'); $conv_path = safe_GET('conv_path', WT_REGEX_NOSCRIPT); -$conv_slashes = safe_GET('conv_slashes', array('forward', 'backward')); +$conv_slashes = safe_GET('conv_slashes', array('forward', 'backward'), 'forward'); $privatize_export = safe_GET('privatize_export', array('none', 'visitor', 'user', 'gedadmin')); $conv_path = stripLRMRLM($conv_path); diff --git a/includes/functions/functions_export.php b/includes/functions/functions_export.php index 7a83affb3e..29f2bb1d2f 100644 --- a/includes/functions/functions_export.php +++ b/includes/functions/functions_export.php @@ -165,7 +165,7 @@ function convert_media_path($rec, $path, $slashes) { $new_file_name=preg_replace('~\\+~', '/', $new_file_name); break; } - $rec=str_replace('\n1 FILE '.$old_file_name, '\n1 FILE '.$new_file_name, $rec); + $rec=str_replace("\n1 FILE ".$old_file_name, "\n1 FILE ".$new_file_name, $rec); } } return $rec; |