summaryrefslogtreecommitdiff
path: root/admin_site_merge.php
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2013-02-05 17:46:05 +0000
committerfisharebest <fisharebest@gmail.com>2013-02-05 17:46:05 +0000
commit107624048a22a4c8de8743ab35a0354c209c940a (patch)
tree153d6223b57b84fb7368120306588fe0e78c94ca /admin_site_merge.php
parent0e7cb560da43cb331d86019fcd5e01b7eeb7110a (diff)
downloadwebtrees-107624048a22a4c8de8743ab35a0354c209c940a.tar.gz
webtrees-107624048a22a4c8de8743ab35a0354c209c940a.tar.bz2
webtrees-107624048a22a4c8de8743ab35a0354c209c940a.zip
PHP 5.3 constructs in admin_site_merge.php
Diffstat (limited to 'admin_site_merge.php')
-rw-r--r--admin_site_merge.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/admin_site_merge.php b/admin_site_merge.php
index 81f95d4608..a2b256718d 100644
--- a/admin_site_merge.php
+++ b/admin_site_merge.php
@@ -128,8 +128,8 @@ if ($action!='choose') {
$skip2[] = $j;
$equal_count++;
echo '<tr><td>', WT_I18N::translate($fact1['fact']);
- // PHP5.3 echo '<input type="hidden" name="keep1[]" value="', $i, '"></td><td>', nl2br($fact1['subrec']), '</td></tr>';
- echo '<input type="hidden" name="keep1[]" value="', $i, '"></td><td>', nl2br($fact1['subrec'], false), '</td></tr>';
+ // PHP5.3 echo '<input type="hidden" name="keep1[]" value="', $i, '"></td><td>', nl2br($fact1['subrec'], false), '</td></tr>';
+ echo '<input type="hidden" name="keep1[]" value="', $i, '"></td><td>', nl2br($fact1['subrec']), '</td></tr>';
}
}
}