Ticket #19902: 19902.3.diff

src/wp-includes/link-template.php

@@ -3048 +3048 @@
 }
 
 /**
+ * Retrieve the blog url for a given site
+ *
+ * Blog url might be site root or set as a page.
+ *
+ * @since 4.5.0
+ *
+ * @return string Blog url
+ */
+function get_blog_url( $blog_id = null ) {
+
+        if ( empty( $blog_id ) || ! is_multisite() ) {
+                $show_on_front = get_option( 'show_on_front' );
+                $page_for_posts  = get_option( 'page_for_posts' );
+
+                if ( 'page' == $show_on_front && $page_for_posts ) {
+                        $url = get_permalink( $page_for_posts );
+                } else {
+                        $url = get_home_url( $blog_id );
+                }
+        } else {
+                $show_on_front = get_blog_option( $blog_id, 'show_on_front' );
+                $page_for_posts  = get_blog_option( $blog_id, 'page_for_posts' );
+
+                if ( ! empty( $page_for_posts ) && 'page' == $show_on_front ) {
+                        $url = get_blog_permalink( $blog_id, $page_for_posts );
+                } else {
+                        $url = get_home_url( $blog_id );
+                }
+        }
+
+        /**
+         * Filter the blog URL.
+         *
+         * @since 4.5.0
+         *
+         * @param string      $url     The complete blog URL including scheme and path.
+         * @param int|null    $blog_id Blog ID, or null for the current blog.
+         */
+        return apply_filters( 'get_blog_url', $url, $blog_id );
+}
+
+/**
  * Retrieve the url to the admin area for the current site.
  *
  * @since 2.6.0

tests/phpunit/tests/link/getBlogUrl.php

@@ +1 @@
+<?php
+
+/**
+ * @group link
+ */
+class Tests_Link_GetBlogUrl extends WP_UnitTestCase {
+        /**
+         * @ticket 19902
+         */
+        public function test_get_blog_url_with_post_archive_on_front_page() {
+                update_option( 'show_on_front', 'posts' );
+                $actual = get_blog_url();
+                $expected = get_home_url();
+                $this->assertSame( $expected, $actual );
+        }
+
+        /**
+         * @ticket 19902
+         */
+        public function test_get_blog_url_with_post_archive_on_a_blog_page() {
+                $page_for_posts = $this->factory->post->create( array( 'post_title' => 'blog-page', 'post_type' => 'page' ) );
+                update_option( 'show_on_front', 'page' );
+                update_option( 'page_for_posts', $page_for_posts );
+                $actual = get_blog_url();
+                $expected = get_permalink( $page_for_posts );
+                $this->assertSame( $expected, $actual );
+        }
+}