Wordpress 3.3.1-scripts

[autoinstalls/wordpress.git] / wp-admin / admin-footer.php

diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php
index a43a4e459b3e9039c31fc8540d7af5d07db93804..02f0db9a4b98e76640d9a7f68fd83671bd6c30d3 100644 (file)
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -14,22 +14,24 @@ if ( !defined('ABSPATH') )
 <div class="clear"></div></div><!-- wpbody-content -->
 <div class="clear"></div></div><!-- wpbody -->
 <div class="clear"></div></div><!-- wpcontent -->
-</div><!-- wpwrap -->
 
 <div id="footer">
+<?php do_action( 'in_admin_footer' ); ?>
 <p id="footer-left" class="alignleft"><?php
-do_action( 'in_admin_footer' );
 $upgrade = apply_filters( 'update_footer', '' );
-echo apply_filters( 'admin_footer_text', '<span id="footer-thankyou">' . __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.').'</span> | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>') ); ?>
-</p>
-<?php // if ( $is_IE ) browse_happy(); ?>
+$footer_text = array(
+       '<span id="footer-thankyou">' . __( 'Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.' ) . '</span>',
+);
+echo apply_filters( 'admin_footer_text', implode( ' &bull; ', $footer_text ) );
+unset( $footer_text );
+?></p>
 <p id="footer-upgrade" class="alignright"><?php echo $upgrade; ?></p>
 <div class="clear"></div>
 </div>
 <?php
 do_action('admin_footer', '');
 do_action('admin_print_footer_scripts');
-do_action("admin_footer-$hook_suffix");
+do_action("admin_footer-" . $GLOBALS['hook_suffix']);
 
 // get_site_option() won't exist when auto upgrading from <= 2.7
 if ( function_exists('get_site_option') ) {
@@ -39,6 +41,7 @@ if ( function_exists('get_site_option') ) {
 
 ?>
 
+<div class="clear"></div></div><!-- wpwrap -->
 <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
 </body>
 </html>