<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[43629] trunk: Upgrade/Install: Introduce `populate_site_meta()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/43629">43629</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/43629","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-09-05 11:01:36 +0000 (Wed, 05 Sep 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Upgrade/Install: Introduce `populate_site_meta()`.
Fixes <a href="https://core.trac.wordpress.org/ticket/44896">#44896</a>. See <a href="https://core.trac.wordpress.org/ticket/41333">#41333</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesSchemaphp">trunk/tests/phpunit/tests/admin/includesSchema.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2018-09-05 10:44:02 UTC (rev 43628)
+++ trunk/src/wp-admin/includes/schema.php 2018-09-05 11:01:36 UTC (rev 43629)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1292,3 +1292,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert ); // phpcs:ignore WordPress.WP.PreparedSQL.NotPrepared
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Creates WordPress site meta and sets the default values.
+ *
+ * @since 5.0.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param int $site_id Site ID to populate meta for.
+ * @param array $meta Optional. Custom meta $key => $value pairs to use. Default empty array.
+ */
+function populate_site_meta( $site_id, array $meta = array() ) {
+ global $wpdb;
+
+ $site_id = (int) $site_id;
+
+ if ( ! is_site_meta_supported() ) {
+ return;
+ }
+
+ if ( empty( $meta ) ) {
+ return;
+ }
+
+ $insert = '';
+ foreach ( $meta as $meta_key => $meta_value ) {
+ if ( is_array( $meta_value ) ) {
+ $meta_value = serialize( $meta_value );
+ }
+ if ( ! empty( $insert ) ) {
+ $insert .= ', ';
+ }
+ $insert .= $wpdb->prepare( '( %d, %s, %s)', $site_id, $meta_key, $meta_value );
+ }
+
+ $wpdb->query( "INSERT INTO $wpdb->blogmeta ( blog_id, meta_key, meta_value ) VALUES " . $insert ); // phpcs:ignore WordPress.WP.PreparedSQL.NotPrepared
+
+ wp_cache_set( 'last_changed', microtime(), 'sites' );
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsadminincludesSchemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesSchema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesSchema.php 2018-09-05 10:44:02 UTC (rev 43628)
+++ trunk/tests/phpunit/tests/admin/includesSchema.php 2018-09-05 11:01:36 UTC (rev 43629)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Admin_Includes_Schema extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> private static $options;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static $blogmeta;
</ins><span class="cx" style="display: block; padding: 0 10px"> private static $sitemeta;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,9 +17,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$options = 'testprefix_options';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$blogmeta = 'testprefix_blogmeta';
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$sitemeta = 'testprefix_sitemeta';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options = self::$options;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogmeta = self::$blogmeta;
</ins><span class="cx" style="display: block; padding: 0 10px"> $sitemeta = self::$sitemeta;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/schema.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,6 +43,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ CREATE TABLE {$blogmeta} (
+ meta_id bigint(20) unsigned NOT NULL auto_increment,
+ blog_id bigint(20) unsigned NOT NULL default '0',
+ meta_key varchar(255) default NULL,
+ meta_value longtext,
+ PRIMARY KEY (meta_id),
+ KEY meta_key (meta_key({$max_index_length})),
+ KEY blog_id (blog_id)
+ ) {$charset_collate}
+ "
+ );
+ $wpdb->query(
+ "
</ins><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$sitemeta} (
</span><span class="cx" style="display: block; padding: 0 10px"> meta_id bigint(20) unsigned NOT NULL auto_increment,
</span><span class="cx" style="display: block; padding: 0 10px"> site_id bigint(20) unsigned NOT NULL default '0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,9 +76,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options = self::$options;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogmeta = self::$blogmeta;
</ins><span class="cx" style="display: block; padding: 0 10px"> $sitemeta = self::$sitemeta;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DROP TABLE IF EXISTS {$options}" );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->query( "DROP TABLE IF EXISTS {$blogmeta}" );
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DROP TABLE IF EXISTS {$sitemeta}" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +175,53 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 44896
+ * @group multisite
+ * @group ms-required
+ * @dataProvider data_populate_site_meta
+ */
+ function test_populate_site_meta( $meta, $expected ) {
+ global $wpdb;
+
+ $orig_blogmeta = $wpdb->blogmeta;
+ $wpdb->blogmeta = self::$blogmeta;
+
+ populate_site_meta( 42, $meta );
+
+ $results = array();
+ foreach ( $expected as $meta_key => $value ) {
+ $results[ $meta_key ] = get_site_meta( 42, $meta_key, true );
+ }
+
+ $wpdb->query( "TRUNCATE TABLE {$wpdb->blogmeta}" );
+
+ $wpdb->blogmeta = $orig_blogmeta;
+
+ $this->assertEquals( $expected, $results );
+ }
+
+ public function data_populate_site_meta() {
+ return array(
+ array(
+ array(),
+ array(
+ 'unknown_value' => '',
+ ),
+ ),
+ array(
+ array(
+ 'custom_meta' => '1',
+ ),
+ array(
+ 'custom_meta' => '1',
+ ),
+ ),
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44895
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group multisite
</ins><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_populate_network_meta
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_populate_network_meta( $meta, $expected ) {
</span></span></pre>
</div>
</div>
</body>
</html>