WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use correct default values for some admin template functions. 

props ipm-frommen.
fixes #31308.
Built from https://develop.svn.wordpress.org/trunk@31446


git-svn-id: http://core.svn.wordpress.org/trunk@31427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-02-13 06:51:25 +00:00
parent e085363aa5
commit 7b9d981a54
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/template.php
View File

@ -411,7 +411,7 @@ function get_inline_data($post) {
* @param string $mode * @param string $mode
* @param bool $table_row * @param bool $table_row
*/ */
function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) { function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $table_row = true ) {
global $wp_list_table; global $wp_list_table;
/** /**
* Filter the in-line comment reply-to form output in the Comments * Filter the in-line comment reply-to form output in the Comments
@ -843,9 +843,9 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
* *
* @since 2.1.0 * @since 2.1.0
* *
* @param string $selected slug for the role that should be already selected * @param string $selected Slug for the role that should be already selected.
*/ */
function wp_dropdown_roles( $selected = false ) { function wp_dropdown_roles( $selected = '' ) {
$p = ''; $p = '';
$r = ''; $r = '';
@ -1814,7 +1814,7 @@ function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap
* Defaults to no other attributes. Other attributes can also be provided as a * Defaults to no other attributes. Other attributes can also be provided as a
* string such as 'tabindex="1"', though the array format is typically cleaner. * string such as 'tabindex="1"', though the array format is typically cleaner.
*/ */
function get_submit_button( $text = null, $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = null ) { function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) {
if ( ! is_array( $type ) ) if ( ! is_array( $type ) )
$type = explode( ' ', $type ); $type = explode( ' ', $type );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31445'; $wp_version = '4.2-alpha-31446';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.