Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
220
Merge Requests
220
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
faa920f9
Commit
faa920f9
authored
Feb 21, 2011
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#1006838
by coltrane: upgrade to 7 glaring timezone invalid notice.
parent
b2048676
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
modules/simpletest/tests/upgrade/drupal-6.bare.database.php
modules/simpletest/tests/upgrade/drupal-6.bare.database.php
+2
-2
update.php
update.php
+9
-0
No files found.
modules/simpletest/tests/upgrade/drupal-6.bare.database.php
View file @
faa920f9
...
...
@@ -7902,7 +7902,7 @@
'access'
=>
'0'
,
'login'
=>
'0'
,
'status'
=>
'0'
,
'timezone'
=>
NULL
,
'timezone'
=>
'-21600'
,
'language'
=>
''
,
'picture'
=>
''
,
'init'
=>
''
,
...
...
@@ -7923,7 +7923,7 @@
'access'
=>
'1277671612'
,
'login'
=>
'1277671612'
,
'status'
=>
'1'
,
'timezone'
=>
NULL
,
'timezone'
=>
'-21600'
,
'language'
=>
''
,
'picture'
=>
''
,
'init'
=>
'admin@example.com'
,
...
...
update.php
View file @
faa920f9
...
...
@@ -349,9 +349,18 @@ function update_check_requirements() {
require_once
DRUPAL_ROOT
.
'/includes/unicode.inc'
;
update_prepare_d7_bootstrap
();
// Temporarily disable configurable timezones so the upgrade process uses the
// site-wide timezone. This prevents a PHP notice during session initlization
// and before offsets have been converted in user_update_7002().
$configurable_timezones
=
variable_get
(
'configurable_timezones'
,
1
);
$conf
[
'configurable_timezones'
]
=
0
;
// Determine if the current user has access to run update.php.
drupal_bootstrap
(
DRUPAL_BOOTSTRAP_SESSION
);
// Reset configurable timezones.
$conf
[
'configurable_timezones'
]
=
$configurable_timezones
;
// Only allow the requirements check to proceed if the current user has access
// to run updates (since it may expose sensitive information about the site's
// configuration).
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment