Changes in branches/4.4/src/wp-includes/formatting.php [35815:36153]

File:

• branches/4.4/src/wp-includes/formatting.php (modified) (4 diffs)

branches/4.4/src/wp-includes/formatting.php

@@ -217 +217 @@
     // Look for shortcodes and HTML elements.
 
-    preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20]++)@', $text, $matches );
+    preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20=]++)@', $text, $matches );
     $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
     $found_shortcodes = ! empty( $tagnames );
@@ -234 +234 @@
             } else {
                 // This is an HTML element delimiter.
+
+                // Replace each & with &#038; unless it already looks like an entity.
+                $curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl );
+
                 _wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
             }
@@ -3893 +3897 @@
  */
 function map_deep( $value, $callback ) {
-    if ( is_array( $value ) || is_object( $value ) ) {
-        foreach ( $value as &$item ) {
-            $item = map_deep( $item, $callback );
-        }
-        return $value;
+    if ( is_array( $value ) ) {
+        foreach ( $value as $index => $item ) {
+            $value[ $index ] = map_deep( $item, $callback );
+        }
+    } elseif ( is_object( $value ) ) {
+        $object_vars = get_object_vars( $value );
+        foreach ( $object_vars as $property_name => $property_value ) {
+            $value->$property_name = map_deep( $property_value, $callback );
+        }
     } else {
-        return call_user_func( $callback, $value );
-    }
+        $value = call_user_func( $callback, $value );
+    }
+
+    return $value;
 }
 
@@ -4793 +4803 @@
     return $short_url;
 }
+
+/**
+ * 4.4.x hotfix for hidden configure links on admin dashboard.
+ *
+ * @ignore
+ */
+function _wp_441_dashboard_display_configure_links_css() { 
+    echo '<style type="text/css">
+        .postbox .button-link .edit-box { display: none; }
+        .wp-admin .edit-box { display: block; opacity: 0; }
+        .hndle:hover .edit-box, .edit-box:focus { opacity: 1; }
+        #dashboard-widgets h2 a { text-decoration: underline; }
+        #dashboard-widgets .hndle .postbox-title-action { float: right; line-height: 1.2; }
+    </style>';
+}
+add_action( 'admin_print_styles-index.php', '_wp_441_dashboard_display_configure_links_css' );