Changeset 5764 for sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php

Timestamp:

08/07/2017 07:45:31 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Don't save or display a site URL for the topic if it's empty.

See #363.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php

@@ -377 +377 @@
          */
         public function display_extra_topic_fields() {
+                $site_url = get_post_meta( bbp_get_topic_id(), self::SITE_URL_META, true );
+
                 // Display site URL for logged-in users.
-                if ( is_user_logged_in() ) {
-                        $site_url = get_post_meta( bbp_get_topic_id(), self::SITE_URL_META, true );
-
+                if ( is_user_logged_in() && $site_url ) {
                         printf( '<p>%1$s <a href="%2$s" rel="nofollow">%2$s</a></p>',
                                 __( 'Site URL:', 'wporg-forums' ),
@@ -411 +411 @@
                         $site_url = esc_url_raw( apply_filters( 'pre_user_url', $_POST['site_url'] ) );
 
-                        $protocols = implode( '|', array( 'http', 'https' ) );
-                        if ( ! preg_match( '/^(' . $protocols . '):/is', $site_url ) ) {
-                                $site_url = 'http://' . $site_url;
+                        if ( $site_url ) {
+                                $protocols = implode( '|', array( 'http', 'https' ) );
+                                if ( ! preg_match( '/^(' . $protocols . '):/is', $site_url ) ) {
+                                        $site_url = 'http://' . $site_url;
+                                }
+
+                                update_post_meta( $topic_id, self::SITE_URL_META, $site_url );
+                        } elseif ( 'bbp_edit_topic' === current_action() ) {
+                                delete_post_meta( $topic_id, self::SITE_URL_META );
                         }
-
-                        update_post_meta( $topic_id, self::SITE_URL_META, $site_url );
                 }
         }