Changeset 35848 for trunk/src/wp-includes/comment-template.php

Timestamp:

12/10/2015 03:05:34 AM (11 years ago)

Author:

johnbillion

Message:

Comments: The year is 2003. Permalinks are a new thing and everyone's using Blogger. It's a time when opening a modal window in JavaScript to view a section of a website is not a completely weird thing, although many users get annoyed by it. b2 has recently become WordPress, and with it comes a bunch of functionality that will become stale over the next decade, remnants of simpler times.

Twelve years later, after no fewer than three themes have intentionally implemented popup comments in their functionality, before being abandoned for at least the last six years, we've reached a time where we can put this era behind us. A time when we can remove comment popup functionality from WordPress.

If this breaks the internet, I'll eat my hat.

Fixes #28617

File:

• trunk/src/wp-includes/comment-template.php (modified) (4 diffs)

trunk/src/wp-includes/comment-template.php

@@ -1389 +1389 @@
 
 /**
- * Display the JS popup script to show a comment.
- *
- * If the $file parameter is empty, then the home page is assumed. The defaults
- * for the window are 400px by 400px.
- *
- * For the comment link popup to work, this function has to be called or the
- * normal comment link will be assumed.
- *
- * @global string $wpcommentspopupfile  The URL to use for the popup window.
- * @global int    $wpcommentsjavascript Whether to use JavaScript. Set when function is called.
- *
- * @since 0.71
- *
- * @param int $width  Optional. The width of the popup window. Default 400.
- * @param int $height Optional. The height of the popup window. Default 400.
- * @param string $file Optional. Sets the location of the popup window.
- */
-function comments_popup_script( $width = 400, $height = 400, $file = '' ) {
-        global $wpcommentspopupfile, $wpcommentsjavascript;
-
-        if (empty ($file)) {
-                $wpcommentspopupfile = '';  // Use the index.
-        } else {
-                $wpcommentspopupfile = $file;
-        }
-
-        $wpcommentsjavascript = 1;
-        $javascript = "<script type='text/javascript'>\nfunction wpopen (macagna) {\n    window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n";
-        echo $javascript;
-}
-
-/**
- * Displays the link to the comments popup window for the current post ID.
- *
- * Is not meant to be displayed on single posts and pages. Should be used
- * on the lists of posts
- *
- * @global string $wpcommentspopupfile  The URL to use for the popup window.
- * @global int    $wpcommentsjavascript Whether to use JavaScript. Set when function is called.
+ * Displays the link to the comments for the current post ID.
  *
  * @since 0.71
@@ -1441 +1403 @@
  */
 function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
-        global $wpcommentspopupfile, $wpcommentsjavascript;
-
         $id = get_the_ID();
         $title = get_the_title();
@@ -1479 +1439 @@
 
         echo '<a href="';
-        if ( $wpcommentsjavascript ) {
-                if ( empty( $wpcommentspopupfile ) )
-                        $home = home_url();
-                else
-                        $home = get_option('siteurl');
-                echo $home . '/' . $wpcommentspopupfile . '?comments_popup=' . $id;
-                echo '" onclick="wpopen(this.href); return false"';
+        if ( 0 == $number ) {
+                $respond_link = get_permalink() . '#respond';
+                /**
+                 * Filter the respond link when a post has no comments.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $respond_link The default response link.
+                 * @param integer $id The post ID.
+                 */
+                echo apply_filters( 'respond_link', $respond_link, $id );
         } else {
-                // if comments_popup_script() is not in the template, display simple comment link
-                if ( 0 == $number ) {
-                        $respond_link = get_permalink() . '#respond';
-                        /**
-                         * Filter the respond link when a post has no comments.
-                         *
-                         * @since 4.4.0
-                         *
-                         * @param string $respond_link The default response link.
-                         * @param integer $id The post ID.
-                         */
-                        echo apply_filters( 'respond_link', $respond_link, $id );
-                } else {
-                        comments_link();
-                }
-                echo '"';
-        }
+                comments_link();
+        }
+        echo '"';
 
         if ( !empty( $css_class ) ) {
@@ -1511 +1461 @@
         $attributes = '';
         /**
-         * Filter the comments popup link attributes for display.
+         * Filter the comments link attributes for display.
          *
          * @since 2.5.0
          *
-         * @param string $attributes The comments popup link attributes. Default empty.
+         * @param string $attributes The comments link attributes. Default empty.
          */
         echo apply_filters( 'comments_popup_link_attributes', $attributes );