Changeset 16978
- Timestamp:
- 12/16/2010 06:12:55 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/import.php
r16976 r16978 45 45 require_once ('admin-header.php'); 46 46 $parent_file = 'tools.php'; 47 $href = is_multisite() ? network_admin_url( 'plugin-install.php' ) : admin_url( 'plugin-install.php' );48 47 ?> 49 48 … … 110 109 } 111 110 if ( empty($action) ) 112 $action = '<a href="' . esc_url( $href . '?tab=plugin-information&plugin=' . $plugin_slug .113 '&from=import&TB_iframe=true&width=600&height=550' ) . '" class="thickbox" title="' .111 $action = '<a href="' . esc_url( maybe_network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug . 112 '&from=import&TB_iframe=true&width=600&height=550' ) ) . '" class="thickbox" title="' . 114 113 esc_attr__('Install importer') . '">' . $data[0] . '</a>'; 115 114 } else { … … 132 131 133 132 if ( current_user_can('install_plugins') ) 134 echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.'), esc_url( $href . '?tab=search&type=tag&s=importer') ) . '</p>';133 echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.'), esc_url( maybe_network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>'; 135 134 ?> 136 135 -
trunk/wp-admin/includes/update.php
r16747 r16978 99 99 $cur->response = ''; 100 100 101 $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );102 103 101 switch ( $cur->response ) { 104 102 case 'development' : 105 return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], $href);103 return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], maybe_network_admin_url( 'update-core.php' ) ); 106 104 break; 107 105 108 106 case 'upgrade' : 109 return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', $href, $cur->current);107 return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', maybe_network_admin_url( 'update-core.php' ), $cur->current); 110 108 break; 111 109 … … 133 131 134 132 if ( current_user_can('update_core') ) { 135 $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' ); 136 $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, $href ); 133 $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, maybe_network_admin_url( 'update-core.php' ) ); 137 134 } else { 138 135 $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current ); … … 152 149 153 150 if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') ) { 154 $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' ); 155 $msg .= " <a href='" . $href . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>'; 151 $msg .= " <a href='" . maybe_network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>'; 156 152 } 157 153 -
trunk/wp-includes/admin-bar.php
r16957 r16978 275 275 $update_title .= '</span>'; 276 276 277 $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' ); 278 279 $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => $href ) ); 277 $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => maybe_network_admin_url( 'update-core.php' ) ) ); 280 278 } 281 279
Note: See TracChangeset
for help on using the changeset viewer.