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
6cb598ec
Commit
6cb598ec
authored
14 years ago
by
Dries Buytaert
Browse files
Options
Downloads
Patches
Plain Diff
- Patch
#740136
by casey, cosmicdreams: CSS doesn't get included during install.
parent
1c1d12b8
Branches
Branches containing commit
Tags
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
includes/theme.maintenance.inc
+2
-41
2 additions, 41 deletions
includes/theme.maintenance.inc
themes/seven/template.php
+12
-0
12 additions, 0 deletions
themes/seven/template.php
with
14 additions
and
41 deletions
includes/theme.maintenance.inc
+
2
−
41
View file @
6cb598ec
...
...
@@ -144,12 +144,6 @@ function theme_install_page($variables) {
// Delay setting the message variable so it can be processed below.
$variables
[
'show_messages'
]
=
FALSE
;
// Variable processors invoked manually since this function and theme_update_page()
// are exceptions in how it works within the theme system.
template_preprocess
(
$variables
,
'install_page'
);
template_preprocess_maintenance_page
(
$variables
);
template_process
(
$variables
,
'install_page'
);
template_process_maintenance_page
(
$variables
);
// Special handling of error messages
$messages
=
drupal_set_message
();
...
...
@@ -174,20 +168,7 @@ function theme_install_page($variables) {
$variables
[
'messages'
]
.
=
theme
(
'status_messages'
,
array
(
'display'
=>
'status'
));
}
// This was called as a theme hook (not template), so we need to fix
// path_to_theme() for the template, to point at the actual theme rather than
// system module as owner of the hook. Additionally, figure out the
// maintenance page template to use.
global
$theme_path
,
$theme_info
,
$base_theme_info
;
$theme_path
=
dirname
(
$theme_info
->
uri
);
$base_themes
=
$base_theme_info
;
// Make sure a maintenance-page.tpl.php is always found.
$base_themes
[]
=
'modules/system'
;
while
(
!
file_exists
(
$theme_path
.
'/maintenance-page.tpl.php'
)
&&
$base_theme
=
array_shift
(
$base_themes
))
{
$theme_path
=
dirname
(
$base_theme
->
uri
);
}
return
theme_render_template
(
$theme_path
.
'/maintenance-page.tpl.php'
,
$variables
);
return
theme
(
'maintenance_page'
,
$variables
);
}
/**
...
...
@@ -205,13 +186,6 @@ function theme_update_page($variables) {
// Set required headers.
drupal_add_http_header
(
'Content-Type'
,
'text/html; charset=utf-8'
);
// Variable processors invoked manually since this function and theme_install_page()
// are exceptions in how it works within the theme system.
template_preprocess
(
$variables
,
'update_page'
);
template_preprocess_maintenance_page
(
$variables
);
template_process
(
$variables
,
'update_page'
);
template_process_maintenance_page
(
$variables
);
// Special handling of warning messages.
$messages
=
drupal_set_message
();
if
(
isset
(
$messages
[
'warning'
]))
{
...
...
@@ -220,20 +194,7 @@ function theme_update_page($variables) {
$variables
[
'messages'
]
.
=
theme
(
'status_messages'
,
array
(
'display'
=>
'warning'
));
}
// This was called as a theme hook (not template), so we need to fix
// path_to_theme() for the template, to point at the actual theme rather than
// system module as owner of the hook. Additionally, figure out the
// maintenance page template to use.
global
$theme_path
,
$theme_info
,
$base_theme_info
;
$theme_path
=
dirname
(
$theme_info
->
uri
);
$base_themes
=
$base_theme_info
;
// Make sure a maintenance-page.tpl.php is always found.
$base_themes
[]
=
'modules/system'
;
while
(
!
file_exists
(
$theme_path
.
'/maintenance-page.tpl.php'
)
&&
$base_theme
=
array_shift
(
$base_themes
))
{
$theme_path
=
dirname
(
$base_theme
->
uri
);
}
return
theme_render_template
(
$theme_path
.
'/maintenance-page.tpl.php'
,
$variables
);
return
theme
(
'maintenance_page'
,
$variables
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
themes/seven/template.php
+
12
−
0
View file @
6cb598ec
<?php
// $Id$
/**
* Override or insert variables into the maintenance page template.
*/
function
seven_preprocess_maintenance_page
(
&
$vars
)
{
// While markup for normal pages is split into page.tpl.php and html.tpl.php,
// the markup for the maintenance page is all in the single
// maintenance-page.tpl.php template. So, to have what's done in
// seven_preprocess_html() also happen on the maintenance page, it has to be
// called here.
seven_preprocess_html
(
$vars
);
}
/**
* Override or insert variables into the html template.
*/
...
...
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