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.

Sign up for GitHub

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

[4.0] proper html fallback everywhere #18777

Merged
merged 1 commit into from
Nov 22, 2017
Merged

[4.0] proper html fallback everywhere #18777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ window.errorLocale = {`;
}`;

// Write the file
grunt.file.write('installation/template/js/error-locales.js', template);
grunt.file.write('templates/system/js/error-locales.js', template);
});

};
2 changes: 1 addition & 1 deletion administrator/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
{
die('Your host needs to use PHP ' . JOOMLA_MINIMUM_PHP . ' or higher to run this version of Joomla!');
die(str_replace(['{{PHP_VERSION}}', '{{BASEPATH}}'], [JOOMLA_MINIMUM_PHP, 'http://' . $_SERVER['SERVER_NAME'] . '/'], file_get_contents(dirname(__FILE__) . '/../templates/system/incompatible.html')));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
{
die('Your host needs to use PHP ' . JOOMLA_MINIMUM_PHP . ' or higher to run this version of Joomla!');
die(str_replace(['{{PHP_VERSION}}', '{{BASEPATH}}'], [JOOMLA_MINIMUM_PHP, 'http://' . $_SERVER['SERVER_NAME'] . '/'], file_get_contents(dirname(__FILE__) . '/templates/system/incompatible.html')));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion installation/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
{
die(str_replace('{{PHP_VERSION}}', JOOMLA_MINIMUM_PHP, file_get_contents(dirname(__FILE__) . '/template/incompatible.html')));
die(str_replace(['{{PHP_VERSION}}', '{{BASEPATH}}'], [JOOMLA_MINIMUM_PHP, 'http://' . $_SERVER['SERVER_NAME'] . '/'], file_get_contents(dirname(__FILE__) . '/../templates/system/incompatible.html')));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion installation/language/en-US/en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

;Minimum PHP error page
;These will be processed by Grunt
MIN_PHP_ERROR_LANGUAGE="English GB"
MIN_PHP_ERROR_LANGUAGE="English US"
MIN_PHP_ERROR_HEADER="Sorry, your PHP version is not supported"
MIN_PHP_ERROR_TEXT="Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla"
MIN_PHP_ERROR_URL_TEXT="Help me resolve this"
Expand Down
161 changes: 0 additions & 161 deletions installation/template/css/error.css
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions installation/template/incompatible.html
View file
Open in desktop

This file was deleted.

70 changes: 0 additions & 70 deletions installation/template/js/error.js
View file
Open in desktop

This file was deleted.

Loading