Ticket #43555: 43555.diff

src/wp-content/plugins/hello.php

@@ -15 +15 @@
 function hello_dolly_get_lyric() {
         /** These are the lyrics to Hello Dolly */
         $lyrics = "Hello, Dolly
-Well, hello, Dolly
+This is miss 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
-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 +34 @@
 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
-Dolly'll never go away again";
+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, never go away again";
 
         // Here we split it into lines
         $lyrics = explode( "\n", $lyrics );
 
+        // Ensure certain lines aren't shown out of context.
+        $unshown = array(
+                'So, take her wrap, fellas',
+                'Find her an empty lap, fellas',
+        );
+
+        $lyrics = array_diff( $lyrics, $unshown );
+
         // And then randomly choose a line
         return wptexturize( $lyrics[ mt_rand( 0, count( $lyrics ) - 1 ) ] );
 }