mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-25 08:51:50 +02:00
Code Issues Releases Wiki Activity

Revert "#3101 - Add optional flags to e107_config.php"

Browse Source 
This reverts commit 16b298ea51.
This commit is contained in:
Tijn Kuyper
2019-02-09 17:24:49 +01:00
parent 16b298ea51
commit 96a1db0e5c
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_handlers/date_handler.php
View File

@@ -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);

2
e107_languages/English/lan_date.php
View File

@@ -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");

4
install.php
View File

@@ -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)
";
/*