Changeset 8525

Timestamp:

03/25/2019 10:24:51 PM (7 years ago)

Author:

coffee2code

Message:

Developer: Move auto-link exception handling into link_internal_element() so as to apply in a broader range of contexts.

Previous implementation only affected auto-linking in deprecation notice, but the need for the exception could also apply in text, param descriptions, see alsos, etc.

Props rahmohn, coffee2code.
See #4310.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc

Files:

• formatting.php (modified) (1 diff)
• template-tags.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/formatting.php

@@ -170 +170 @@
                 $url = '';
 
+                // Exceptions for externally-linked elements.
+                $exceptions = [
+                        'error_log()' => 'https://secure.php.net/manual/en/function.error-log.php',
+                ];
+
+                // Link exceptions that should actually point to external resources.
+                if ( ! empty( $exceptions[ $link ] ) ) {
+                        $url = $exceptions[ $link ];
+                }
+
                 // Link to class variable: {@see WP_Rewrite::$index}
-                if ( false !== strpos( $link, '::$' ) ) {
+                elseif ( false !== strpos( $link, '::$' ) ) {
                         // Nothing to link to currently.
                 }

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php

@@ -1064 +1064 @@
                                 }
 
-                                // Exceptions for externally-linked elements.
-                                $exceptions = [
-                                        'error_log()' => 'https://secure.php.net/manual/en/function.error-log.php',
-                                ];
-                                if ( ! empty( $exceptions[ $refers ] ) ) {
-                                        $link_to = \DevHub_Formatting::generate_link( $exceptions[ $refers ], $refers );
-                                }
-                                // Else internally-link the element.
-                                else {
-                                        $link_to = \DevHub_Formatting::link_internal_element( $refers );
-                                }
-
                                 /* translators: %s: Linked internal element name */
-                                $deprecation_info = ' ' . sprintf( __( 'Use %s instead.', 'wporg' ), $link_to );
+                                $deprecation_info = ' ' . sprintf( __( 'Use %s instead.', 'wporg' ), \DevHub_Formatting::link_internal_element( $refers ) );
                         }
                 }