From 96a1db0e5cb17804a53580efb1c37c0a653ec22b Mon Sep 17 00:00:00 2001
From: Tijn Kuyper <github@tijnkuyper.nl>
Date: Sat, 9 Feb 2019 17:24:49 +0100
Subject: [PATCH] Revert "#3101 - Add optional flags to e107_config.php"

This reverts commit 16b298ea51d63de101e0da676ca2f09488251a9f.
---
 e107_handlers/date_handler.php      | 12 +++++-------
 e107_languages/English/lan_date.php |  2 --
 install.php                         |  4 +---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/e107_handlers/date_handler.php b/e107_handlers/date_handler.php
index 521d22541..fc50dcd0d 100644
--- a/e107_handlers/date_handler.php
+++ b/e107_handlers/date_handler.php
@@ -657,20 +657,18 @@ class e_date
 			return $mode ? array($justNow) : $justNow;
 		}
 
+
 		if($older_date < $newer_date) // past
 		{
-
-            $replace = implode(", ", $ret);
-            $xago = e107::getParser()->lanVars(LANDT_XAGO, $replace);
-            return ($mode ? $ret : $xago);
+			return ($mode ? $ret : implode(", ", $ret) . " " . LANDT_AGO);
 		}
 		else // future
 		{
-            $replace = implode(", ", $ret);
-            $inx = e107::getParser()->lanVars(LANDT_INX, $replace);
-            return ($mode ? $ret : $inx);
+			return ($mode ? $ret : LANDT_IN ." ". implode(", ", $ret));
 		}
 
+
+
 	//	print_r($ret);
 
 
diff --git a/e107_languages/English/lan_date.php b/e107_languages/English/lan_date.php
index e422c8ab7..4cd15baee 100644
--- a/e107_languages/English/lan_date.php
+++ b/e107_languages/English/lan_date.php
@@ -21,7 +21,5 @@ define("LANDT_09", "sec");
 define("LANDT_09s", "secs");
 define("LANDT_AGO", "ago");
 define("LANDT_IN", "in");
-define("LANDT_XAGO", "[x] ago");
-define("LANDT_INX", "in [x]");
 
 define("LANDT_10", "Just now");
\ No newline at end of file
diff --git a/install.php b/install.php
index 2d582b5a9..c3230d12b 100644
--- a/install.php
+++ b/install.php
@@ -1378,13 +1378,11 @@ class e_install
 
 
 // -- Optional --
-// define('e_DEBUG', true); // Enable debug mode to allow displaying of errors
 // define('e_HTTP_STATIC', 'https://static.mydomain.com/');  // Use a static subdomain for js/css/images etc. 
 // define('e_MOD_REWRITE_STATIC', true); // Rewrite static image urls. 
 // define('e_LOG_CRITICAL', true); // log critical errors but do not display them to user. 
 // define('e_GIT', 'path-to-git');  // Path to GIT for developers
-// define('X-FRAME-SAMEORIGIN', false); // Option to override X-Frame-Options 
-// define('e_PDO, true); // Enable PDO mode (used in PHP > 7 and when mysql_* methods are not available)
+
 
 ";
 /*