Ticket #18769: 18769.diff

src/wp-admin/includes/template.php

@@ -558 +558 @@
         $r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta-{$entry['meta_id']}-key'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta-{$entry['meta_id']}-key' type='text' size='20' value='{$entry['meta_key']}' />";
 
         $r .= "\n\t\t<div class='submit'>";
-        $r .= get_submit_button( __( 'Delete' ), 'deletemeta small', "deletemeta[{$entry['meta_id']}]", false, array( 'data-wp-lists' => "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce" ) );
+        $r .= get_submit_button( array( ['text' => __( 'Delete' ), 'type' => 'deletemeta small', 'name' => "deletemeta[{$entry['meta_id']}]", 'wrap' => false, 'other_attributes' => array( 'data-wp-lists' => "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce" ),'source' => ''] ) );
         $r .= "\n\t\t";
-        $r .= get_submit_button( __( 'Update' ), 'updatemeta small', "meta-{$entry['meta_id']}-submit", false, array( 'data-wp-lists' => "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce" ) );
+        $r .= get_submit_button( array( ['text' => __( 'Update' ), 'type' => 'updatemeta small', 'name' => "meta-{$entry['meta_id']}-submit", 'wrap' => false, 'other_attributes' => array( 'data-wp-lists' => "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce" ),'source' => ''] ) );
         $r .= "</div>";
         $r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
         $r .= "</td>";
@@ -1938 +1938 @@
  *                                       as a string such as 'tabindex="1"', though the array format is
  *                                       preferred. Default null.
  */
-function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) {
-        echo get_submit_button( $text, $type, $name, $wrap, $other_attributes );
+function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null, $source = null ) {
+        $args = array([
+                'text' => $text,
+                'type' => $type,
+                'name' => $name,
+                'wrap' => $wrap,
+                'other_attributes' => $other_attributes,
+                'source' => $source
+                ]);
+        echo get_submit_button( $args );
 }
 
 /**
  * Returns a submit button, with provided text and appropriate class
  *
- * @since 3.1.0
+ * @since this patch
  *
- * @param string       $text             Optional. The text of the button. Default 'Save Changes'.
- * @param string       $type             Optional. The type and CSS class(es) of the button. Core values
- *                                       include 'primary', 'small', and 'large'. Default 'primary large'.
- * @param string       $name             Optional. The HTML name of the submit button. Defaults to "submit".
- *                                       If no id attribute is given in $other_attributes below, `$name` will
- *                                       be used as the button's id. Default 'submit'.
- * @param bool         $wrap             Optional. True if the output button should be wrapped in a paragraph
- *                                       tag, false otherwise. Default true.
- * @param array|string $other_attributes Optional. Other attributes that should be output with the button,
- *                                       mapping attributes to their values, such as `array( 'tabindex' => '1' )`.
- *                                       These attributes will be output as `attribute="value"`, such as
- *                                       `tabindex="1"`. Other attributes can also be provided as a string such
- *                                       as `tabindex="1"`, though the array format is typically cleaner.
- *                                       Default empty.
+ * @param array of arguments (required) 
+ *                      arguments include : text, type, name, wrap, other_attributes, and source
+                        `source` is new. It helps identify the source or page on which the button
+                        exists. This is to enable add custom funcionality for different pages. In 
+                        this case, we can make a pop up warning the user who wants to change the
+                        site url, or guide them on how best they can relocate to new address!
+ * 
  * @return string Submit button HTML.
  */
-function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) {
+function get_submit_button( $args = array() ) {
+        //set variables
+        $text = isset( $args['text'] ) ? $args['text'] : '';
+        $type = isset( $args['type'] ) ? $args['type'] : 'primary large';
+        $name = isset( $args['name'] ) ? $args['name'] : 'submit';
+        $wrap = isset( $args['wrap'] ) ? $args['wrap'] : true;
+        $other_attributes = isset( $args['other_attributes'] ) ? $args['other_attributes'] : '';
+        $source = isset( $args['source'] ) ? $args['source'] : '';
+
         if ( ! is_array( $type ) )
                 $type = explode( ' ', $type );