From 7da26c73b441af3aea5fb2f9123eba4cc3232bd8 Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 6 Jan 2021 11:53:28 -0800 Subject: [PATCH] Quick fix for PAGE_NAME conflicts. --- e107_languages/English/lan_error.php | 5 ++++- e107_languages/English/lan_news.php | 6 ++++-- e107_languages/English/lan_signup.php | 6 ++++-- e107_languages/English/lan_sitedown.php | 6 +++++- e107_languages/English/lan_usersettings.php | 5 ++++- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/e107_languages/English/lan_error.php b/e107_languages/English/lan_error.php index 63cded31c..68aef0a04 100644 --- a/e107_languages/English/lan_error.php +++ b/e107_languages/English/lan_error.php @@ -9,7 +9,10 @@ | $Author$ +----------------------------------------------------------------------------+ */ -define("PAGE_NAME", "Error"); +if(!defined('PAGE_NAME')) // FIXME. +{ + define("PAGE_NAME", "Error"); +} define("LAN_ERROR_TITLE", "Oops!"); define("LAN_ERROR_1", "Error 401 - Authentication Failed"); diff --git a/e107_languages/English/lan_news.php b/e107_languages/English/lan_news.php index 49f5b1aa8..82bf48f2d 100644 --- a/e107_languages/English/lan_news.php +++ b/e107_languages/English/lan_news.php @@ -9,8 +9,10 @@ | $Author$ +----------------------------------------------------------------------------+ */ -define("PAGE_NAME", "News"); - +if(!defined('PAGE_NAME')) // FIXME. +{ + define("PAGE_NAME", "News"); +} diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php index 321d2081c..66408c880 100644 --- a/e107_languages/English/lan_signup.php +++ b/e107_languages/English/lan_signup.php @@ -9,8 +9,10 @@ * Language file - User signup * */ -define("PAGE_NAME", "Register"); - +if(!defined('PAGE_NAME')) +{ + define("PAGE_NAME", "Register"); +} /* //define("LAN_103", "That username is invalid. Please choose a different one"); //define("LAN_104", "That username is taken. Please choose a different one"); diff --git a/e107_languages/English/lan_sitedown.php b/e107_languages/English/lan_sitedown.php index b6b21fdaf..afd3b3425 100644 --- a/e107_languages/English/lan_sitedown.php +++ b/e107_languages/English/lan_sitedown.php @@ -9,7 +9,11 @@ | $Author$ +----------------------------------------------------------------------------+ */ -define("PAGE_NAME", "Site temporarily closed"); +if(!defined('PAGE_NAME')) // FIXME. +{ + define("PAGE_NAME", "Site temporarily closed"); +} + define("LAN_SITEDOWN_00", "is temporarily closed"); define("LAN_SITEDOWN_01", "We have temporarily closed the site for some essential maintenance. This shouldn't take too long - please check back soon. We apologise for the inconvenience."); diff --git a/e107_languages/English/lan_usersettings.php b/e107_languages/English/lan_usersettings.php index 829db8477..a7a098921 100644 --- a/e107_languages/English/lan_usersettings.php +++ b/e107_languages/English/lan_usersettings.php @@ -9,7 +9,10 @@ | $Author$ +----------------------------------------------------------------------------+ */ -define("PAGE_NAME", "User Settings"); +if(!defined('PAGE_NAME')) +{ + define("PAGE_NAME", "User Settings"); +} /* LANs rationalised - some common ones now in lan_user.php. Old numbers generally cross-referenced