diff options
| -rw-r--r-- | includes/theme.inc | 24 | ||||
| -rw-r--r-- | themes/bluemarine/page.tpl.php | 2 | ||||
| -rw-r--r-- | themes/chameleon/chameleon.theme | 2 | ||||
| -rw-r--r-- | themes/engines/phptemplate/phptemplate.engine | 1 | ||||
| -rw-r--r-- | themes/pushbutton/page.tpl.php | 2 |
5 files changed, 4 insertions, 27 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 5cb18985a..9207e937e 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -395,7 +395,7 @@ function theme_page($content) { $output .= theme_get_styles(); $output .= ' </head>'; - $output .= ' <body style="background-color: #fff; color: #000;"'. theme('onload_attribute'). '">'; + $output .= ' <body style="background-color: #fff; color: #000;">'; $output .= '<table border="0" cellspacing="4" cellpadding="4"><tr><td style="vertical-align: top; width: 170px;">'; $output .= theme('blocks', 'all'); @@ -910,28 +910,6 @@ function theme_closure($main = 0) { } /** - * Call hook_onload() in all modules to enable modules to insert JavaScript that - * will get run once the page has been loaded by the browser. - * - * @param $theme_onloads - * Additional onload directives. - * @return - * A string containing the onload attributes. - */ -function theme_onload_attribute($theme_onloads = array()) { - if (!is_array($theme_onloads)) { - $theme_onloads = array($theme_onloads); - } - // Merge theme onloads (javascript rollovers, image preloads, etc.) - // with module onloads (htmlarea, etc.) - $onloads = array_merge(module_invoke_all('onload'), $theme_onloads); - if (count($onloads)) { - return ' onload="' . implode('; ', $onloads) . '"'; - } - return ''; -} - -/** * Return a set of blocks available for the current user. * * @param $region diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php index 9683955bf..f75ea826a 100644 --- a/themes/bluemarine/page.tpl.php +++ b/themes/bluemarine/page.tpl.php @@ -8,7 +8,7 @@ <script type="text/javascript"><?php /* Needed to avoid Flash of Unstyle Content in IE */ ?> </script> </head> -<body<?php print $onload_attributes ?>> +<body> <table border="0" cellpadding="0" cellspacing="0" id="header"> <tr> diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index da80828f4..bd6d865c6 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -38,7 +38,7 @@ function chameleon_page($content) { $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/common.css\" />\n"; $output .= theme_get_styles(); $output .= "</head>"; - $output .= "<body". theme_onload_attribute() .">\n"; + $output .= "<body>\n"; $output .= " <div id=\"header\">"; if ($logo = theme_get_setting('logo')) { diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine index ac98567f7..e7ddc86a2 100644 --- a/themes/engines/phptemplate/phptemplate.engine +++ b/themes/engines/phptemplate/phptemplate.engine @@ -197,7 +197,6 @@ function phptemplate_page($content) { 'logo' => theme_get_setting('logo'), 'messages' => theme('status_messages'), 'mission' => isset($mission) ? $mission : '', - 'onload_attributes' => theme('onload_attribute'), 'primary_links' => menu_primary_links(), 'search_box' => (theme_get_setting('toggle_search') ? search_box() : ''), 'secondary_links' => menu_secondary_links(), diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php index c986023ca..56faa28b4 100644 --- a/themes/pushbutton/page.tpl.php +++ b/themes/pushbutton/page.tpl.php @@ -7,7 +7,7 @@ <?php print $styles ?> </head> -<body bgcolor="#ffffff" <?php print theme("onload_attribute"); ?>> +<body bgcolor="#ffffff"> <div class="hide"><a href="#content" title="Skip navigation." accesskey="2">Skip navigation</a>.</div> |