Ticket #15064: 15064.diff

options-privacy.php

@@ -50 +50 @@
 
 <?php do_settings_sections('privacy'); ?>
 
-<p class="submit">
-        <input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
-</p>
+<?php submit_button(); ?>
 </form>
 
 </div>

includes/template.php

@@ -2064 +2064 @@
         $current_screen = apply_filters('current_screen', $current_screen);
 }
 
+/**
+ * Echos a paragraph-wrapped submit button, with provided text and appropriate class
+ * @param string $text The text of the button (defaults to 'Save Changes')
+ * @param string $type The type of button. One of: primary, secondary, delete
+ * @param string $name The HTML name of the submit button. Defaults to "submit"
+ */
+function submit_button( $text = NULL, $type = 'primary', $name = 'submit' ) {
+        echo get_submit_button( $text, $type, $name );
+}
+
+/**
+ * Returns a paragraph-wrapped submit button, with provided text and appropriate class
+ * @param string $text The text of the button (defaults to 'Save Changes')
+ * @param string $type The type of button. One of: primary, secondary, delete
+ * @param string $name The HTML name of the submit button. Defaults to "submit"
+ */
+function get_submit_button( $text = NULL, $type = 'primary', $name = 'submit' ) {
+        switch ( $type ) :
+                case 'primary' :
+                case 'secondary' :
+                        $class = 'button-' . $type;
+                        break;
+                case 'delete' :
+                        $class = 'button-secondary delete';
+                        break;
+                default :
+                        $class = $type; // Custom cases can just pass in the classes they want to be used
+        endswitch;
+        $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
+        return '<p class="submit"><input type="submit" name="' . esc_attr( $name ) . ' class="' . esc_attr( $class ) . '" value="' . esc_attr( $text ) . '" /></p>';
+}

options-media.php

@@ -132 +132 @@
 
 <?php do_settings_sections('media'); ?>
 
-<p class="submit">
-        <input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
-</p>
+<?php submit_button(); ?>
 
 </form>
 

options-permalink.php

@@ -221 +221 @@
 
 <?php do_settings_sections('permalink'); ?>
 
-<p class="submit">
-        <input type="submit" name="submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
-</p>
+<?php submit_button(); ?>
   </form>
 <?php if ( !is_multisite() ) { ?>
 <?php if ( $iis7_permalinks ) :

options-writing.php

@@ -148 +148 @@
 
 <?php do_settings_sections('writing'); ?>
 
-<p class="submit">
-        <input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
-</p>
+<?php submit_button(); ?>
 </form>
 </div>