<!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>[61006] trunk: Upgrade/Install: Revert relocation of Hello Dolly plugin.</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/61006">61006</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/61006","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-10-21 04:31:04 +0000 (Tue, 21 Oct 2025)</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: Revert relocation of Hello Dolly plugin.
Reverts Hello Dolly changes moving the plugin to a containing folder. Removes the `upgrade_690()` function in it's entirety as the upgrade routine is no longer required.
Fully reverted commits: <a href="https://core.trac.wordpress.org/changeset/60666">[60666]</a>, <a href="https://core.trac.wordpress.org/changeset/60670">[60670]</a>, <a href="https://core.trac.wordpress.org/changeset/60716">[60716]</a>, <a href="https://core.trac.wordpress.org/changeset/60725">[60725]</a>; partially reverts <a href="https://core.trac.wordpress.org/changeset/60721">[60721]</a>.
Porps johnbillion, whyisjake, SirLouen, mindctrl, afragen, jorbin, Otto42, swissspidy, welcher, davidbaumwald.
See <a href="https://core.trac.wordpress.org/ticket/53323">#53323</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgitignore">trunk/.gitignore</a></li>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpincludesclasswpplugindependenciesphp">trunk/src/wp-includes/class-wp-plugin-dependencies.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPluginphp">trunk/tests/phpunit/tests/admin/includesPlugin.php</a></li>
<li><a href="#trunktestsphpunittestsadminplugindependencieshasDependentsphp">trunk/tests/phpunit/tests/admin/plugin-dependencies/hasDependents.php</a></li>
<li><a href="#trunktestsphpunittestsadminplugindependenciesinitializephp">trunk/tests/phpunit/tests/admin/plugin-dependencies/initialize.php</a></li>
<li><a href="#trunktestsphpunittestsajaxwpAjaxUpdatePluginphp">trunk/tests/phpunit/tests/ajax/wpAjaxUpdatePlugin.php</a></li>
<li><a href="#trunktestsphpunittestsdependenciesscriptsphp">trunk/tests/phpunit/tests/dependencies/scripts.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitenetworkphp">trunk/tests/phpunit/tests/multisite/network.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentpluginshellophp">trunk/src/wp-content/plugins/hello.php</a></li>
<li><a href="#trunktestsphpunitdatapluginshellophp">trunk/tests/phpunit/data/plugins/hello.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentpluginshellodollyhellophp">trunk/src/wp-content/plugins/hello-dolly/hello.php</a></li>
<li><a href="#trunktestsphpunitdatapluginshellodollyhellophp">trunk/tests/phpunit/data/plugins/hello-dolly/hello.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgitignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.gitignore</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.gitignore 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/.gitignore 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,8 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /src/wp-content/fonts
</span><span class="cx" style="display: block; padding: 0 10px"> /src/wp-content/languages
</span><span class="cx" style="display: block; padding: 0 10px"> /src/wp-content/mu-plugins
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/src/wp-content/plugins/*
-!/src/wp-content/plugins/hello-dolly
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/src/wp-content/plugins
</ins><span class="cx" style="display: block; padding: 0 10px"> /src/wp-content/themes/*
</span><span class="cx" style="display: block; padding: 0 10px"> !/src/wp-content/themes/twentyten
</span><span class="cx" style="display: block; padding: 0 10px"> !/src/wp-content/themes/twentyeleven
</span></span></pre></div>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/Gruntfile.js 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/themes/index.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/themes/twenty*/**',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/plugins/index.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-content/plugins/hello-dolly/**',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-content/plugins/hello.php',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/plugins/akismet/**',
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-content/themes/twenty*/node_modules/**',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span></span></pre></div>
<a id="trunksrcwpadminincludespluginphp"></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/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/src/wp-admin/includes/plugin.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,6 +153,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) );
</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">+ } elseif ( 'hello.php' === basename( $plugin_file ) ) {
+ $textdomain = 'default';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $textdomain ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1006,6 +1008,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_slug = dirname( $plugin_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'hello.php' === $plugin_file ) {
+ $plugin_slug = 'hello-dolly';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Remove language files, silently.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '.' !== $plugin_slug && ! empty( $plugin_translations[ $plugin_slug ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $translations = $plugin_translations[ $plugin_slug ];
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/src/wp-admin/includes/update-core.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -841,8 +841,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/dist/undo-manager.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/dist/fields.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/dist/fields.js',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 6.9
- 'wp-content/plugins/hello.php',
</del><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -975,7 +973,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'themes/twentytwentythree/' => '6.1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'themes/twentytwentyfour/' => '6.4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'themes/twentytwentyfive/' => '6.7',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugins/hello-dolly/' => '6.9',
</del><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></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/src/wp-admin/includes/upgrade.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,10 +886,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> upgrade_682();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $wp_current_db_version < 60717 ) {
- upgrade_690();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> maybe_disable_link_manager();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> maybe_disable_automattic_widgets();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2486,31 +2482,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Executes changes made in WordPress 6.9.0.
- *
- * @ignore
- * @since 6.9.0
- *
- * @global int $wp_current_db_version The old (current) database version.
- */
-function upgrade_690() {
- global $wp_current_db_version;
-
- if ( $wp_current_db_version < 60717 ) {
- // Switch Hello Dolly from file to directory format. See #53323
- $active_plugins = (array) get_option( 'active_plugins', array() );
- $old_plugin = 'hello.php';
- $new_plugin = 'hello-dolly/hello.php';
- $key = array_search( $old_plugin, $active_plugins, true );
-
- if ( $key ) {
- $active_plugins[ $key ] = $new_plugin;
- update_option( 'active_plugins', $active_plugins );
- }
- }
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Executes network-level upgrade routines.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span></span></pre></div>
<a id="trunksrcwpcontentpluginshellodollyhellophp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-content/plugins/hello-dolly/hello.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/plugins/hello-dolly/hello.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/src/wp-content/plugins/hello-dolly/hello.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,106 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * @package Hello_Dolly
- * @version 1.7.2
- */
-/*
-Plugin Name: Hello Dolly
-Plugin URI: http://wordpress.org/plugins/hello-dolly/
-Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
-Author: Matt Mullenweg
-Version: 1.7.2
-Author URI: http://ma.tt/
-Text Domain: hello-dolly
-*/
-
-// Do not load directly.
-if ( ! defined( 'ABSPATH' ) ) {
- die();
-}
-
-function hello_dolly_get_lyric() {
- /** These are the lyrics to Hello Dolly */
- $lyrics = "Hello, Dolly
-Well, hello, Dolly
-It's so nice to have you back where you belong
-You're lookin' swell, Dolly
-I can tell, Dolly
-You're still glowin', you're still crowin'
-You're still goin' strong
-I feel the room swayin'
-While the band's playin'
-One of our old favorite songs from way back when
-So, take her wrap, fellas
-Dolly, never go away again
-Hello, Dolly
-Well, hello, Dolly
-It's so nice to have you back where you belong
-You're lookin' swell, Dolly
-I can tell, Dolly
-You're still glowin', you're still crowin'
-You're still goin' strong
-I feel the room swayin'
-While the band's playin'
-One of our old favorite songs from way back when
-So, golly, gee, fellas
-Have a little faith in me, fellas
-Dolly, never go away
-Promise, you'll never go away
-Dolly'll never go away again";
-
- // Here we split it into lines.
- $lyrics = explode( "\n", $lyrics );
-
- // And then randomly choose a line.
- return wptexturize( $lyrics[ mt_rand( 0, count( $lyrics ) - 1 ) ] );
-}
-
-// This just echoes the chosen line, we'll position it later.
-function hello_dolly() {
- $chosen = hello_dolly_get_lyric();
- $lang = '';
- if ( 'en_' !== substr( get_user_locale(), 0, 3 ) ) {
- $lang = ' lang="en"';
- }
-
- printf(
- '<p id="dolly"><span class="screen-reader-text">%s </span><span dir="ltr"%s>%s</span></p>',
- __( 'Quote from Hello Dolly song, by Jerry Herman:' ),
- $lang,
- $chosen
- );
-}
-
-// Now we set that function up to execute when the admin_notices action is called.
-add_action( 'admin_notices', 'hello_dolly' );
-
-// We need some CSS to position the paragraph.
-function dolly_css() {
- echo "
- <style type='text/css'>
- #dolly {
- float: right;
- padding: 5px 10px;
- margin: 0;
- font-size: 12px;
- line-height: 1.6666;
- }
- .rtl #dolly {
- float: left;
- }
- .block-editor-page #dolly {
- display: none;
- }
- @media screen and (max-width: 782px) {
- #dolly,
- .rtl #dolly {
- float: none;
- padding-left: 0;
- padding-right: 0;
- }
- }
- </style>
- ";
-}
-
-add_action( 'admin_head', 'dolly_css' );
</del></span></pre></div>
<a id="trunksrcwpcontentpluginshellophpfromrev61005trunksrcwpcontentpluginshellodollyhellophp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-content/plugins/hello.php (from rev 61005, trunk/src/wp-content/plugins/hello-dolly/hello.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/plugins/hello.php (rev 0)
+++ trunk/src/wp-content/plugins/hello.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,106 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * @package Hello_Dolly
+ * @version 1.7.2
+ */
+/*
+Plugin Name: Hello Dolly
+Plugin URI: http://wordpress.org/plugins/hello-dolly/
+Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
+Author: Matt Mullenweg
+Version: 1.7.2
+Author URI: http://ma.tt/
+Text Domain: hello-dolly
+*/
+
+// Do not load directly.
+if ( ! defined( 'ABSPATH' ) ) {
+ die();
+}
+
+function hello_dolly_get_lyric() {
+ /** These are the lyrics to Hello Dolly */
+ $lyrics = "Hello, Dolly
+Well, hello, Dolly
+It's so nice to have you back where you belong
+You're lookin' swell, Dolly
+I can tell, Dolly
+You're still glowin', you're still crowin'
+You're still goin' strong
+I feel the room swayin'
+While the band's playin'
+One of our old favorite songs from way back when
+So, take her wrap, fellas
+Dolly, never go away again
+Hello, Dolly
+Well, hello, Dolly
+It's so nice to have you back where you belong
+You're lookin' swell, Dolly
+I can tell, Dolly
+You're still glowin', you're still crowin'
+You're still goin' strong
+I feel the room swayin'
+While the band's playin'
+One of our old favorite songs from way back when
+So, golly, gee, fellas
+Have a little faith in me, fellas
+Dolly, never go away
+Promise, you'll never go away
+Dolly'll never go away again";
+
+ // Here we split it into lines.
+ $lyrics = explode( "\n", $lyrics );
+
+ // And then randomly choose a line.
+ return wptexturize( $lyrics[ mt_rand( 0, count( $lyrics ) - 1 ) ] );
+}
+
+// This just echoes the chosen line, we'll position it later.
+function hello_dolly() {
+ $chosen = hello_dolly_get_lyric();
+ $lang = '';
+ if ( 'en_' !== substr( get_user_locale(), 0, 3 ) ) {
+ $lang = ' lang="en"';
+ }
+
+ printf(
+ '<p id="dolly"><span class="screen-reader-text">%s </span><span dir="ltr"%s>%s</span></p>',
+ __( 'Quote from Hello Dolly song, by Jerry Herman:' ),
+ $lang,
+ $chosen
+ );
+}
+
+// Now we set that function up to execute when the admin_notices action is called.
+add_action( 'admin_notices', 'hello_dolly' );
+
+// We need some CSS to position the paragraph.
+function dolly_css() {
+ echo "
+ <style type='text/css'>
+ #dolly {
+ float: right;
+ padding: 5px 10px;
+ margin: 0;
+ font-size: 12px;
+ line-height: 1.6666;
+ }
+ .rtl #dolly {
+ float: left;
+ }
+ .block-editor-page #dolly {
+ display: none;
+ }
+ @media screen and (max-width: 782px) {
+ #dolly,
+ .rtl #dolly {
+ float: none;
+ padding-left: 0;
+ padding-right: 0;
+ }
+ }
+ </style>
+ ";
+}
+
+add_action( 'admin_head', 'dolly_css' );
</ins></span></pre></div>
<a id="trunksrcwpincludesclasswpplugindependenciesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-plugin-dependencies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-plugin-dependencies.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/src/wp-includes/class-wp-plugin-dependencies.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -870,6 +870,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The plugin's slug.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function convert_to_slug( $plugin_file ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'hello.php' === $plugin_file ) {
+ return 'hello-dolly';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return str_contains( $plugin_file, '/' ) ? dirname( $plugin_file ) : str_replace( '.php', '', $plugin_file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitdatapluginshellodollyhellophp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/data/plugins/hello-dolly/hello.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/plugins/hello-dolly/hello.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/tests/phpunit/data/plugins/hello-dolly/hello.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,11 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/*
-Plugin Name: Hello Dolly
-Plugin URI: http://wordpress.org/#
-Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
-Author: Matt Mullenweg
-Version: 1.7.2
-Author URI: http://ma.tt/
-Text Domain: hello-dolly
-
-*/
</del></span></pre></div>
<a id="trunktestsphpunitdatapluginshellophpfromrev61005trunktestsphpunitdatapluginshellodollyhellophp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/tests/phpunit/data/plugins/hello.php (from rev 61005, trunk/tests/phpunit/data/plugins/hello-dolly/hello.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/plugins/hello.php (rev 0)
+++ trunk/tests/phpunit/data/plugins/hello.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,11 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/*
+Plugin Name: Hello Dolly
+Plugin URI: http://wordpress.org/#
+Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
+Author: Matt Mullenweg
+Version: 1.7.2
+Author URI: http://ma.tt/
+Text Domain: hello-dolly
+
+*/
</ins></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPluginphp"></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/includesPlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPlugin.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/tests/phpunit/tests/admin/includesPlugin.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</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"> public function test_get_plugin_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = get_plugin_data( DIR_TESTDATA . '/plugins/hello-dolly/hello.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = get_plugin_data( DIR_TESTDATA . '/plugins/hello.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $default_headers = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Name' => 'Hello Dolly',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,31 +374,31 @@
</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"> public function test_is_plugin_active_true() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- activate_plugin( 'hello-dolly/hello.php' );
- $test = is_plugin_active( 'hello-dolly/hello.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ activate_plugin( 'hello.php' );
+ $test = is_plugin_active( 'hello.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $test );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- deactivate_plugins( 'hello-dolly/hello.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ deactivate_plugins( 'hello.php' );
</ins><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"> public function test_is_plugin_active_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- deactivate_plugins( 'hello-dolly/hello.php' );
- $test = is_plugin_active( 'hello-dolly/hello.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ deactivate_plugins( 'hello.php' );
+ $test = is_plugin_active( 'hello.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $test );
</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"> public function test_is_plugin_inactive_true() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- deactivate_plugins( 'hello-dolly/hello.php' );
- $test = is_plugin_inactive( 'hello-dolly/hello.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ deactivate_plugins( 'hello.php' );
+ $test = is_plugin_inactive( 'hello.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $test );
</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"> public function test_is_plugin_inactive_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- activate_plugin( 'hello-dolly/hello.php' );
- $test = is_plugin_inactive( 'hello-dolly/hello.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ activate_plugin( 'hello.php' );
+ $test = is_plugin_inactive( 'hello.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $test );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- deactivate_plugins( 'hello-dolly/hello.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ deactivate_plugins( 'hello.php' );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +405,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_plugin_files
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_plugin_files_single() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $name = 'hello-dolly/hello.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = 'hello.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( $name ), get_plugin_files( $name ) );
</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">@@ -550,7 +550,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::is_network_only_plugin
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_network_only_plugin_hello() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( is_network_only_plugin( 'hello-dolly/hello.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( is_network_only_plugin( 'hello.php' ) );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,7 +570,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::activate_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_activate_plugins_single_no_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $name = 'hello-dolly/hello.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = 'hello.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> activate_plugins( $name );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_plugin_active( $name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> deactivate_plugins( $name );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::activate_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_activate_plugins_single_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $name = 'hello-dolly/hello.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = 'hello.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> activate_plugins( array( $name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_plugin_active( $name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> deactivate_plugins( $name );
</span></span></pre></div>
<a id="trunktestsphpunittestsadminplugindependencieshasDependentsphp"></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/plugin-dependencies/hasDependents.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/plugin-dependencies/hasDependents.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/tests/phpunit/tests/admin/plugin-dependencies/hasDependents.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,6 +53,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_convert_hellophp_to_hello_dolly() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_property_value( 'dependency_slugs', array( 'hello-dolly' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( self::$instance::has_dependents( 'hello-dolly/hello.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( self::$instance::has_dependents( 'hello.php' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsadminplugindependenciesinitializephp"></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/plugin-dependencies/initialize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/plugin-dependencies/initialize.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/tests/phpunit/tests/admin/plugin-dependencies/initialize.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +281,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_slugs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $plugins as $plugin_file => &$headers ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create the expected slugs.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slug = str_replace( '.php', '', explode( '/', $plugin_file )[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'hello.php' === $plugin_file ) {
+ $slug = 'hello-dolly';
+ } else {
+ $slug = str_replace( '.php', '', explode( '/', $plugin_file )[0] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_slugs[ $plugin_file ] = $slug;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxwpAjaxUpdatePluginphp"></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/ajax/wpAjaxUpdatePlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/wpAjaxUpdatePlugin.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/tests/phpunit/tests/ajax/wpAjaxUpdatePlugin.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_setRole( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST['plugin'] = 'hello-dolly/hello.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST['plugin'] = 'hello.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['slug'] = 'hello-dolly';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent wp_update_plugins() from running.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'hello-dolly',
</span><span class="cx" style="display: block; padding: 0 10px"> 'oldVersion' => 'Version 1.7.2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'newVersion' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugin' => 'hello-dolly/hello.php',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugin' => 'hello.php',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pluginName' => 'Hello Dolly',
</span><span class="cx" style="display: block; padding: 0 10px"> 'debug' => array( 'The plugin is at the latest version.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'errorMessage' => 'The plugin is at the latest version.',
</span></span></pre></div>
<a id="trunktestsphpunittestsdependenciesscriptsphp"></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/dependencies/scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/scripts.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/tests/phpunit/tests/dependencies/scripts.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2994,7 +2994,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_enqueue_code_editor
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_enqueue_code_editor_when_php_file_will_be_passed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $real_file = WP_PLUGIN_DIR . '/hello-dolly/hello.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $real_file = WP_PLUGIN_DIR . '/hello.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_enqueue_code_editor = wp_enqueue_code_editor( array( 'file' => $real_file ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNonEmptyMultidimensionalArray( $wp_enqueue_code_editor );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitenetworkphp"></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/multisite/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/network.php 2025-10-21 04:20:53 UTC (rev 61005)
+++ trunk/tests/phpunit/tests/multisite/network.php 2025-10-21 04:31:04 UTC (rev 61006)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +273,7 @@
</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"> public function test_active_network_plugins() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = 'hello-dolly/hello.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = 'hello.php';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Local activate, should be invisible for the network.
</span><span class="cx" style="display: block; padding: 0 10px"> activate_plugin( $path ); // Enable the plugin for the current site.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Activate the plugin sitewide.
</span><span class="cx" style="display: block; padding: 0 10px"> activate_plugin( $path, '', true ); // Enable the plugin for all sites in the network.
</span><span class="cx" style="display: block; padding: 0 10px"> $active_plugins = wp_get_active_network_plugins();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( array( WP_PLUGIN_DIR . '/hello-dolly/hello.php' ), $active_plugins );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( WP_PLUGIN_DIR . '/hello.php' ), $active_plugins );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Deactivate the plugin.
</span><span class="cx" style="display: block; padding: 0 10px"> deactivate_plugins( $path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28651
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_duplicate_network_active_plugin() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = 'hello-dolly/hello.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = 'hello.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> $mock = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'activate_' . $path, array( $mock, 'action' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,13 +324,13 @@
</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"> public function test_is_plugin_active_for_network_true() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- activate_plugin( 'hello-dolly/hello.php', '', true );
- $this->assertTrue( is_plugin_active_for_network( 'hello-dolly/hello.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ activate_plugin( 'hello.php', '', true );
+ $this->assertTrue( is_plugin_active_for_network( 'hello.php' ) );
</ins><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"> public function test_is_plugin_active_for_network_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- deactivate_plugins( 'hello-dolly/hello.php', false, true );
- $this->assertFalse( is_plugin_active_for_network( 'hello-dolly/hello.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ deactivate_plugins( 'hello.php', false, true );
+ $this->assertFalse( is_plugin_active_for_network( 'hello.php' ) );
</ins><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"> public function helper_deactivate_hook() {
</span></span></pre>
</div>
</div>
</body>
</html>