Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #443518 by chx: remove stray whitespace.

merge-requests/26/head
Dries Buytaert 2009-04-24 08:09:18 +00:00
parent c7f7f6326e
commit addaf21247
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
includes/theme.inc
View File

@ -1910,9 +1910,9 @@ function template_preprocess_page(&$variables) {
$variables['template_files'] = $suggestions; $variables['template_files'] = $suggestions;
foreach ($suggestions as $suggestion) { foreach ($suggestions as $suggestion) {
if ($suggestion != 'page-front') { if ($suggestion != 'page-front') {
// Add current suggestion to page classes to make it possible to theme the page // Add current suggestion to page classes to make it possible to theme the page
// depending on the current page type (e.g. node, admin, user, etc.) as well as // depending on the current page type (e.g. node, admin, user, etc.) as well as
// more specific data like node-12 or node-edit. To avoid illegal characters in // more specific data like node-12 or node-edit. To avoid illegal characters in
// the class, we're removing everything disallowed. We are not using 'a-z' as // the class, we're removing everything disallowed. We are not using 'a-z' as
// that might leave in certain international characters (e.g. German umlauts). // that might leave in certain international characters (e.g. German umlauts).
$body_classes[] = preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', form_clean_id(drupal_strtolower($suggestion))); $body_classes[] = preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', form_clean_id(drupal_strtolower($suggestion)));
@ -1935,9 +1935,9 @@ function template_preprocess_page(&$variables) {
*/ */
function template_page_suggestions($args) { function template_page_suggestions($args) {
// Build a list of suggested template files and body classes in order of // Build a list of suggested template files and body classes in order of
// specificity. One suggestion is made for every element of the current path, // specificity. One suggestion is made for every element of the current path,
// though numeric elements are not carried to subsequent suggestions. For // though numeric elements are not carried to subsequent suggestions. For
// example, http://www.example.com/node/1/edit would result in the following // example, http://www.example.com/node/1/edit would result in the following
// suggestions and body classes: // suggestions and body classes:
// //
@ -1987,17 +1987,17 @@ function template_preprocess_node(&$variables) {
$variables['node_url'] = url('node/' . $node->nid); $variables['node_url'] = url('node/' . $node->nid);
$variables['title'] = check_plain($node->title); $variables['title'] = check_plain($node->title);
$variables['page'] = (bool)menu_get_object(); $variables['page'] = (bool)menu_get_object();
if ($node->build_mode == NODE_BUILD_PREVIEW) { if ($node->build_mode == NODE_BUILD_PREVIEW) {
unset($node->content['links']); unset($node->content['links']);
} }
// Render taxonomy links separately. // Render taxonomy links separately.
$variables['terms'] = !empty($node->content['links']['terms']) ? drupal_render($node->content['links']['terms']) : ''; $variables['terms'] = !empty($node->content['links']['terms']) ? drupal_render($node->content['links']['terms']) : '';
// Render all remaining node links. // Render all remaining node links.
$variables['links'] = !empty($node->content['links']) ? drupal_render($node->content['links']) : ''; $variables['links'] = !empty($node->content['links']) ? drupal_render($node->content['links']) : '';
// Render any comments. // Render any comments.
$variables['comments'] = !empty($node->content['comments']) ? drupal_render($node->content['comments']) : ''; $variables['comments'] = !empty($node->content['comments']) ? drupal_render($node->content['comments']) : '';