WordPress 4.0

[autoinstalls/wordpress.git] / wp-admin / edit-link-form.php

diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index d4a38cab563eec5568aca87db0c83b5a9bafa27d..610240a0c4731a4712491c36d86583bf9510de3e 100644 (file)
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -13,12 +13,12 @@ if ( !defined('ABSPATH') )
 if ( ! empty($link_id) ) {
        $heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
        $submit_text = __('Update Link');
 if ( ! empty($link_id) ) {
        $heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
        $submit_text = __('Update Link');

-       $form = '<form name="editlink" id="editlink" method="post" action="link.php">';
+       $form_name = 'editlink';

        $nonce_action = 'update-bookmark_' . $link_id;
 } else {
        $heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
        $submit_text = __('Add Link');
        $nonce_action = 'update-bookmark_' . $link_id;
 } else {
        $heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
        $submit_text = __('Add Link');

-       $form = '<form name="addlink" id="addlink" method="post" action="link.php">';
+       $form_name = 'addlink';

        $nonce_action = 'add-bookmark';
 }
 
        $nonce_action = 'add-bookmark';
 }
 


@@ -63,7 +63,7 @@ get_current_screen()->add_help_tab( array(
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
        '<p>' . __( '<a href="http://codex.wordpress.org/Links_Add_New_Screen" target="_blank">Documentation on Creating Links</a>' ) . '</p>' .
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
        '<p>' . __( '<a href="http://codex.wordpress.org/Links_Add_New_Screen" target="_blank">Documentation on Creating Links</a>' ) . '</p>' .

-       '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+       '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'

 );
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 );
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );


@@ -76,11 +76,11 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 <div id="message" class="updated"><p><?php _e('Link added.'); ?></p></div>
 <?php endif; ?>
 
 <div id="message" class="updated"><p><?php _e('Link added.'); ?></p></div>
 <?php endif; ?>
 

+<form name="<?php echo esc_attr( $form_name ); ?>" id="<?php echo esc_attr( $form_name ); ?>" method="post" action="link.php">

 <?php
 <?php

-if ( !empty($form) )
-       echo $form;
-if ( !empty($link_added) )
+if ( ! empty( $link_added ) ) {

        echo $link_added;
        echo $link_added;

+}

 
 wp_nonce_field( $nonce_action );
 wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
 
 wp_nonce_field( $nonce_action );
 wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );


@@ -118,11 +118,7 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
 <div id="postbox-container-1" class="postbox-container">
 <?php
 
 <div id="postbox-container-1" class="postbox-container">
 <?php
 

-/**
- * Fires before the Save meta box in the sidebar.
- *
- * @since 2.5.0
- */
+/** This action is documented in wp-admin/includes/meta-boxes.php */

 do_action( 'submitlink_box' );
 $side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
 
 do_action( 'submitlink_box' );
 $side_meta_boxes = do_meta_boxes( 'link', 'side', $link );