'. (isset($type->help) ? filter_xss_admin($type->help) : '') .'
';
+ return (!empty($type->help) ? ''. filter_xss_admin($type->help) .'
' : '');
}
if ($arg[0] == 'node' && $arg[1] == 'add' && $arg[2]) {
$type = node_get_types('type', str_replace('-', '_', $arg[2]));
- return ''. (isset($type->help) ? filter_xss_admin($type->help) : '') .'
';
+ return (!empty($type->help) ? ''. filter_xss_admin($type->help) .'
' : '');
}
}
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.220
diff -u -p -r1.220 profile.module
--- modules/profile/profile.module 5 Oct 2007 13:26:53 -0000 1.220
+++ modules/profile/profile.module 5 Oct 2007 20:45:08 -0000
@@ -288,7 +288,7 @@ Unless you know what you are doing, it i
if ($type == 'selection') {
$form['fields']['options'] = array('#type' => 'textarea',
'#title' => t('Selection options'),
- '#default_value' => $edit['options'],
+ '#default_value' => isset($edit['options']) ? $edit['options'] : '',
'#description' => t('A list of all options. Put each option on a separate line. Example options are "red", "blue", "green", etc.'),
);
}
Index: modules/search/search.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.admin.inc,v
retrieving revision 1.1
diff -u -p -r1.1 search.admin.inc
--- modules/search/search.admin.inc 5 Sep 2007 08:39:57 -0000 1.1
+++ modules/search/search.admin.inc 5 Oct 2007 20:13:38 -0000
@@ -58,7 +58,7 @@ function search_admin_settings() {
$form['indexing_throttle']['search_cron_limit'] = array('#type' => 'select', '#title' => t('Items to index per cron run'), '#default_value' => variable_get('search_cron_limit', 100), '#options' => $items, '#description' => t('The maximum amount of items that will be indexed in one cron run. Set this number lower if your cron is timing out or if PHP is running out of memory.'));
// Indexing settings:
$form['indexing_settings'] = array('#type' => 'fieldset', '#title' => t('Indexing settings'));
- $form['indexing_settings']['info'] = array('#value' => ''. drupal_get_form('system_actions_manage_form', $options) .'
';
+ $output .= drupal_get_form('system_actions_manage_form', $options);
}
return $output;
Index: modules/trigger/trigger.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.module,v
retrieving revision 1.2
diff -u -p -r1.2 trigger.module
--- modules/trigger/trigger.module 26 Sep 2007 18:19:22 -0000 1.2
+++ modules/trigger/trigger.module 5 Oct 2007 20:45:15 -0000
@@ -333,7 +333,12 @@ function theme_trigger_display($element)
}
}
- $output = theme('table', $header, $rows) . drupal_render($element);
+ if (count($rows)) {
+ $output = theme('table', $header, $rows) . drupal_render($element);
+ }
+ else {
+ $output = drupal_render($element);
+ }
return $output;
}
Index: themes/garland/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/node.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 node.tpl.php
--- themes/garland/node.tpl.php 7 Aug 2007 08:39:36 -0000 1.4
+++ themes/garland/node.tpl.php 6 Oct 2007 15:15:24 -0000
@@ -13,11 +13,11 @@
+
-
+
Index: themes/garland/style-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style-rtl.css,v
retrieving revision 1.2
diff -u -p -r1.2 style-rtl.css
--- themes/garland/style-rtl.css 2 Oct 2007 16:03:17 -0000 1.2
+++ themes/garland/style-rtl.css 6 Oct 2007 15:16:05 -0000
@@ -5,32 +5,6 @@ html {
}
/**
- * Markup free clearing
- * Details: http://www.positioniseverything.net/easyclearing.html
- */
-.clear-block:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
- visibility: hidden;
-}
-
-.clear-block {
- display: inline-block;
-}
-
-/* Hides from IE-mac \*/
-* html .clear-block {
- height: 1%;
-}
-
-.clear-block {
- display: block;
-}
-/* End hide from IE-mac */
-
-/**
* Generic elements
*/
body {
Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.26
diff -u -p -r1.26 style.css
--- themes/garland/style.css 5 Oct 2007 13:09:17 -0000 1.26
+++ themes/garland/style.css 6 Oct 2007 15:15:56 -0000
@@ -971,14 +971,6 @@ tr.selected td a:link, tr.selected td a:
/**
* CSS support
*/
-div.clear {
- display: block;
- clear: both;
- height: 1px;
- line-height: 0px;
- font-size: 0px;
- margin-bottom: -1px;
-}
/*******************************************************************
* Color Module: Don't touch *
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.15
diff -u -p -r1.15 template.php
--- themes/garland/template.php 2 Oct 2007 16:03:17 -0000 1.15
+++ themes/garland/template.php 6 Oct 2007 15:16:13 -0000
@@ -53,11 +53,7 @@ function phptemplate_comment_wrapper($co
* Override or insert PHPTemplate variables into the templates.
*/
function phptemplate_preprocess_page(&$vars) {
- if ($secondary = menu_secondary_local_tasks()) {
- $output = '
';
- $output .= "
\n";
- $vars['tabs2'] = $output;
- }
+ $vars['tabs2'] = menu_secondary_local_tasks();
// Hook into color.module
if (module_exists('color')) {
@@ -67,18 +63,12 @@ function phptemplate_preprocess_page(&$v
/**
* Returns the rendered local tasks. The default implementation renders
- * them as tabs.
+ * them as tabs. Overridden to split the secondary tasks.
*
* @ingroup themeable
*/
function phptemplate_menu_local_tasks() {
- $output = '';
-
- if ($primary = menu_primary_local_tasks()) {
- $output .= "
\n";
- }
-
- return $output;
+ return menu_primary_local_tasks();
}
function phptemplate_comment_submitted($comment) {