Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
drupal
Commits
f8e189ed
Commit
f8e189ed
authored
12 years ago
by
Katherine Bailey
Browse files
Options
Downloads
Patches
Plain Diff
Temporary fix to prevent fatal error on language upgrade test
parent
faba05fc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!7452
Issue #1797438. HTML5 validation is preventing form submit and not fully...
,
!789
Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/includes/update.inc
+9
-0
9 additions, 0 deletions
core/includes/update.inc
core/update.php
+0
-8
0 additions, 8 deletions
core/update.php
with
9 additions
and
8 deletions
core/includes/update.inc
+
9
−
0
View file @
f8e189ed
...
...
@@ -255,6 +255,15 @@ function update_prepare_d8_language() {
// array.
variable_set
(
'language_default'
,
(
array
)
$language_default
);
}
else
{
variable_set
(
'language_default'
,
array
(
'langcode'
=>
'en'
,
'name'
=>
'English'
,
'direction'
=>
0
,
'weight'
=>
0
,
'locked'
=>
0
,
));
}
// Adds the locked column and saves the special languages.
if
(
!
db_field_exists
(
'language'
,
'locked'
))
{
...
...
This diff is collapsed.
Click to expand it.
core/update.php
+
0
−
8
View file @
f8e189ed
...
...
@@ -383,18 +383,10 @@ function update_check_requirements($skip_warnings = FALSE) {
// Determine if the current user has access to run update.php.
drupal_bootstrap
(
DRUPAL_BOOTSTRAP_SESSION
);
// Ensure the default language is properly registered within the Dependency
// Injection container during the upgrade process.
$default
=
language_default
();
drupal_container
()
->
register
(
LANGUAGE_TYPE_INTERFACE
,
'Drupal\\Core\\Language\\Language'
)
->
addMethodCall
(
'extend'
,
array
(
$default
));
// A request object from the HTTPFoundation to tell us about the request.
// @todo These two lines were copied from index.php which has its own todo about
// a change required here. Revisit this when that change has been made.
$request
=
Request
::
createFromGlobals
();
request
(
$request
);
// There can be conflicting 'op' parameters because both update and batch use
// this parameter name. We need the 'op' coming from a POST request to trump
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment