From 17251ec2c1d7595b0153b28bc8ac997b05362d49 Mon Sep 17 00:00:00 2001
From: Joe McGill <joemcgill@gmail.com>
Date: Sat, 17 Mar 2018 20:27:40 +0000
Subject: [PATCH] Update Hello Dolly lyrics.

This updates the Hello Dolly plugin to remove lines which could be objectionable when shown in the admin out of context, and brings the lyrics more in line with Louis Armstrong's recording.

Props sebastienthivinfocom, birgire, audrasjb, joemcgill.
Fixes #43555.

Merges [42839] to the 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42840


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42670 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/plugins/hello.php | 23 +++++++++++------------
 wp-includes/version.php      |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/wp-content/plugins/hello.php b/wp-content/plugins/hello.php
index 2b1e07b59e..5db558fdb3 100644
--- a/wp-content/plugins/hello.php
+++ b/wp-content/plugins/hello.php
@@ -1,14 +1,14 @@
 <?php
 /**
  * @package Hello_Dolly
- * @version 1.6
+ * @version 1.7
  */
 /*
 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.6
+Version: 1.7
 Author URI: http://ma.tt/
 */
 
@@ -21,12 +21,11 @@ You're lookin' swell, Dolly
 I can tell, Dolly
 You're still glowin', you're still crowin'
 You're still goin' strong
-We feel the room swayin'
+I feel the room swayin'
 While the band's playin'
-One of your old favourite songs from way back when
+One of our old favorite songs from way back when
 So, take her wrap, fellas
-Find her an empty lap, fellas
-Dolly'll never go away again
+Dolly, never go away again 
 Hello, Dolly
 Well, hello, Dolly
 It's so nice to have you back where you belong
@@ -34,13 +33,13 @@ You're lookin' swell, Dolly
 I can tell, Dolly
 You're still glowin', you're still crowin'
 You're still goin' strong
-We feel the room swayin'
+I feel the room swayin'
 While the band's playin'
-One of your old favourite songs from way back when
-Golly, gee, fellas
-Find her a vacant knee, fellas
-Dolly'll never go away
-Dolly'll never go away
+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
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e2c7d95b60..73e44816a6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9.5-alpha-42838';
+$wp_version = '4.9.5-alpha-42840';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.