Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incorrect language checking in install tablesfill step #1355

Merged
merged 1 commit into from
May 7, 2023

Conversation

geekwright
Copy link
Contributor

Introduced in #1351

@geekwright geekwright requested review from mambax7, ggoffy and GregMage May 7, 2023 16:05
@GregMage GregMage merged commit 6d07155 into XOOPS:master May 7, 2023
@@ -39,8 +39,8 @@
include_once (XOOPS_ROOT_PATH . '/include/defines.php');
}
if (!defined('_DB_QUERY_ERROR')) {
if (file_exists(XOOPS_ROOT_PATH . "/language/{$language}/english/global.php")) {
include_once (XOOPS_ROOT_PATH . "/language/{$language}/english/global.php");
if (file_exists(XOOPS_ROOT_PATH . "/language/{$wizard->language}/english/global.php")) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be:
{$wizard->language}/global.php"
instead of
{$wizard->language}/english/global.php"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Doh!!!!

I'll fix that.

if (file_exists(XOOPS_ROOT_PATH . "/language/{$language}/english/global.php")) {
include_once (XOOPS_ROOT_PATH . "/language/{$language}/english/global.php");
if (file_exists(XOOPS_ROOT_PATH . "/language/{$wizard->language}/english/global.php")) {
include_once (XOOPS_ROOT_PATH . "/language/{$wizard->language}/english/global.php");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be:
{$wizard->language}/global.php"
instead of
{$wizard->language}/english/global.php"

@mambax7
Copy link
Collaborator

mambax7 commented May 8, 2023

Richard, could you also include the "user.php" language file?
When the password is wrong, I'm getting:

Fatal Error Undefined constant "_US_INCORRECTLOGIN" file: /home/codeforkids/public_html/class/auth/auth_xoops.php : 55

@geekwright geekwright deleted the install-lang branch May 13, 2023 22:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants