From 95032c0cc91ced9283ca442d641ae401dd15f23e Mon Sep 17 00:00:00 2001
From: fisharebest <fisharebest@gmail.com>
Date: Thu, 16 Dec 2010 08:14:24 +0000
Subject: Fix: function not found in soundex search

---
 includes/functions/functions_import.php |  1 -
 includes/functions/functions_lang.php   | 48 ---------------------------------
 includes/functions/functions_name.php   | 11 ++++++++
 3 files changed, 11 insertions(+), 49 deletions(-)
 delete mode 100644 includes/functions/functions_lang.php

diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php
index c68b572d92..52d3433e86 100644
--- a/includes/functions/functions_import.php
+++ b/includes/functions/functions_import.php
@@ -38,7 +38,6 @@ if (!defined('WT_WEBTREES')) {
 define('WT_FUNCTIONS_IMPORT_PHP', '');
 
 require_once WT_ROOT.'includes/classes/class_media.php';
-require_once WT_ROOT.'includes/functions/functions_lang.php';
 require_once WT_ROOT.'includes/functions/functions_export.php';
 
 // Tidy up a gedcom record on import, so that we can access it consistently/efficiently.
diff --git a/includes/functions/functions_lang.php b/includes/functions/functions_lang.php
deleted file mode 100644
index 36d67879ca..0000000000
--- a/includes/functions/functions_lang.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- *
- * Language specific functions
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage DB
- * @version $Id$
- */
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-define('WT_FUNCTIONS_LANG_PHP', '');
-
-/**
- * Takes a string and converts certain characters in the string to others for the purpose of soundex searches
- */
-function Character_Substitute($input)
-{
-	$stringsToReplace = array("/AE/", "/ae/", "/OE/", "/oe/", "/UE/", "/ue/", "/ss/", "/SS/");
-	$replacements =     array("Ä",   "ä",   "Ö",   "ö",   "Ü",   "ü",   "ß",   "ß");
-
-	preg_replace($stringsToReplace, $replacements, $input);
-}
-?>
diff --git a/includes/functions/functions_name.php b/includes/functions/functions_name.php
index fdaa4235f2..b44d0ed1ae 100644
--- a/includes/functions/functions_name.php
+++ b/includes/functions/functions_name.php
@@ -33,6 +33,17 @@ if (!defined('WT_WEBTREES')) {
 
 define('WT_FUNCTIONS_NAME_PHP', '');
 
+/**
+ * Takes a string and converts certain characters in the string to others for the purpose of soundex searches
+ */
+function Character_Substitute($input)
+{
+	$stringsToReplace = array("/AE/", "/ae/", "/OE/", "/oe/", "/UE/", "/ue/", "/ss/", "/SS/");
+	$replacements =     array("Ä",   "ä",   "Ö",   "ö",   "Ü",   "ü",   "ß",   "ß");
+
+	preg_replace($stringsToReplace, $replacements, $input);
+}
+
 /**
  * Get array of common surnames
  *
-- 
cgit v1.3