Remove unused (AFAICT) file inclusions. Fix bug from recent change

2 files changed, 2 insertions, 6 deletions

diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php
index f1d0b37cae..1be19d3ba3 100644
--- a/includes/functions/functions_edit.php
+++ b/includes/functions/functions_edit.php
@@ -23,8 +23,6 @@
 
 use Rhumsaa\Uuid\Uuid;
 
-require_once WT_ROOT . 'includes/functions/functions_import.php';
-
 // Create an edit control for inline editing using jeditable
 function edit_field_inline($name, $value, $controller=null) {
 	$html='<span class="editable" id="' . $name . '">' . WT_Filter::escapeHtml($value) . '</span>';
@@ -1207,7 +1205,7 @@ function updateRest($inputRec, $levelOverride = 'no') {
  *
  * @return string The updated gedcom record
  */
-function handle_updates($newged, $levelOverride="no") {
+function handle_updates($newged, $levelOverride = 'no') {
 	global $glevels, $islink, $tag, $uploaded_files, $text;
 
 	if ($levelOverride=="no" || count($glevels)==0) $levelAdjust = 0;
diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php
index e30c1b0cbe..86a50f092d 100644
--- a/includes/functions/functions_import.php
+++ b/includes/functions/functions_import.php
@@ -23,8 +23,6 @@
 
 use WT\Log;
 
-require_once WT_ROOT . 'includes/functions/functions_export.php';
-
 // Tidy up a gedcom record on import, so that we can access it consistently/efficiently.
 function reformat_record_import($rec) {
 	global $WORD_WRAPPED_NOTES, $GEDCOM_MEDIA_PATH;
@@ -796,7 +794,7 @@ function update_places($gid, $ged_id, $gedrec) {
 	$pt = preg_match_all("/^[2-9] PLAC (.+)/m", $gedrec, $match, PREG_SET_ORDER);
 	for ($i = 0; $i < $pt; $i++) {
 		$place = trim($match[$i][1]);
-		$lowplace = utf8_strtolower($place);
+		$lowplace = WT_I18N::strtolower($place);
 		//-- if we have already visited this place for this person then we don't need to again
 		if (isset($personplace[$lowplace])) {
 			continue;