X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..7f1521bf193b382565eb753043c161f4cb3fcda7:/wp-admin/includes/misc.php
diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index f93e1388..367611b0 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -58,8 +58,8 @@ function got_url_rewrite() {
*
* @since 1.5.0
*
- * @param unknown_type $filename
- * @param unknown_type $marker
+ * @param string $filename
+ * @param string $marker
* @return array An array of strings from a file (.htaccess ) from between BEGIN and END markers.
*/
function extract_from_markers( $filename, $marker ) {
@@ -94,9 +94,9 @@ function extract_from_markers( $filename, $marker ) {
*
* @since 1.5.0
*
- * @param unknown_type $filename
- * @param unknown_type $marker
- * @param unknown_type $insertion
+ * @param string $filename
+ * @param string $marker
+ * @param array $insertion
* @return bool True on write success, false on failure.
*/
function insert_with_markers( $filename, $marker, $insertion ) {
@@ -211,7 +211,7 @@ function iis7_save_url_rewrite_rules(){
*
* @since 1.5.0
*
- * @param unknown_type $file
+ * @param string $file
*/
function update_recently_edited( $file ) {
$oldfiles = (array ) get_option( 'recently_edited' );
@@ -294,7 +294,7 @@ function wp_reset_vars( $vars ) {
*
* @since 2.1.0
*
- * @param unknown_type $message
+ * @param string|WP_Error $message
*/
function show_message($message) {
if ( is_wp_error($message) ){
@@ -621,7 +621,7 @@ function admin_color_scheme_picker( $user_id ) {
/>
-
+
@@ -662,10 +662,10 @@ function wp_color_scheme_settings() {
$icon_colors = $_wp_admin_css_colors['fresh']->icon_colors;
} else {
// Fall back to the default set of icon colors if the default scheme is missing.
- $icon_colors = array( 'base' => '#999', 'focus' => '#2ea2cc', 'current' => '#fff' );
+ $icon_colors = array( 'base' => '#999', 'focus' => '#00a0d2', 'current' => '#fff' );
}
- echo '\n";
+ echo '\n";
}
add_action( 'admin_head', 'wp_color_scheme_settings' );
@@ -841,5 +841,49 @@ function post_form_autocomplete_off() {
echo ' autocomplete="off"';
}
}
-
add_action( 'post_edit_form_tag', 'post_form_autocomplete_off' );
+
+/**
+ * Remove single-use URL parameters and create canonical link based on new URL.
+ *
+ * Remove specific query string parameters from a URL, create the canonical link,
+ * put it in the admin header, and change the current URL to match.
+ *
+ * @since 4.2.0
+ */
+function wp_admin_canonical_url() {
+ $removable_query_args = array(
+ 'message', 'settings-updated', 'saved',
+ 'update', 'updated', 'activated',
+ 'activate', 'deactivate', 'locked',
+ 'deleted', 'trashed', 'untrashed',
+ 'enabled', 'disabled', 'skipped',
+ 'spammed', 'unspammed',
+ );
+
+ /**
+ * Filter the list of URL parameters to remove.
+ *
+ * @since 4.2.0
+ *
+ * @param array $removable_query_args An array of parameters to remove from the URL.
+ */
+ $removable_query_args = apply_filters( 'removable_query_args', $removable_query_args );
+
+ if ( empty( $removable_query_args ) ) {
+ return;
+ }
+
+ // Ensure we're using an absolute URL.
+ $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+ $filtered_url = remove_query_arg( $removable_query_args, $current_url );
+ ?>
+
+
+