From a541721eb3a9df528fdfdfba5400773f6485d95f Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 6 Nov 2017 14:15:58 -0800
Subject: [PATCH] Issue #2846 - Lan Var cleanup

---
 e107_admin/update_routines.php                   | 4 ++--
 e107_handlers/mailout_admin_class.php            | 4 ++--
 e107_languages/English/admin/lan_e107_update.php | 4 ++--
 e107_languages/English/admin/lan_mailout.php     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php
index 47efac923..b17bc87b3 100644
--- a/e107_admin/update_routines.php
+++ b/e107_admin/update_routines.php
@@ -1959,7 +1959,7 @@ function addIndexToTable($target, $indexSpec, $just_check, &$updateMessages, $op
 		{
 			return !$just_check;		// Nothing to do it table is optional and not there
 		}
-		$updateMessages[] = str_replace(array('--TABLE--','--INDEX--'),array($target,$indexSpec),LAN_UPDATE_54);
+		$updateMessages[] = str_replace(array('[y]','[x]'),array($target,$indexSpec),LAN_UPDATE_54);
 		return !$just_check;		// No point carrying on - return 'nothing to do'
 	}
 	if ($sql->gen("SHOW INDEX FROM ".MPREFIX.$target))
@@ -1978,7 +1978,7 @@ function addIndexToTable($target, $indexSpec, $just_check, &$updateMessages, $op
 			return 'Required to add index to '.$target;
 		}
 		$sql->gen("ALTER TABLE `".MPREFIX.$target."` ADD INDEX `".$indexSpec."` (`".$indexSpec."`);");
-		$updateMessages[] = str_replace(array('--TABLE--','--INDEX--'),array($target,$indexSpec),LAN_UPDATE_37);
+		$updateMessages[] = str_replace(array('[y]','[x]'),array($target,$indexSpec),LAN_UPDATE_37);
 	}
 	return FALSE;
 }
diff --git a/e107_handlers/mailout_admin_class.php b/e107_handlers/mailout_admin_class.php
index bdbf1eafd..208a3b968 100644
--- a/e107_handlers/mailout_admin_class.php
+++ b/e107_handlers/mailout_admin_class.php
@@ -1872,7 +1872,7 @@ class mailoutAdminClass extends e107MailManager
 			if($res)
 				$results[] = str_replace(array(
 					'[x]',
-					'--TABLE--'
+					'[y]'
 				), array(
 					$res,
 					'mail_content'
@@ -1888,7 +1888,7 @@ class mailoutAdminClass extends e107MailManager
 			if($res)
 				$results[] = str_replace(array(
 					'[x]',
-					'--TABLE--'
+					'[y]'
 				), array(
 					$res,
 					'mail_recipients'
diff --git a/e107_languages/English/admin/lan_e107_update.php b/e107_languages/English/admin/lan_e107_update.php
index a1cfda8d8..5419f8645 100644
--- a/e107_languages/English/admin/lan_e107_update.php
+++ b/e107_languages/English/admin/lan_e107_update.php
@@ -35,7 +35,7 @@ define("LAN_UPDATE_29", "Depending on your particular configuration, you may nee
 
 // define("LAN_UPDATE_35", "Error modifying data in comment table");
 // define("LAN_UPDATE_36", "Error deleting old field in comment table");
-define("LAN_UPDATE_37", "Add index --INDEX-- to table --TABLE--");
+define("LAN_UPDATE_37", "Add index [x] to table [y]");
 define("LAN_UPDATE_38", "Update front page settings");
 // define("LAN_UPDATE_39", "Update linkwords table");
 define("LAN_UPDATE_40", "Update newsfeeds table");
@@ -50,7 +50,7 @@ define("LAN_UPDATE_50", "Obsolete prefs deleted: ");
 define("LAN_UPDATE_51", "Update plugin table definition: ");
 define("LAN_UPDATE_52", "Update downloads table");
 define("LAN_UPDATE_53", "Update download mirror table");
-define("LAN_UPDATE_54", "Missing table --TABLE-- - cannot add index --INDEX--");
+define("LAN_UPDATE_54", "Missing table [y] - cannot add index [x]");
 define("LAN_UPDATE_55", "Description");
 define("LAN_UPDATE_56", "System Update");
 
diff --git a/e107_languages/English/admin/lan_mailout.php b/e107_languages/English/admin/lan_mailout.php
index 1a7e40381..550d7a964 100644
--- a/e107_languages/English/admin/lan_mailout.php
+++ b/e107_languages/English/admin/lan_mailout.php
@@ -243,7 +243,7 @@ define("LAN_MAILOUT_223", "(Used for some system-generated emails)");
 define("LAN_MAILOUT_224", "Inc. Images");
 define("LAN_MAILOUT_225", "Include images in email");
 define("LAN_MAILOUT_226", "[x] orphaned recipient record(s) removed");
-define("LAN_MAILOUT_227", "Deleted [x] records from --TABLE--");
+define("LAN_MAILOUT_227", "Deleted [x] records from [y]");
 define("LAN_MAILOUT_228", "[x] anomalies in mail_content corrected; records: [y]");
 define("LAN_MAILOUT_229", "Email ID [x] put on hold");
 define("LAN_MAILOUT_230", "Error holding email with ID [x]");