diff --git a/wp-content/uploads/2017/06/20170708_114903-1-150x150.jpg b/wp-content/uploads/2017/06/20170708_114903-1-150x150.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903-1-2000x1200.jpg b/wp-content/uploads/2017/06/20170708_114903-1-2000x1200.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903-1-300x225.jpg b/wp-content/uploads/2017/06/20170708_114903-1-300x225.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903-1-768x576.jpg b/wp-content/uploads/2017/06/20170708_114903-1-768x576.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903-1.jpg b/wp-content/uploads/2017/06/20170708_114903-1.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903-100x100.jpg b/wp-content/uploads/2017/06/20170708_114903-100x100.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903-1024x768.jpg b/wp-content/uploads/2017/06/20170708_114903-1024x768.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903-150x150.jpg b/wp-content/uploads/2017/06/20170708_114903-150x150.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903-2000x1200.jpg b/wp-content/uploads/2017/06/20170708_114903-2000x1200.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903-300x225.jpg b/wp-content/uploads/2017/06/20170708_114903-300x225.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903-768x576.jpg b/wp-content/uploads/2017/06/20170708_114903-768x576.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114903.jpg b/wp-content/uploads/2017/06/20170708_114903.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-1-100x100.jpg b/wp-content/uploads/2017/06/20170708_114922-1-100x100.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-1-1024x768.jpg b/wp-content/uploads/2017/06/20170708_114922-1-1024x768.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-1-150x150.jpg b/wp-content/uploads/2017/06/20170708_114922-1-150x150.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-1-2000x1200.jpg b/wp-content/uploads/2017/06/20170708_114922-1-2000x1200.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-1-300x225.jpg b/wp-content/uploads/2017/06/20170708_114922-1-300x225.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-1-768x576.jpg b/wp-content/uploads/2017/06/20170708_114922-1-768x576.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-1.jpg b/wp-content/uploads/2017/06/20170708_114922-1.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-100x100.jpg b/wp-content/uploads/2017/06/20170708_114922-100x100.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-1024x768.jpg b/wp-content/uploads/2017/06/20170708_114922-1024x768.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-150x150.jpg b/wp-content/uploads/2017/06/20170708_114922-150x150.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-2000x1200.jpg b/wp-content/uploads/2017/06/20170708_114922-2000x1200.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-300x225.jpg b/wp-content/uploads/2017/06/20170708_114922-300x225.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922-768x576.jpg b/wp-content/uploads/2017/06/20170708_114922-768x576.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114922.jpg b/wp-content/uploads/2017/06/20170708_114922.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1-100x100.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1-100x100.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1-150x150.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1-150x150.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1-2000x1200.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1-2000x1200.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1-225x300.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1-225x300.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1-768x1024.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1-768x1024.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-1.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-100x100.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-100x100.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-150x150.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-150x150.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-2000x1200.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-2000x1200.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-225x300.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-225x300.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522-768x1024.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522-768x1024.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114931-e1500560668522.jpg b/wp-content/uploads/2017/06/20170708_114931-e1500560668522.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1-100x100.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1-100x100.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1-150x150.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1-150x150.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1-2000x1200.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1-2000x1200.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1-225x300.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1-225x300.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1-768x1024.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1-768x1024.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-1.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-100x100.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-100x100.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-150x150.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-150x150.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-2000x1200.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-2000x1200.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-225x300.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-225x300.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397-768x1024.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397-768x1024.jpg
diff --git a/wp-content/uploads/2017/06/20170708_114939-e1500560620397.jpg b/wp-content/uploads/2017/06/20170708_114939-e1500560620397.jpg
diff --git a/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-1-100x100.jpg b/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-1-100x100.jpg
diff --git a/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-1-150x150.jpg b/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-1-150x150.jpg
diff --git a/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-1-300x294.jpg b/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-1-300x294.jpg
diff --git a/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-1.jpg b/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-1.jpg
diff --git a/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-100x100.jpg b/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-100x100.jpg
diff --git a/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-150x150.jpg b/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-150x150.jpg
diff --git a/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-300x294.jpg b/wp-content/uploads/2017/07/20170118-Joe-the-Quilter-300x294.jpg
diff --git a/wp-content/uploads/2017/07/20170118-Joe-the-Quilter.jpg b/wp-content/uploads/2017/07/20170118-Joe-the-Quilter.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1-100x100.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1-100x100.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1-1024x878.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1-1024x878.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1-150x150.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1-150x150.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1-300x257.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1-300x257.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1-768x658.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1-768x658.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-100x100.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-100x100.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1024x878.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-1024x878.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-150x150.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-150x150.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-300x257.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-300x257.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-768x658.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir-768x658.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-Reading-Memoir.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1-100x100.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1-100x100.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1-1024x878.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1-1024x878.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1-150x150.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1-150x150.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1-300x257.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1-300x257.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1-768x658.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1-768x658.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-100x100.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-100x100.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1024x878.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-1024x878.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-150x150.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-150x150.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-300x257.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-300x257.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-768x658.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide-768x658.jpg
diff --git a/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide.jpg b/wp-content/uploads/2017/07/20170720-Sue-Leonard-at-Meeting-w-Slide.jpg
diff --git a/wp-content/uploads/2017/09/20170118-Creative-Curves-100x100.jpg b/wp-content/uploads/2017/09/20170118-Creative-Curves-100x100.jpg
diff --git a/wp-content/uploads/2017/09/20170118-Creative-Curves-150x146.jpg b/wp-content/uploads/2017/09/20170118-Creative-Curves-150x146.jpg
diff --git a/wp-content/uploads/2017/09/20170118-Creative-Curves.jpg b/wp-content/uploads/2017/09/20170118-Creative-Curves.jpg
diff --git a/wp-content/uploads/2017/10/headerCrop-1024x315.png b/wp-content/uploads/2017/10/headerCrop-1024x315.png
diff --git a/wp-content/uploads/2017/10/headerCrop-1200x675.png b/wp-content/uploads/2017/10/headerCrop-1200x675.png
diff --git a/wp-content/uploads/2017/10/headerCrop-1280x1000.png b/wp-content/uploads/2017/10/headerCrop-1280x1000.png
diff --git a/wp-content/uploads/2017/10/headerCrop-1280x500.png b/wp-content/uploads/2017/10/headerCrop-1280x500.png
diff --git a/wp-content/uploads/2017/10/headerCrop-150x150.png b/wp-content/uploads/2017/10/headerCrop-150x150.png
diff --git a/wp-content/uploads/2017/10/headerCrop-150x46.png b/wp-content/uploads/2017/10/headerCrop-150x46.png
diff --git a/wp-content/uploads/2017/10/headerCrop-1630x860.png b/wp-content/uploads/2017/10/headerCrop-1630x860.png
diff --git a/wp-content/uploads/2017/10/headerCrop-1920x750.png b/wp-content/uploads/2017/10/headerCrop-1920x750.png
diff --git a/wp-content/uploads/2017/10/headerCrop-260x80.png b/wp-content/uploads/2017/10/headerCrop-260x80.png
diff --git a/wp-content/uploads/2017/10/headerCrop-300x92.png b/wp-content/uploads/2017/10/headerCrop-300x92.png
diff --git a/wp-content/uploads/2017/10/headerCrop-50x15.png b/wp-content/uploads/2017/10/headerCrop-50x15.png
diff --git a/wp-content/uploads/2017/10/headerCrop-768x1062.png b/wp-content/uploads/2017/10/headerCrop-768x1062.png
diff --git a/wp-content/uploads/2017/10/headerCrop-768x236.png b/wp-content/uploads/2017/10/headerCrop-768x236.png
diff --git a/wp-content/uploads/2017/10/headerCrop-80x80.png b/wp-content/uploads/2017/10/headerCrop-80x80.png
diff --git a/wp-content/uploads/2017/10/headerCrop-85x85.png b/wp-content/uploads/2017/10/headerCrop-85x85.png
diff --git a/wp-content/uploads/2017/10/headerCrop-960x720.png b/wp-content/uploads/2017/10/headerCrop-960x720.png
diff --git a/wp-content/uploads/2017/10/headerCrop.png b/wp-content/uploads/2017/10/headerCrop.png
diff --git a/wp-content/uploads/2017/10/logo-150x150.png b/wp-content/uploads/2017/10/logo-150x150.png
diff --git a/wp-content/uploads/2017/10/logo-150x75.png b/wp-content/uploads/2017/10/logo-150x75.png
diff --git a/wp-content/uploads/2017/10/logo-260x130.png b/wp-content/uploads/2017/10/logo-260x130.png
diff --git a/wp-content/uploads/2017/10/logo-300x150.png b/wp-content/uploads/2017/10/logo-300x150.png
diff --git a/wp-content/uploads/2017/10/logo-50x25.png b/wp-content/uploads/2017/10/logo-50x25.png
diff --git a/wp-content/uploads/2017/10/logo-768x384.png b/wp-content/uploads/2017/10/logo-768x384.png
diff --git a/wp-content/uploads/2017/10/logo-768x400.png b/wp-content/uploads/2017/10/logo-768x400.png
diff --git a/wp-content/uploads/2017/10/logo-80x80.png b/wp-content/uploads/2017/10/logo-80x80.png
diff --git a/wp-content/uploads/2017/10/logo-85x85.png b/wp-content/uploads/2017/10/logo-85x85.png
diff --git a/wp-content/uploads/2017/10/logo.png b/wp-content/uploads/2017/10/logo.png
diff --git a/wp-content/uploads/2017/10/quilt-716838-1024x681.jpg b/wp-content/uploads/2017/10/quilt-716838-1024x681.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-113x75.jpg b/wp-content/uploads/2017/10/quilt-716838-113x75.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-1200x675.jpg b/wp-content/uploads/2017/10/quilt-716838-1200x675.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-1280x1000.jpg b/wp-content/uploads/2017/10/quilt-716838-1280x1000.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-1280x500.jpg b/wp-content/uploads/2017/10/quilt-716838-1280x500.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-150x150.jpg b/wp-content/uploads/2017/10/quilt-716838-150x150.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-1630x860.jpg b/wp-content/uploads/2017/10/quilt-716838-1630x860.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-1920x750.jpg b/wp-content/uploads/2017/10/quilt-716838-1920x750.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-220x146.jpg b/wp-content/uploads/2017/10/quilt-716838-220x146.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-300x199.jpg b/wp-content/uploads/2017/10/quilt-716838-300x199.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-50x33.jpg b/wp-content/uploads/2017/10/quilt-716838-50x33.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-768x1200.jpg b/wp-content/uploads/2017/10/quilt-716838-768x1200.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-768x511.jpg b/wp-content/uploads/2017/10/quilt-716838-768x511.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-80x80.jpg b/wp-content/uploads/2017/10/quilt-716838-80x80.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-85x85.jpg b/wp-content/uploads/2017/10/quilt-716838-85x85.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838-960x720.jpg b/wp-content/uploads/2017/10/quilt-716838-960x720.jpg
diff --git a/wp-content/uploads/2017/10/quilt-716838.jpg b/wp-content/uploads/2017/10/quilt-716838.jpg
diff --git a/wp-cron.php b/wp-cron.php
@@ -1,129 +0,0 @@
-<?php
-/**
- * WordPress Cron Implementation for hosts, which do not offer CRON or for which
- * the user has not set up a CRON job pointing to this file.
- *
- * The HTTP request to this file will not slow down the visitor who happens to
- * visit when the cron job is needed to run.
- *
- * @package WordPress
- */
-
-ignore_user_abort(true);
-
-if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') )
-	die();
-
-/**
- * Tell WordPress we are doing the CRON task.
- *
- * @var bool
- */
-define('DOING_CRON', true);
-
-if ( !defined('ABSPATH') ) {
-	/** Set up WordPress environment */
-	require_once( dirname( __FILE__ ) . '/wp-load.php' );
-}
-
-/**
- * Retrieves the cron lock.
- *
- * Returns the uncached `doing_cron` transient.
- *
- * @ignore
- * @since 3.3.0
- *
- * @return string|false Value of the `doing_cron` transient, 0|false otherwise.
- */
-function _get_cron_lock() {
-	global $wpdb;
-
-	$value = 0;
-	if ( wp_using_ext_object_cache() ) {
-		/*
-		 * Skip local cache and force re-fetch of doing_cron transient
-		 * in case another process updated the cache.
-		 */
-		$value = wp_cache_get( 'doing_cron', 'transient', true );
-	} else {
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron' ) );
-		if ( is_object( $row ) )
-			$value = $row->option_value;
-	}
-
-	return $value;
-}
-
-if ( false === $crons = _get_cron_array() )
-	die();
-
-$keys = array_keys( $crons );
-$gmt_time = microtime( true );
-
-if ( isset($keys[0]) && $keys[0] > $gmt_time )
-	die();
-
-
-// The cron lock: a unix timestamp from when the cron was spawned.
-$doing_cron_transient = get_transient( 'doing_cron' );
-
-// Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock.
-if ( empty( $doing_wp_cron ) ) {
-	if ( empty( $_GET[ 'doing_wp_cron' ] ) ) {
-		// Called from external script/job. Try setting a lock.
-		if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) )
-			return;
-		$doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) );
-		set_transient( 'doing_cron', $doing_wp_cron );
-	} else {
-		$doing_wp_cron = $_GET[ 'doing_wp_cron' ];
-	}
-}
-
-/*
- * The cron lock (a unix timestamp set when the cron was spawned),
- * must match $doing_wp_cron (the "key").
- */
-if ( $doing_cron_transient != $doing_wp_cron )
-	return;
-
-foreach ( $crons as $timestamp => $cronhooks ) {
-	if ( $timestamp > $gmt_time )
-		break;
-
-	foreach ( $cronhooks as $hook => $keys ) {
-
-		foreach ( $keys as $k => $v ) {
-
-			$schedule = $v['schedule'];
-
-			if ( $schedule != false ) {
-				$new_args = array($timestamp, $schedule, $hook, $v['args']);
-				call_user_func_array('wp_reschedule_event', $new_args);
-			}
-
-			wp_unschedule_event( $timestamp, $hook, $v['args'] );
-
-			/**
-			 * Fires scheduled events.
-			 *
-			 * @ignore
-			 * @since 2.1.0
-			 *
-			 * @param string $hook Name of the hook that was scheduled to be fired.
-			 * @param array  $args The arguments to be passed to the hook.
-			 */
- 			do_action_ref_array( $hook, $v['args'] );
-
-			// If the hook ran too long and another cron process stole the lock, quit.
-			if ( _get_cron_lock() != $doing_wp_cron )
-				return;
-		}
-	}
-}
-
-if ( _get_cron_lock() == $doing_wp_cron )
-	delete_transient( 'doing_cron' );
-
-die();

diff --git a/wp-includes/ID3/getid3.lib.php b/wp-includes/ID3/getid3.lib.php
diff --git a/wp-includes/ID3/getid3.php b/wp-includes/ID3/getid3.php
diff --git a/wp-includes/ID3/license.commercial.txt b/wp-includes/ID3/license.commercial.txt
@@ -1,27 +0,0 @@
-                  getID3() Commercial License
-                  ===========================
-
-getID3() is licensed under the "GNU Public License" (GPL) and/or the
-"getID3() Commercial License" (gCL). This document describes the gCL.
-
----------------------------------------------------------------------
-
-The license is non-exclusively granted to a single person or company,
-per payment of the license fee, for the lifetime of that person or
-company. The license is non-transferrable.
-
-The gCL grants the licensee the right to use getID3() in commercial
-closed-source projects. Modifications may be made to getID3() with no
-obligation to release the modified source code. getID3() (or pieces
-thereof) may be included in any number of projects authored (in whole
-or in part) by the licensee.
-
-The licensee may use any version of getID3(), past, present or future,
-as is most convenient. This license does not entitle the licensee to
-receive any technical support, updates or bugfixes, except as such are
-made publicly available to all getID3() users.
-
-The licensee may not sub-license getID3() itself, meaning that any
-commercially released product containing all or parts of getID3() must
-have added functionality beyond what is available in getID3();
-getID3() itself may not be re-licensed by the licensee.

diff --git a/wp-includes/ID3/license.txt b/wp-includes/ID3/license.txt
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-//          also https://github.com/JamesHeinrich/getID3       //
-/////////////////////////////////////////////////////////////////
-
-*****************************************************************
-*****************************************************************
-
-   getID3() is released under multiple licenses. You may choose
-   from the following licenses, and use getID3 according to the
-   terms of the license most suitable to your project.
-
-GNU GPL: https://gnu.org/licenses/gpl.html                   (v3)
-         https://gnu.org/licenses/old-licenses/gpl-2.0.html  (v2)
-         https://gnu.org/licenses/old-licenses/gpl-1.0.html  (v1)
-
-GNU LGPL: https://gnu.org/licenses/lgpl.html                 (v3)
-
-Mozilla MPL: http://www.mozilla.org/MPL/2.0/                 (v2)
-
-getID3 Commercial License: http://getid3.org/#gCL (payment required)
-
-*****************************************************************
-*****************************************************************
-
-Copies of each of the above licenses are included in the 'licenses'
-directory of the getID3 distribution.

diff --git a/wp-includes/ID3/module.audio-video.asf.php b/wp-includes/ID3/module.audio-video.asf.php
diff --git a/wp-includes/ID3/module.audio-video.flv.php b/wp-includes/ID3/module.audio-video.flv.php
diff --git a/wp-includes/ID3/module.audio-video.matroska.php b/wp-includes/ID3/module.audio-video.matroska.php
diff --git a/wp-includes/ID3/module.audio-video.quicktime.php b/wp-includes/ID3/module.audio-video.quicktime.php
diff --git a/wp-includes/ID3/module.audio-video.riff.php b/wp-includes/ID3/module.audio-video.riff.php
diff --git a/wp-includes/ID3/module.audio.ac3.php b/wp-includes/ID3/module.audio.ac3.php
diff --git a/wp-includes/ID3/module.audio.dts.php b/wp-includes/ID3/module.audio.dts.php
@@ -1,291 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-//          also https://github.com/JamesHeinrich/getID3       //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.dts.php                                        //
-// module for analyzing DTS Audio files                        //
-// dependencies: NONE                                          //
-//                                                             //
-/////////////////////////////////////////////////////////////////
-
-
-/**
-* @tutorial http://wiki.multimedia.cx/index.php?title=DTS
-*/
-class getid3_dts extends getid3_handler
-{
-	/**
-	* Default DTS syncword used in native .cpt or .dts formats
-	*/
-    const syncword = "\x7F\xFE\x80\x01";
-
-	private $readBinDataOffset = 0;
-
-    /**
-    * Possible syncwords indicating bitstream encoding
-    */
-    public static $syncwords = array(
-    	0 => "\x7F\xFE\x80\x01",  // raw big-endian
-    	1 => "\xFE\x7F\x01\x80",  // raw little-endian
-    	2 => "\x1F\xFF\xE8\x00",  // 14-bit big-endian
-    	3 => "\xFF\x1F\x00\xE8"); // 14-bit little-endian
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-		$info['fileformat'] = 'dts';
-
-		$this->fseek($info['avdataoffset']);
-		$DTSheader = $this->fread(20); // we only need 2 words magic + 6 words frame header, but these words may be normal 16-bit words OR 14-bit words with 2 highest bits set to zero, so 8 words can be either 8*16/8 = 16 bytes OR 8*16*(16/14)/8 = 18.3 bytes
-
-		// check syncword
-		$sync = substr($DTSheader, 0, 4);
-        if (($encoding = array_search($sync, self::$syncwords)) !== false) {
-
-        	$info['dts']['raw']['magic'] = $sync;
-			$this->readBinDataOffset = 32;
-
-        } elseif ($this->isDependencyFor('matroska')) {
-
-			// Matroska contains DTS without syncword encoded as raw big-endian format
-			$encoding = 0;
-			$this->readBinDataOffset = 0;
-
-        } else {
-
-			unset($info['fileformat']);
-			return $this->error('Expecting "'.implode('| ', array_map('getid3_lib::PrintHexBytes', self::$syncwords)).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($sync).'"');
-
-		}
-
-		// decode header
-		$fhBS = '';
-		for ($word_offset = 0; $word_offset <= strlen($DTSheader); $word_offset += 2) {
-			switch ($encoding) {
-				case 0: // raw big-endian
-					$fhBS .=        getid3_lib::BigEndian2Bin(       substr($DTSheader, $word_offset, 2) );
-					break;
-				case 1: // raw little-endian
-					$fhBS .=        getid3_lib::BigEndian2Bin(strrev(substr($DTSheader, $word_offset, 2)));
-					break;
-				case 2: // 14-bit big-endian
-					$fhBS .= substr(getid3_lib::BigEndian2Bin(       substr($DTSheader, $word_offset, 2) ), 2, 14);
-					break;
-				case 3: // 14-bit little-endian
-					$fhBS .= substr(getid3_lib::BigEndian2Bin(strrev(substr($DTSheader, $word_offset, 2))), 2, 14);
-					break;
-			}
-		}
-
-		$info['dts']['raw']['frame_type']             =        $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['deficit_samples']        =        $this->readBinData($fhBS,  5);
-		$info['dts']['flags']['crc_present']          = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['pcm_sample_blocks']      =        $this->readBinData($fhBS,  7);
-		$info['dts']['raw']['frame_byte_size']        =        $this->readBinData($fhBS, 14);
-		$info['dts']['raw']['channel_arrangement']    =        $this->readBinData($fhBS,  6);
-		$info['dts']['raw']['sample_frequency']       =        $this->readBinData($fhBS,  4);
-		$info['dts']['raw']['bitrate']                =        $this->readBinData($fhBS,  5);
-		$info['dts']['flags']['embedded_downmix']     = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['dynamicrange']         = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['timestamp']            = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['auxdata']              = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['hdcd']                 = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['extension_audio']        =        $this->readBinData($fhBS,  3);
-		$info['dts']['flags']['extended_coding']      = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['audio_sync_insertion'] = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['lfe_effects']            =        $this->readBinData($fhBS,  2);
-		$info['dts']['flags']['predictor_history']    = (bool) $this->readBinData($fhBS,  1);
-		if ($info['dts']['flags']['crc_present']) {
-			$info['dts']['raw']['crc16']              =        $this->readBinData($fhBS, 16);
-		}
-		$info['dts']['flags']['mri_perfect_reconst']  = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['encoder_soft_version']   =        $this->readBinData($fhBS,  4);
-		$info['dts']['raw']['copy_history']           =        $this->readBinData($fhBS,  2);
-		$info['dts']['raw']['bits_per_sample']        =        $this->readBinData($fhBS,  2);
-		$info['dts']['flags']['surround_es']          = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['front_sum_diff']       = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['surround_sum_diff']    = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['dialog_normalization']   =        $this->readBinData($fhBS,  4);
-
-
-		$info['dts']['bitrate']              = self::bitrateLookup($info['dts']['raw']['bitrate']);
-		$info['dts']['bits_per_sample']      = self::bitPerSampleLookup($info['dts']['raw']['bits_per_sample']);
-		$info['dts']['sample_rate']          = self::sampleRateLookup($info['dts']['raw']['sample_frequency']);
-		$info['dts']['dialog_normalization'] = self::dialogNormalization($info['dts']['raw']['dialog_normalization'], $info['dts']['raw']['encoder_soft_version']);
-		$info['dts']['flags']['lossless']    = (($info['dts']['raw']['bitrate'] == 31) ? true  : false);
-		$info['dts']['bitrate_mode']         = (($info['dts']['raw']['bitrate'] == 30) ? 'vbr' : 'cbr');
-		$info['dts']['channels']             = self::numChannelsLookup($info['dts']['raw']['channel_arrangement']);
-		$info['dts']['channel_arrangement']  = self::channelArrangementLookup($info['dts']['raw']['channel_arrangement']);
-
-		$info['audio']['dataformat']          = 'dts';
-		$info['audio']['lossless']            = $info['dts']['flags']['lossless'];
-		$info['audio']['bitrate_mode']        = $info['dts']['bitrate_mode'];
-		$info['audio']['bits_per_sample']     = $info['dts']['bits_per_sample'];
-		$info['audio']['sample_rate']         = $info['dts']['sample_rate'];
-		$info['audio']['channels']            = $info['dts']['channels'];
-		$info['audio']['bitrate']             = $info['dts']['bitrate'];
-		if (isset($info['avdataend']) && !empty($info['dts']['bitrate']) && is_numeric($info['dts']['bitrate'])) {
-			$info['playtime_seconds']         = ($info['avdataend'] - $info['avdataoffset']) / ($info['dts']['bitrate'] / 8);
-			if (($encoding == 2) || ($encoding == 3)) {
-				// 14-bit data packed into 16-bit words, so the playtime is wrong because only (14/16) of the bytes in the data portion of the file are used at the specified bitrate
-				$info['playtime_seconds'] *= (14 / 16);
-			}
-		}
-		return true;
-	}
-
-	private function readBinData($bin, $length) {
-		$data = substr($bin, $this->readBinDataOffset, $length);
-		$this->readBinDataOffset += $length;
-
-		return bindec($data);
-	}
-
-	public static function bitrateLookup($index) {
-		static $lookup = array(
-			0  => 32000,
-			1  => 56000,
-			2  => 64000,
-			3  => 96000,
-			4  => 112000,
-			5  => 128000,
-			6  => 192000,
-			7  => 224000,
-			8  => 256000,
-			9  => 320000,
-			10 => 384000,
-			11 => 448000,
-			12 => 512000,
-			13 => 576000,
-			14 => 640000,
-			15 => 768000,
-			16 => 960000,
-			17 => 1024000,
-			18 => 1152000,
-			19 => 1280000,
-			20 => 1344000,
-			21 => 1408000,
-			22 => 1411200,
-			23 => 1472000,
-			24 => 1536000,
-			25 => 1920000,
-			26 => 2048000,
-			27 => 3072000,
-			28 => 3840000,
-			29 => 'open',
-			30 => 'variable',
-			31 => 'lossless',
-		);
-		return (isset($lookup[$index]) ? $lookup[$index] : false);
-	}
-
-	public static function sampleRateLookup($index) {
-		static $lookup = array(
-			0  => 'invalid',
-			1  => 8000,
-			2  => 16000,
-			3  => 32000,
-			4  => 'invalid',
-			5  => 'invalid',
-			6  => 11025,
-			7  => 22050,
-			8  => 44100,
-			9  => 'invalid',
-			10 => 'invalid',
-			11 => 12000,
-			12 => 24000,
-			13 => 48000,
-			14 => 'invalid',
-			15 => 'invalid',
-		);
-		return (isset($lookup[$index]) ? $lookup[$index] : false);
-	}
-
-	public static function bitPerSampleLookup($index) {
-		static $lookup = array(
-			0  => 16,
-			1  => 20,
-			2  => 24,
-			3  => 24,
-		);
-		return (isset($lookup[$index]) ? $lookup[$index] : false);
-	}
-
-	public static function numChannelsLookup($index) {
-		switch ($index) {
-			case 0:
-				return 1;
-				break;
-			case 1:
-			case 2:
-			case 3:
-			case 4:
-				return 2;
-				break;
-			case 5:
-			case 6:
-				return 3;
-				break;
-			case 7:
-			case 8:
-				return 4;
-				break;
-			case 9:
-				return 5;
-				break;
-			case 10:
-			case 11:
-			case 12:
-				return 6;
-				break;
-			case 13:
-				return 7;
-				break;
-			case 14:
-			case 15:
-				return 8;
-				break;
-		}
-		return false;
-	}
-
-	public static function channelArrangementLookup($index) {
-		static $lookup = array(
-			0  => 'A',
-			1  => 'A + B (dual mono)',
-			2  => 'L + R (stereo)',
-			3  => '(L+R) + (L-R) (sum-difference)',
-			4  => 'LT + RT (left and right total)',
-			5  => 'C + L + R',
-			6  => 'L + R + S',
-			7  => 'C + L + R + S',
-			8  => 'L + R + SL + SR',
-			9  => 'C + L + R + SL + SR',
-			10 => 'CL + CR + L + R + SL + SR',
-			11 => 'C + L + R+ LR + RR + OV',
-			12 => 'CF + CR + LF + RF + LR + RR',
-			13 => 'CL + C + CR + L + R + SL + SR',
-			14 => 'CL + CR + L + R + SL1 + SL2 + SR1 + SR2',
-			15 => 'CL + C+ CR + L + R + SL + S + SR',
-		);
-		return (isset($lookup[$index]) ? $lookup[$index] : 'user-defined');
-	}
-
-	public static function dialogNormalization($index, $version) {
-		switch ($version) {
-			case 7:
-				return 0 - $index;
-				break;
-			case 6:
-				return 0 - 16 - $index;
-				break;
-		}
-		return false;
-	}
-
-}

diff --git a/wp-includes/ID3/module.audio.flac.php b/wp-includes/ID3/module.audio.flac.php
diff --git a/wp-includes/ID3/module.audio.mp3.php b/wp-includes/ID3/module.audio.mp3.php
diff --git a/wp-includes/ID3/module.audio.ogg.php b/wp-includes/ID3/module.audio.ogg.php
diff --git a/wp-includes/ID3/module.tag.apetag.php b/wp-includes/ID3/module.tag.apetag.php
diff --git a/wp-includes/ID3/module.tag.id3v1.php b/wp-includes/ID3/module.tag.id3v1.php
@@ -1,360 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-//          also https://github.com/JamesHeinrich/getID3       //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.tag.id3v1.php                                        //
-// module for analyzing ID3v1 tags                             //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_id3v1 extends getid3_handler
-{
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
-			$info['warning'][] = 'Unable to check for ID3v1 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-			return false;
-		}
-
-		$this->fseek(-256, SEEK_END);
-		$preid3v1 = $this->fread(128);
-		$id3v1tag = $this->fread(128);
-
-		if (substr($id3v1tag, 0, 3) == 'TAG') {
-
-			$info['avdataend'] = $info['filesize'] - 128;
-
-			$ParsedID3v1['title']   = $this->cutfield(substr($id3v1tag,   3, 30));
-			$ParsedID3v1['artist']  = $this->cutfield(substr($id3v1tag,  33, 30));
-			$ParsedID3v1['album']   = $this->cutfield(substr($id3v1tag,  63, 30));
-			$ParsedID3v1['year']    = $this->cutfield(substr($id3v1tag,  93,  4));
-			$ParsedID3v1['comment'] =                 substr($id3v1tag,  97, 30);  // can't remove nulls yet, track detection depends on them
-			$ParsedID3v1['genreid'] =             ord(substr($id3v1tag, 127,  1));
-
-			// If second-last byte of comment field is null and last byte of comment field is non-null
-			// then this is ID3v1.1 and the comment field is 28 bytes long and the 30th byte is the track number
-			if (($id3v1tag{125} === "\x00") && ($id3v1tag{126} !== "\x00")) {
-				$ParsedID3v1['track']   = ord(substr($ParsedID3v1['comment'], 29,  1));
-				$ParsedID3v1['comment'] =     substr($ParsedID3v1['comment'],  0, 28);
-			}
-			$ParsedID3v1['comment'] = $this->cutfield($ParsedID3v1['comment']);
-
-			$ParsedID3v1['genre'] = $this->LookupGenreName($ParsedID3v1['genreid']);
-			if (!empty($ParsedID3v1['genre'])) {
-				unset($ParsedID3v1['genreid']);
-			}
-			if (isset($ParsedID3v1['genre']) && (empty($ParsedID3v1['genre']) || ($ParsedID3v1['genre'] == 'Unknown'))) {
-				unset($ParsedID3v1['genre']);
-			}
-
-			foreach ($ParsedID3v1 as $key => $value) {
-				$ParsedID3v1['comments'][$key][0] = $value;
-			}
-
-			// ID3v1 data is supposed to be padded with NULL characters, but some taggers pad with spaces
-			$GoodFormatID3v1tag = $this->GenerateID3v1Tag(
-											$ParsedID3v1['title'],
-											$ParsedID3v1['artist'],
-											$ParsedID3v1['album'],
-											$ParsedID3v1['year'],
-											(isset($ParsedID3v1['genre']) ? $this->LookupGenreID($ParsedID3v1['genre']) : false),
-											$ParsedID3v1['comment'],
-											(!empty($ParsedID3v1['track']) ? $ParsedID3v1['track'] : ''));
-			$ParsedID3v1['padding_valid'] = true;
-			if ($id3v1tag !== $GoodFormatID3v1tag) {
-				$ParsedID3v1['padding_valid'] = false;
-				$info['warning'][] = 'Some ID3v1 fields do not use NULL characters for padding';
-			}
-
-			$ParsedID3v1['tag_offset_end']   = $info['filesize'];
-			$ParsedID3v1['tag_offset_start'] = $ParsedID3v1['tag_offset_end'] - 128;
-
-			$info['id3v1'] = $ParsedID3v1;
-		}
-
-		if (substr($preid3v1, 0, 3) == 'TAG') {
-			// The way iTunes handles tags is, well, brain-damaged.
-			// It completely ignores v1 if ID3v2 is present.
-			// This goes as far as adding a new v1 tag *even if there already is one*
-
-			// A suspected double-ID3v1 tag has been detected, but it could be that
-			// the "TAG" identifier is a legitimate part of an APE or Lyrics3 tag
-			if (substr($preid3v1, 96, 8) == 'APETAGEX') {
-				// an APE tag footer was found before the last ID3v1, assume false "TAG" synch
-			} elseif (substr($preid3v1, 119, 6) == 'LYRICS') {
-				// a Lyrics3 tag footer was found before the last ID3v1, assume false "TAG" synch
-			} else {
-				// APE and Lyrics3 footers not found - assume double ID3v1
-				$info['warning'][] = 'Duplicate ID3v1 tag detected - this has been known to happen with iTunes';
-				$info['avdataend'] -= 128;
-			}
-		}
-
-		return true;
-	}
-
-	public static function cutfield($str) {
-		return trim(substr($str, 0, strcspn($str, "\x00")));
-	}
-
-	public static function ArrayOfGenres($allowSCMPXextended=false) {
-		static $GenreLookup = array(
-			0    => 'Blues',
-			1    => 'Classic Rock',
-			2    => 'Country',
-			3    => 'Dance',
-			4    => 'Disco',
-			5    => 'Funk',
-			6    => 'Grunge',
-			7    => 'Hip-Hop',
-			8    => 'Jazz',
-			9    => 'Metal',
-			10   => 'New Age',
-			11   => 'Oldies',
-			12   => 'Other',
-			13   => 'Pop',
-			14   => 'R&B',
-			15   => 'Rap',
-			16   => 'Reggae',
-			17   => 'Rock',
-			18   => 'Techno',
-			19   => 'Industrial',
-			20   => 'Alternative',
-			21   => 'Ska',
-			22   => 'Death Metal',
-			23   => 'Pranks',
-			24   => 'Soundtrack',
-			25   => 'Euro-Techno',
-			26   => 'Ambient',
-			27   => 'Trip-Hop',
-			28   => 'Vocal',
-			29   => 'Jazz+Funk',
-			30   => 'Fusion',
-			31   => 'Trance',
-			32   => 'Classical',
-			33   => 'Instrumental',
-			34   => 'Acid',
-			35   => 'House',
-			36   => 'Game',
-			37   => 'Sound Clip',
-			38   => 'Gospel',
-			39   => 'Noise',
-			40   => 'Alt. Rock',
-			41   => 'Bass',
-			42   => 'Soul',
-			43   => 'Punk',
-			44   => 'Space',
-			45   => 'Meditative',
-			46   => 'Instrumental Pop',
-			47   => 'Instrumental Rock',
-			48   => 'Ethnic',
-			49   => 'Gothic',
-			50   => 'Darkwave',
-			51   => 'Techno-Industrial',
-			52   => 'Electronic',
-			53   => 'Pop-Folk',
-			54   => 'Eurodance',
-			55   => 'Dream',
-			56   => 'Southern Rock',
-			57   => 'Comedy',
-			58   => 'Cult',
-			59   => 'Gangsta Rap',
-			60   => 'Top 40',
-			61   => 'Christian Rap',
-			62   => 'Pop/Funk',
-			63   => 'Jungle',
-			64   => 'Native American',
-			65   => 'Cabaret',
-			66   => 'New Wave',
-			67   => 'Psychedelic',
-			68   => 'Rave',
-			69   => 'Showtunes',
-			70   => 'Trailer',
-			71   => 'Lo-Fi',
-			72   => 'Tribal',
-			73   => 'Acid Punk',
-			74   => 'Acid Jazz',
-			75   => 'Polka',
-			76   => 'Retro',
-			77   => 'Musical',
-			78   => 'Rock & Roll',
-			79   => 'Hard Rock',
-			80   => 'Folk',
-			81   => 'Folk/Rock',
-			82   => 'National Folk',
-			83   => 'Swing',
-			84   => 'Fast-Fusion',
-			85   => 'Bebob',
-			86   => 'Latin',
-			87   => 'Revival',
-			88   => 'Celtic',
-			89   => 'Bluegrass',
-			90   => 'Avantgarde',
-			91   => 'Gothic Rock',
-			92   => 'Progressive Rock',
-			93   => 'Psychedelic Rock',
-			94   => 'Symphonic Rock',
-			95   => 'Slow Rock',
-			96   => 'Big Band',
-			97   => 'Chorus',
-			98   => 'Easy Listening',
-			99   => 'Acoustic',
-			100  => 'Humour',
-			101  => 'Speech',
-			102  => 'Chanson',
-			103  => 'Opera',
-			104  => 'Chamber Music',
-			105  => 'Sonata',
-			106  => 'Symphony',
-			107  => 'Booty Bass',
-			108  => 'Primus',
-			109  => 'Porn Groove',
-			110  => 'Satire',
-			111  => 'Slow Jam',
-			112  => 'Club',
-			113  => 'Tango',
-			114  => 'Samba',
-			115  => 'Folklore',
-			116  => 'Ballad',
-			117  => 'Power Ballad',
-			118  => 'Rhythmic Soul',
-			119  => 'Freestyle',
-			120  => 'Duet',
-			121  => 'Punk Rock',
-			122  => 'Drum Solo',
-			123  => 'A Cappella',
-			124  => 'Euro-House',
-			125  => 'Dance Hall',
-			126  => 'Goa',
-			127  => 'Drum & Bass',
-			128  => 'Club-House',
-			129  => 'Hardcore',
-			130  => 'Terror',
-			131  => 'Indie',
-			132  => 'BritPop',
-			133  => 'Negerpunk',
-			134  => 'Polsk Punk',
-			135  => 'Beat',
-			136  => 'Christian Gangsta Rap',
-			137  => 'Heavy Metal',
-			138  => 'Black Metal',
-			139  => 'Crossover',
-			140  => 'Contemporary Christian',
-			141  => 'Christian Rock',
-			142  => 'Merengue',
-			143  => 'Salsa',
-			144  => 'Thrash Metal',
-			145  => 'Anime',
-			146  => 'JPop',
-			147  => 'Synthpop',
-
-			255  => 'Unknown',
-
-			'CR' => 'Cover',
-			'RX' => 'Remix'
-		);
-
-		static $GenreLookupSCMPX = array();
-		if ($allowSCMPXextended && empty($GenreLookupSCMPX)) {
-			$GenreLookupSCMPX = $GenreLookup;
-			// http://www.geocities.co.jp/SiliconValley-Oakland/3664/alittle.html#GenreExtended
-			// Extended ID3v1 genres invented by SCMPX
-			// Note that 255 "Japanese Anime" conflicts with standard "Unknown"
-			$GenreLookupSCMPX[240] = 'Sacred';
-			$GenreLookupSCMPX[241] = 'Northern Europe';
-			$GenreLookupSCMPX[242] = 'Irish & Scottish';
-			$GenreLookupSCMPX[243] = 'Scotland';
-			$GenreLookupSCMPX[244] = 'Ethnic Europe';
-			$GenreLookupSCMPX[245] = 'Enka';
-			$GenreLookupSCMPX[246] = 'Children\'s Song';
-			$GenreLookupSCMPX[247] = 'Japanese Sky';
-			$GenreLookupSCMPX[248] = 'Japanese Heavy Rock';
-			$GenreLookupSCMPX[249] = 'Japanese Doom Rock';
-			$GenreLookupSCMPX[250] = 'Japanese J-POP';
-			$GenreLookupSCMPX[251] = 'Japanese Seiyu';
-			$GenreLookupSCMPX[252] = 'Japanese Ambient Techno';
-			$GenreLookupSCMPX[253] = 'Japanese Moemoe';
-			$GenreLookupSCMPX[254] = 'Japanese Tokusatsu';
-			//$GenreLookupSCMPX[255] = 'Japanese Anime';
-		}
-
-		return ($allowSCMPXextended ? $GenreLookupSCMPX : $GenreLookup);
-	}
-
-	public static function LookupGenreName($genreid, $allowSCMPXextended=true) {
-		switch ($genreid) {
-			case 'RX':
-			case 'CR':
-				break;
-			default:
-				if (!is_numeric($genreid)) {
-					return false;
-				}
-				$genreid = intval($genreid); // to handle 3 or '3' or '03'
-				break;
-		}
-		$GenreLookup = self::ArrayOfGenres($allowSCMPXextended);
-		return (isset($GenreLookup[$genreid]) ? $GenreLookup[$genreid] : false);
-	}
-
-	public static function LookupGenreID($genre, $allowSCMPXextended=false) {
-		$GenreLookup = self::ArrayOfGenres($allowSCMPXextended);
-		$LowerCaseNoSpaceSearchTerm = strtolower(str_replace(' ', '', $genre));
-		foreach ($GenreLookup as $key => $value) {
-			if (strtolower(str_replace(' ', '', $value)) == $LowerCaseNoSpaceSearchTerm) {
-				return $key;
-			}
-		}
-		return false;
-	}
-
-	public static function StandardiseID3v1GenreName($OriginalGenre) {
-		if (($GenreID = self::LookupGenreID($OriginalGenre)) !== false) {
-			return self::LookupGenreName($GenreID);
-		}
-		return $OriginalGenre;
-	}
-
-	public static function GenerateID3v1Tag($title, $artist, $album, $year, $genreid, $comment, $track='') {
-		$ID3v1Tag  = 'TAG';
-		$ID3v1Tag .= str_pad(trim(substr($title,  0, 30)), 30, "\x00", STR_PAD_RIGHT);
-		$ID3v1Tag .= str_pad(trim(substr($artist, 0, 30)), 30, "\x00", STR_PAD_RIGHT);
-		$ID3v1Tag .= str_pad(trim(substr($album,  0, 30)), 30, "\x00", STR_PAD_RIGHT);
-		$ID3v1Tag .= str_pad(trim(substr($year,   0,  4)),  4, "\x00", STR_PAD_LEFT);
-		if (!empty($track) && ($track > 0) && ($track <= 255)) {
-			$ID3v1Tag .= str_pad(trim(substr($comment, 0, 28)), 28, "\x00", STR_PAD_RIGHT);
-			$ID3v1Tag .= "\x00";
-			if (gettype($track) == 'string') {
-				$track = (int) $track;
-			}
-			$ID3v1Tag .= chr($track);
-		} else {
-			$ID3v1Tag .= str_pad(trim(substr($comment, 0, 30)), 30, "\x00", STR_PAD_RIGHT);
-		}
-		if (($genreid < 0) || ($genreid > 147)) {
-			$genreid = 255; // 'unknown' genre
-		}
-		switch (gettype($genreid)) {
-			case 'string':
-			case 'integer':
-				$ID3v1Tag .= chr(intval($genreid));
-				break;
-			default:
-				$ID3v1Tag .= chr(255); // 'unknown' genre
-				break;
-		}
-
-		return $ID3v1Tag;
-	}
-
-}

diff --git a/wp-includes/ID3/module.tag.id3v2.php b/wp-includes/ID3/module.tag.id3v2.php
diff --git a/wp-includes/ID3/module.tag.lyrics3.php b/wp-includes/ID3/module.tag.lyrics3.php
@@ -1,298 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-//          also https://github.com/JamesHeinrich/getID3       //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-///                                                            //
-// module.tag.lyrics3.php                                      //
-// module for analyzing Lyrics3 tags                           //
-// dependencies: module.tag.apetag.php (optional)              //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_lyrics3 extends getid3_handler
-{
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-
-		// http://www.volweb.cz/str/tags.htm
-
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
-			$info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-			return false;
-		}
-
-		$this->fseek((0 - 128 - 9 - 6), SEEK_END);          // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
-		$lyrics3_id3v1 = $this->fread(128 + 9 + 6);
-		$lyrics3lsz    = substr($lyrics3_id3v1,  0,   6); // Lyrics3size
-		$lyrics3end    = substr($lyrics3_id3v1,  6,   9); // LYRICSEND or LYRICS200
-		$id3v1tag      = substr($lyrics3_id3v1, 15, 128); // ID3v1
-
-		if ($lyrics3end == 'LYRICSEND') {
-			// Lyrics3v1, ID3v1, no APE
-
-			$lyrics3size    = 5100;
-			$lyrics3offset  = $info['filesize'] - 128 - $lyrics3size;
-			$lyrics3version = 1;
-
-		} elseif ($lyrics3end == 'LYRICS200') {
-			// Lyrics3v2, ID3v1, no APE
-
-			// LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
-			$lyrics3size    = $lyrics3lsz + 6 + strlen('LYRICS200');
-			$lyrics3offset  = $info['filesize'] - 128 - $lyrics3size;
-			$lyrics3version = 2;
-
-		} elseif (substr(strrev($lyrics3_id3v1), 0, 9) == strrev('LYRICSEND')) {
-			// Lyrics3v1, no ID3v1, no APE
-
-			$lyrics3size    = 5100;
-			$lyrics3offset  = $info['filesize'] - $lyrics3size;
-			$lyrics3version = 1;
-			$lyrics3offset  = $info['filesize'] - $lyrics3size;
-
-		} elseif (substr(strrev($lyrics3_id3v1), 0, 9) == strrev('LYRICS200')) {
-
-			// Lyrics3v2, no ID3v1, no APE
-
-			$lyrics3size    = strrev(substr(strrev($lyrics3_id3v1), 9, 6)) + 6 + strlen('LYRICS200'); // LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
-			$lyrics3offset  = $info['filesize'] - $lyrics3size;
-			$lyrics3version = 2;
-
-		} else {
-
-			if (isset($info['ape']['tag_offset_start']) && ($info['ape']['tag_offset_start'] > 15)) {
-
-				$this->fseek($info['ape']['tag_offset_start'] - 15);
-				$lyrics3lsz = $this->fread(6);
-				$lyrics3end = $this->fread(9);
-
-				if ($lyrics3end == 'LYRICSEND') {
-					// Lyrics3v1, APE, maybe ID3v1
-
-					$lyrics3size    = 5100;
-					$lyrics3offset  = $info['ape']['tag_offset_start'] - $lyrics3size;
-					$info['avdataend'] = $lyrics3offset;
-					$lyrics3version = 1;
-					$info['warning'][] = 'APE tag located after Lyrics3, will probably break Lyrics3 compatability';
-
-				} elseif ($lyrics3end == 'LYRICS200') {
-					// Lyrics3v2, APE, maybe ID3v1
-
-					$lyrics3size    = $lyrics3lsz + 6 + strlen('LYRICS200'); // LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
-					$lyrics3offset  = $info['ape']['tag_offset_start'] - $lyrics3size;
-					$lyrics3version = 2;
-					$info['warning'][] = 'APE tag located after Lyrics3, will probably break Lyrics3 compatability';
-
-				}
-
-			}
-
-		}
-
-		if (isset($lyrics3offset)) {
-			$info['avdataend'] = $lyrics3offset;
-			$this->getLyrics3Data($lyrics3offset, $lyrics3version, $lyrics3size);
-
-			if (!isset($info['ape'])) {
-				if (isset($info['lyrics3']['tag_offset_start'])) {
-					$GETID3_ERRORARRAY = &$info['warning'];
-					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
-					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename);
-					$getid3_apetag = new getid3_apetag($getid3_temp);
-					$getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
-					$getid3_apetag->Analyze();
-					if (!empty($getid3_temp->info['ape'])) {
-						$info['ape'] = $getid3_temp->info['ape'];
-					}
-					if (!empty($getid3_temp->info['replay_gain'])) {
-						$info['replay_gain'] = $getid3_temp->info['replay_gain'];
-					}
-					unset($getid3_temp, $getid3_apetag);
-				} else {
-					$info['warning'][] = 'Lyrics3 and APE tags appear to have become entangled (most likely due to updating the APE tags with a non-Lyrics3-aware tagger)';
-				}
-			}
-
-		}
-
-		return true;
-	}
-
-	public function getLyrics3Data($endoffset, $version, $length) {
-		// http://www.volweb.cz/str/tags.htm
-
-		$info = &$this->getid3->info;
-
-		if (!getid3_lib::intValueSupported($endoffset)) {
-			$info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-			return false;
-		}
-
-		$this->fseek($endoffset);
-		if ($length <= 0) {
-			return false;
-		}
-		$rawdata = $this->fread($length);
-
-		$ParsedLyrics3['raw']['lyrics3version'] = $version;
-		$ParsedLyrics3['raw']['lyrics3tagsize'] = $length;
-		$ParsedLyrics3['tag_offset_start']      = $endoffset;
-		$ParsedLyrics3['tag_offset_end']        = $endoffset + $length - 1;
-
-		if (substr($rawdata, 0, 11) != 'LYRICSBEGIN') {
-			if (strpos($rawdata, 'LYRICSBEGIN') !== false) {
-
-				$info['warning'][] = '"LYRICSBEGIN" expected at '.$endoffset.' but actually found at '.($endoffset + strpos($rawdata, 'LYRICSBEGIN')).' - this is invalid for Lyrics3 v'.$version;
-				$info['avdataend'] = $endoffset + strpos($rawdata, 'LYRICSBEGIN');
-				$rawdata = substr($rawdata, strpos($rawdata, 'LYRICSBEGIN'));
-				$length = strlen($rawdata);
-				$ParsedLyrics3['tag_offset_start'] = $info['avdataend'];
-				$ParsedLyrics3['raw']['lyrics3tagsize'] = $length;
-
-			} else {
-
-				$info['error'][] = '"LYRICSBEGIN" expected at '.$endoffset.' but found "'.substr($rawdata, 0, 11).'" instead';
-				return false;
-
-			}
-
-		}
-
-		switch ($version) {
-
-			case 1:
-				if (substr($rawdata, strlen($rawdata) - 9, 9) == 'LYRICSEND') {
-					$ParsedLyrics3['raw']['LYR'] = trim(substr($rawdata, 11, strlen($rawdata) - 11 - 9));
-					$this->Lyrics3LyricsTimestampParse($ParsedLyrics3);
-				} else {
-					$info['error'][] = '"LYRICSEND" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead';
-					return false;
-				}
-				break;
-
-			case 2:
-				if (substr($rawdata, strlen($rawdata) - 9, 9) == 'LYRICS200') {
-					$ParsedLyrics3['raw']['unparsed'] = substr($rawdata, 11, strlen($rawdata) - 11 - 9 - 6); // LYRICSBEGIN + LYRICS200 + LSZ
-					$rawdata = $ParsedLyrics3['raw']['unparsed'];
-					while (strlen($rawdata) > 0) {
-						$fieldname = substr($rawdata, 0, 3);
-						$fieldsize = (int) substr($rawdata, 3, 5);
-						$ParsedLyrics3['raw'][$fieldname] = substr($rawdata, 8, $fieldsize);
-						$rawdata = substr($rawdata, 3 + 5 + $fieldsize);
-					}
-
-					if (isset($ParsedLyrics3['raw']['IND'])) {
-						$i = 0;
-						$flagnames = array('lyrics', 'timestamps', 'inhibitrandom');
-						foreach ($flagnames as $flagname) {
-							if (strlen($ParsedLyrics3['raw']['IND']) > $i++) {
-								$ParsedLyrics3['flags'][$flagname] = $this->IntString2Bool(substr($ParsedLyrics3['raw']['IND'], $i, 1 - 1));
-							}
-						}
-					}
-
-					$fieldnametranslation = array('ETT'=>'title', 'EAR'=>'artist', 'EAL'=>'album', 'INF'=>'comment', 'AUT'=>'author');
-					foreach ($fieldnametranslation as $key => $value) {
-						if (isset($ParsedLyrics3['raw'][$key])) {
-							$ParsedLyrics3['comments'][$value][] = trim($ParsedLyrics3['raw'][$key]);
-						}
-					}
-
-					if (isset($ParsedLyrics3['raw']['IMG'])) {
-						$imagestrings = explode("\r\n", $ParsedLyrics3['raw']['IMG']);
-						foreach ($imagestrings as $key => $imagestring) {
-							if (strpos($imagestring, '||') !== false) {
-								$imagearray = explode('||', $imagestring);
-								$ParsedLyrics3['images'][$key]['filename']     =                                (isset($imagearray[0]) ? $imagearray[0] : '');
-								$ParsedLyrics3['images'][$key]['description']  =                                (isset($imagearray[1]) ? $imagearray[1] : '');
-								$ParsedLyrics3['images'][$key]['timestamp']    = $this->Lyrics3Timestamp2Seconds(isset($imagearray[2]) ? $imagearray[2] : '');
-							}
-						}
-					}
-					if (isset($ParsedLyrics3['raw']['LYR'])) {
-						$this->Lyrics3LyricsTimestampParse($ParsedLyrics3);
-					}
-				} else {
-					$info['error'][] = '"LYRICS200" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead';
-					return false;
-				}
-				break;
-
-			default:
-				$info['error'][] = 'Cannot process Lyrics3 version '.$version.' (only v1 and v2)';
-				return false;
-				break;
-		}
-
-
-		if (isset($info['id3v1']['tag_offset_start']) && ($info['id3v1']['tag_offset_start'] <= $ParsedLyrics3['tag_offset_end'])) {
-			$info['warning'][] = 'ID3v1 tag information ignored since it appears to be a false synch in Lyrics3 tag data';
-			unset($info['id3v1']);
-			foreach ($info['warning'] as $key => $value) {
-				if ($value == 'Some ID3v1 fields do not use NULL characters for padding') {
-					unset($info['warning'][$key]);
-					sort($info['warning']);
-					break;
-				}
-			}
-		}
-
-		$info['lyrics3'] = $ParsedLyrics3;
-
-		return true;
-	}
-
-	public function Lyrics3Timestamp2Seconds($rawtimestamp) {
-		if (preg_match('#^\\[([0-9]{2}):([0-9]{2})\\]$#', $rawtimestamp, $regs)) {
-			return (int) (($regs[1] * 60) + $regs[2]);
-		}
-		return false;
-	}
-
-	public function Lyrics3LyricsTimestampParse(&$Lyrics3data) {
-		$lyricsarray = explode("\r\n", $Lyrics3data['raw']['LYR']);
-		foreach ($lyricsarray as $key => $lyricline) {
-			$regs = array();
-			unset($thislinetimestamps);
-			while (preg_match('#^(\\[[0-9]{2}:[0-9]{2}\\])#', $lyricline, $regs)) {
-				$thislinetimestamps[] = $this->Lyrics3Timestamp2Seconds($regs[0]);
-				$lyricline = str_replace($regs[0], '', $lyricline);
-			}
-			$notimestamplyricsarray[$key] = $lyricline;
-			if (isset($thislinetimestamps) && is_array($thislinetimestamps)) {
-				sort($thislinetimestamps);
-				foreach ($thislinetimestamps as $timestampkey => $timestamp) {
-					if (isset($Lyrics3data['synchedlyrics'][$timestamp])) {
-						// timestamps only have a 1-second resolution, it's possible that multiple lines
-						// could have the same timestamp, if so, append
-						$Lyrics3data['synchedlyrics'][$timestamp] .= "\r\n".$lyricline;
-					} else {
-						$Lyrics3data['synchedlyrics'][$timestamp] = $lyricline;
-					}
-				}
-			}
-		}
-		$Lyrics3data['unsynchedlyrics'] = implode("\r\n", $notimestamplyricsarray);
-		if (isset($Lyrics3data['synchedlyrics']) && is_array($Lyrics3data['synchedlyrics'])) {
-			ksort($Lyrics3data['synchedlyrics']);
-		}
-		return true;
-	}
-
-	public function IntString2Bool($char) {
-		if ($char == '1') {
-			return true;
-		} elseif ($char == '0') {
-			return false;
-		}
-		return null;
-	}
-}

diff --git a/wp-includes/ID3/readme.txt b/wp-includes/ID3/readme.txt
diff --git a/wp-includes/IXR/class-IXR-base64.php b/wp-includes/IXR/class-IXR-base64.php
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * IXR_Base64
- *
- * @package IXR
- * @since 1.5.0
- */
-class IXR_Base64
-{
-    var $data;
-
-	/**
-	 * PHP5 constructor.
-	 */
-    function __construct( $data )
-    {
-        $this->data = $data;
-    }
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function IXR_Base64( $data ) {
-		self::__construct( $data );
-	}
-
-    function getXml()
-    {
-        return '<base64>'.base64_encode($this->data).'</base64>';
-    }
-}

diff --git a/wp-includes/IXR/class-IXR-client.php b/wp-includes/IXR/class-IXR-client.php
@@ -1,166 +0,0 @@
-<?php
-
-/**
- * IXR_Client
- *
- * @package IXR
- * @since 1.5.0
- *
- */
-class IXR_Client
-{
-    var $server;
-    var $port;
-    var $path;
-    var $useragent;
-    var $response;
-    var $message = false;
-    var $debug = false;
-    var $timeout;
-    var $headers = array();
-
-    // Storage place for an error message
-    var $error = false;
-
-	/**
-	 * PHP5 constructor.
-	 */
-    function __construct( $server, $path = false, $port = 80, $timeout = 15 )
-    {
-        if (!$path) {
-            // Assume we have been given a URL instead
-            $bits = parse_url($server);
-            $this->server = $bits['host'];
-            $this->port = isset($bits['port']) ? $bits['port'] : 80;
-            $this->path = isset($bits['path']) ? $bits['path'] : '/';
-
-            // Make absolutely sure we have a path
-            if (!$this->path) {
-                $this->path = '/';
-            }
-
-            if ( ! empty( $bits['query'] ) ) {
-                $this->path .= '?' . $bits['query'];
-            }
-        } else {
-            $this->server = $server;
-            $this->path = $path;
-            $this->port = $port;
-        }
-        $this->useragent = 'The Incutio XML-RPC PHP Library';
-        $this->timeout = $timeout;
-    }
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function IXR_Client( $server, $path = false, $port = 80, $timeout = 15 ) {
-		self::__construct( $server, $path, $port, $timeout );
-	}
-
-    function query()
-    {
-        $args = func_get_args();
-        $method = array_shift($args);
-        $request = new IXR_Request($method, $args);
-        $length = $request->getLength();
-        $xml = $request->getXml();
-        $r = "\r\n";
-        $request  = "POST {$this->path} HTTP/1.0$r";
-
-        // Merged from WP #8145 - allow custom headers
-        $this->headers['Host']          = $this->server;
-        $this->headers['Content-Type']  = 'text/xml';
-        $this->headers['User-Agent']    = $this->useragent;
-        $this->headers['Content-Length']= $length;
-
-        foreach( $this->headers as $header => $value ) {
-            $request .= "{$header}: {$value}{$r}";
-        }
-        $request .= $r;
-
-        $request .= $xml;
-
-        // Now send the request
-        if ($this->debug) {
-            echo '<pre class="ixr_request">'.htmlspecialchars($request)."\n</pre>\n\n";
-        }
-
-        if ($this->timeout) {
-            $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
-        } else {
-            $fp = @fsockopen($this->server, $this->port, $errno, $errstr);
-        }
-        if (!$fp) {
-            $this->error = new IXR_Error(-32300, 'transport error - could not open socket');
-            return false;
-        }
-        fputs($fp, $request);
-        $contents = '';
-        $debugContents = '';
-        $gotFirstLine = false;
-        $gettingHeaders = true;
-        while (!feof($fp)) {
-            $line = fgets($fp, 4096);
-            if (!$gotFirstLine) {
-                // Check line for '200'
-                if (strstr($line, '200') === false) {
-                    $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
-                    return false;
-                }
-                $gotFirstLine = true;
-            }
-            if (trim($line) == '') {
-                $gettingHeaders = false;
-            }
-            if (!$gettingHeaders) {
-            	// merged from WP #12559 - remove trim
-                $contents .= $line;
-            }
-            if ($this->debug) {
-            	$debugContents .= $line;
-            }
-        }
-        if ($this->debug) {
-            echo '<pre class="ixr_response">'.htmlspecialchars($debugContents)."\n</pre>\n\n";
-        }
-
-        // Now parse what we've got back
-        $this->message = new IXR_Message($contents);
-        if (!$this->message->parse()) {
-            // XML error
-            $this->error = new IXR_Error(-32700, 'parse error. not well formed');
-            return false;
-        }
-
-        // Is the message a fault?
-        if ($this->message->messageType == 'fault') {
-            $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
-            return false;
-        }
-
-        // Message must be OK
-        return true;
-    }
-
-    function getResponse()
-    {
-        // methodResponses can only have one param - return that
-        return $this->message->params[0];
-    }
-
-    function isError()
-    {
-        return (is_object($this->error));
-    }
-
-    function getErrorCode()
-    {
-        return $this->error->code;
-    }
-
-    function getErrorMessage()
-    {
-        return $this->error->message;
-    }
-}

diff --git a/wp-includes/IXR/class-IXR-clientmulticall.php b/wp-includes/IXR/class-IXR-clientmulticall.php
@@ -1,44 +0,0 @@
-<?php
-/**
- * IXR_ClientMulticall
- *
- * @package IXR
- * @since 1.5.0
- */
-class IXR_ClientMulticall extends IXR_Client
-{
-    var $calls = array();
-
-	/**
-	 * PHP5 constructor.
-	 */
-    function __construct( $server, $path = false, $port = 80 )
-    {
-        parent::IXR_Client($server, $path, $port);
-        $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
-    }
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function IXR_ClientMulticall( $server, $path = false, $port = 80 ) {
-		self::__construct( $server, $path, $port );
-	}
-
-    function addCall()
-    {
-        $args = func_get_args();
-        $methodName = array_shift($args);
-        $struct = array(
-            'methodName' => $methodName,
-            'params' => $args
-        );
-        $this->calls[] = $struct;
-    }
-
-    function query()
-    {
-        // Prepare multicall, then call the parent::query() method
-        return parent::query('system.multicall', $this->calls);
-    }
-}

diff --git a/wp-includes/IXR/class-IXR-date.php b/wp-includes/IXR/class-IXR-date.php
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * IXR_Date
- *
- * @package IXR
- * @since 1.5.0
- */
-class IXR_Date {
-    var $year;
-    var $month;
-    var $day;
-    var $hour;
-    var $minute;
-    var $second;
-    var $timezone;
-
-	/**
-	 * PHP5 constructor.
-	 */
-    function __construct( $time )
-    {
-        // $time can be a PHP timestamp or an ISO one
-        if (is_numeric($time)) {
-            $this->parseTimestamp($time);
-        } else {
-            $this->parseIso($time);
-        }
-    }
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function IXR_Date( $time ) {
-		self::__construct( $time );
-	}
-
-    function parseTimestamp($timestamp)
-    {
-        $this->year = date('Y', $timestamp);
-        $this->month = date('m', $timestamp);
-        $this->day = date('d', $timestamp);
-        $this->hour = date('H', $timestamp);
-        $this->minute = date('i', $timestamp);
-        $this->second = date('s', $timestamp);
-        $this->timezone = '';
-    }
-
-    function parseIso($iso)
-    {
-        $this->year = substr($iso, 0, 4);
-        $this->month = substr($iso, 4, 2);
-        $this->day = substr($iso, 6, 2);
-        $this->hour = substr($iso, 9, 2);
-        $this->minute = substr($iso, 12, 2);
-        $this->second = substr($iso, 15, 2);
-        $this->timezone = substr($iso, 17);
-    }
-
-    function getIso()
-    {
-        return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
-    }
-
-    function getXml()
-    {
-        return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
-    }
-
-    function getTimestamp()
-    {
-        return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
-    }
-}

diff --git a/wp-includes/IXR/class-IXR-error.php b/wp-includes/IXR/class-IXR-error.php
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * IXR_Error
- *
- * @package IXR
- * @since 1.5.0
- */
-class IXR_Error
-{
-    var $code;
-    var $message;
-
-	/**
-	 * PHP5 constructor.
-	 */
-    function __construct( $code, $message )
-    {
-        $this->code = $code;
-        $this->message = htmlspecialchars($message);
-    }
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function IXR_Error( $code, $message ) {
-		self::__construct( $code, $message );
-	}
-
-    function getXml()
-    {
-        $xml = <<<EOD
-<methodResponse>
-  <fault>
-    <value>
-      <struct>
-        <member>
-          <name>faultCode</name>
-          <value><int>{$this->code}</int></value>
-        </member>
-        <member>
-          <name>faultString</name>
-          <value><string>{$this->message}</string></value>
-        </member>
-      </struct>
-    </value>
-  </fault>
-</methodResponse>
-
-EOD;
-        return $xml;
-    }
-}

diff --git a/wp-includes/IXR/class-IXR-introspectionserver.php b/wp-includes/IXR/class-IXR-introspectionserver.php
@@ -1,174 +0,0 @@
-<?php
-
-/**
- * IXR_IntrospectionServer
- *
- * @package IXR
- * @since 1.5.0
- */
-class IXR_IntrospectionServer extends IXR_Server
-{
-    var $signatures;
-    var $help;
-
-	/**
-	 * PHP5 constructor.
-	 */
-    function __construct()
-    {
-        $this->setCallbacks();
-        $this->setCapabilities();
-        $this->capabilities['introspection'] = array(
-            'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
-            'specVersion' => 1
-        );
-        $this->addCallback(
-            'system.methodSignature',
-            'this:methodSignature',
-            array('array', 'string'),
-            'Returns an array describing the return type and required parameters of a method'
-        );
-        $this->addCallback(
-            'system.getCapabilities',
-            'this:getCapabilities',
-            array('struct'),
-            'Returns a struct describing the XML-RPC specifications supported by this server'
-        );
-        $this->addCallback(
-            'system.listMethods',
-            'this:listMethods',
-            array('array'),
-            'Returns an array of available methods on this server'
-        );
-        $this->addCallback(
-            'system.methodHelp',
-            'this:methodHelp',
-            array('string', 'string'),
-            'Returns a documentation string for the specified method'
-        );
-    }
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function IXR_IntrospectionServer() {
-		self::__construct();
-	}
-
-    function addCallback($method, $callback, $args, $help)
-    {
-        $this->callbacks[$method] = $callback;
-        $this->signatures[$method] = $args;
-        $this->help[$method] = $help;
-    }
-
-    function call($methodname, $args)
-    {
-        // Make sure it's in an array
-        if ($args && !is_array($args)) {
-            $args = array($args);
-        }
-
-        // Over-rides default call method, adds signature check
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
-        }
-        $method = $this->callbacks[$methodname];
-        $signature = $this->signatures[$methodname];
-        $returnType = array_shift($signature);
-
-        // Check the number of arguments
-        if (count($args) != count($signature)) {
-            return new IXR_Error(-32602, 'server error. wrong number of method parameters');
-        }
-
-        // Check the argument types
-        $ok = true;
-        $argsbackup = $args;
-        for ($i = 0, $j = count($args); $i < $j; $i++) {
-            $arg = array_shift($args);
-            $type = array_shift($signature);
-            switch ($type) {
-                case 'int':
-                case 'i4':
-                    if (is_array($arg) || !is_int($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'base64':
-                case 'string':
-                    if (!is_string($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'boolean':
-                    if ($arg !== false && $arg !== true) {
-                        $ok = false;
-                    }
-                    break;
-                case 'float':
-                case 'double':
-                    if (!is_float($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'date':
-                case 'dateTime.iso8601':
-                    if (!is_a($arg, 'IXR_Date')) {
-                        $ok = false;
-                    }
-                    break;
-            }
-            if (!$ok) {
-                return new IXR_Error(-32602, 'server error. invalid method parameters');
-            }
-        }
-        // It passed the test - run the "real" method call
-        return parent::call($methodname, $argsbackup);
-    }
-
-    function methodSignature($method)
-    {
-        if (!$this->hasMethod($method)) {
-            return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
-        }
-        // We should be returning an array of types
-        $types = $this->signatures[$method];
-        $return = array();
-        foreach ($types as $type) {
-            switch ($type) {
-                case 'string':
-                    $return[] = 'string';
-                    break;
-                case 'int':
-                case 'i4':
-                    $return[] = 42;
-                    break;
-                case 'double':
-                    $return[] = 3.1415;
-                    break;
-                case 'dateTime.iso8601':
-                    $return[] = new IXR_Date(time());
-                    break;
-                case 'boolean':
-                    $return[] = true;
-                    break;
-                case 'base64':
-                    $return[] = new IXR_Base64('base64');
-                    break;
-                case 'array':
-                    $return[] = array('array');
-                    break;
-                case 'struct':
-                    $return[] = array('struct' => 'struct');
-                    break;
-            }
-        }
-        return $return;
-    }
-
-    function methodHelp($method)
-    {
-        return $this->help[$method];
-    }
-}

diff --git a/wp-includes/IXR/class-IXR-message.php b/wp-includes/IXR/class-IXR-message.php
@@ -1,234 +0,0 @@
-<?php
-
-/**
- * IXR_MESSAGE
- *
- * @package IXR
- * @since 1.5.0
- *
- */
-class IXR_Message
-{
-    var $message;
-    var $messageType;  // methodCall / methodResponse / fault
-    var $faultCode;
-    var $faultString;
-    var $methodName;
-    var $params;
-
-    // Current variable stacks
-    var $_arraystructs = array();   // The stack used to keep track of the current array/struct
-    var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
-    var $_currentStructName = array();  // A stack as well
-    var $_param;
-    var $_value;
-    var $_currentTag;
-    var $_currentTagContents;
-    // The XML parser
-    var $_parser;
-
-	/**
-	 * PHP5 constructor.
-	 */
-    function __construct( $message )
-    {
-        $this->message =& $message;
-    }
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function IXR_Message( $message ) {
-		self::__construct( $message );
-	}
-
-    function parse()
-    {
-        if ( ! function_exists( 'xml_parser_create' ) ) {
-            trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
-            return false;
-        }
-
-        // first remove the XML declaration
-        // merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages
-        $header = preg_replace( '/<\?xml.*?\?'.'>/s', '', substr( $this->message, 0, 100 ), 1 );
-        $this->message = trim( substr_replace( $this->message, $header, 0, 100 ) );
-        if ( '' == $this->message ) {
-            return false;
-        }
-
-        // Then remove the DOCTYPE
-        $header = preg_replace( '/^<!DOCTYPE[^>]*+>/i', '', substr( $this->message, 0, 200 ), 1 );
-        $this->message = trim( substr_replace( $this->message, $header, 0, 200 ) );
-        if ( '' == $this->message ) {
-            return false;
-        }
-
-        // Check that the root tag is valid
-        $root_tag = substr( $this->message, 0, strcspn( substr( $this->message, 0, 20 ), "> \t\r\n" ) );
-        if ( '<!DOCTYPE' === strtoupper( $root_tag ) ) {
-            return false;
-        }
-        if ( ! in_array( $root_tag, array( '<methodCall', '<methodResponse', '<fault' ) ) ) {
-            return false;
-        }
-
-        // Bail if there are too many elements to parse
-        $element_limit = 30000;
-        if ( function_exists( 'apply_filters' ) ) {
-            /**
-             * Filters the number of elements to parse in an XML-RPC response.
-             *
-             * @since 4.0.0
-             *
-             * @param int $element_limit Default elements limit.
-             */
-            $element_limit = apply_filters( 'xmlrpc_element_limit', $element_limit );
-        }
-        if ( $element_limit && 2 * $element_limit < substr_count( $this->message, '<' ) ) {
-            return false;
-        }
-
-        $this->_parser = xml_parser_create();
-        // Set XML parser to take the case of tags in to account
-        xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
-        // Set XML parser callback functions
-        xml_set_object($this->_parser, $this);
-        xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
-        xml_set_character_data_handler($this->_parser, 'cdata');
-
-        // 256Kb, parse in chunks to avoid the RAM usage on very large messages
-        $chunk_size = 262144;
-
-        /**
-         * Filters the chunk size that can be used to parse an XML-RPC reponse message.
-         *
-         * @since 4.4.0
-         *
-         * @param int $chunk_size Chunk size to parse in bytes.
-         */
-        $chunk_size = apply_filters( 'xmlrpc_chunk_parsing_size', $chunk_size );
-
-        $final = false;
-        do {
-            if (strlen($this->message) <= $chunk_size) {
-                $final = true;
-            }
-            $part = substr($this->message, 0, $chunk_size);
-            $this->message = substr($this->message, $chunk_size);
-            if (!xml_parse($this->_parser, $part, $final)) {
-                return false;
-            }
-            if ($final) {
-                break;
-            }
-        } while (true);
-        xml_parser_free($this->_parser);
-
-        // Grab the error messages, if any
-        if ($this->messageType == 'fault') {
-            $this->faultCode = $this->params[0]['faultCode'];
-            $this->faultString = $this->params[0]['faultString'];
-        }
-        return true;
-    }
-
-    function tag_open($parser, $tag, $attr)
-    {
-        $this->_currentTagContents = '';
-        $this->currentTag = $tag;
-        switch($tag) {
-            case 'methodCall':
-            case 'methodResponse':
-            case 'fault':
-                $this->messageType = $tag;
-                break;
-                /* Deal with stacks of arrays and structs */
-            case 'data':    // data is to all intents and puposes more interesting than array
-                $this->_arraystructstypes[] = 'array';
-                $this->_arraystructs[] = array();
-                break;
-            case 'struct':
-                $this->_arraystructstypes[] = 'struct';
-                $this->_arraystructs[] = array();
-                break;
-        }
-    }
-
-    function cdata($parser, $cdata)
-    {
-        $this->_currentTagContents .= $cdata;
-    }
-
-    function tag_close($parser, $tag)
-    {
-        $valueFlag = false;
-        switch($tag) {
-            case 'int':
-            case 'i4':
-                $value = (int)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'double':
-                $value = (double)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'string':
-                $value = (string)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'dateTime.iso8601':
-                $value = new IXR_Date(trim($this->_currentTagContents));
-                $valueFlag = true;
-                break;
-            case 'value':
-                // "If no type is indicated, the type is string."
-                if (trim($this->_currentTagContents) != '') {
-                    $value = (string)$this->_currentTagContents;
-                    $valueFlag = true;
-                }
-                break;
-            case 'boolean':
-                $value = (boolean)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'base64':
-                $value = base64_decode($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-                /* Deal with stacks of arrays and structs */
-            case 'data':
-            case 'struct':
-                $value = array_pop($this->_arraystructs);
-                array_pop($this->_arraystructstypes);
-                $valueFlag = true;
-                break;
-            case 'member':
-                array_pop($this->_currentStructName);
-                break;
-            case 'name':
-                $this->_currentStructName[] = trim($this->_currentTagContents);
-                break;
-            case 'methodName':
-                $this->methodName = trim($this->_currentTagContents);
-                break;
-        }
-
-        if ($valueFlag) {
-            if (count($this->_arraystructs) > 0) {
-                // Add value to struct or array
-                if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') {
-                    // Add to struct
-                    $this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value;
-                } else {
-                    // Add to array
-                    $this->_arraystructs[count($this->_arraystructs)-1][] = $value;
-                }
-            } else {
-                // Just add as a parameter
-                $this->params[] = $value;
-            }
-        }
-        $this->_currentTagContents = '';
-    }
-}

diff --git a/wp-includes/IXR/class-IXR-request.php b/wp-includes/IXR/class-IXR-request.php
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * IXR_Request
- *
- * @package IXR
- * @since 1.5.0
- */
-class IXR_Request
-{
-    var $method;
-    var $args;
-    var $xml;
-
-	/**
-	 * PHP5 constructor.
-	 */
-    function __construct($method, $args)
-    {
-        $this->method = $method;
-        $this->args = $args;
-        $this->xml = <<<EOD
-<?xml version="1.0"?>
-<methodCall>
-<methodName>{$this->method}</methodName>
-<params>
-
-EOD;
-        foreach ($this->args as $arg) {
-            $this->xml .= '<param><value>';
-            $v = new IXR_Value($arg);
-            $this->xml .= $v->getXml();
-            $this->xml .= "</value></param>\n";
-        }
-        $this->xml .= '</params></methodCall>';
-    }
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function IXR_Request( $method, $args ) {
-		self::__construct( $method, $args );
-	}
-
-    function getLength()
-    {
-        return strlen($this->xml);
-    }
-
-    function getXml()
-    {
-        return $this->xml;
-    }
-}

diff --git a/wp-includes/IXR/class-IXR-server.php b/wp-includes/IXR/class-IXR-server.php
@@ -1,225 +0,0 @@
-<?php
-
-/**
- * IXR_Server
- *
- * @package IXR
- * @since 1.5.0
- */
-class IXR_Server
-{
-    var $data;
-    var $callbacks = array();
-    var $message;
-    var $capabilities;
-
-	/**
-	 * PHP5 constructor.
-	 */
-    function __construct( $callbacks = false, $data = false, $wait = false )
-    {
-        $this->setCapabilities();
-        if ($callbacks) {
-            $this->callbacks = $callbacks;
-        }
-        $this->setCallbacks();
-        if (!$wait) {
-            $this->serve($data);
-        }
-    }
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function IXR_Server( $callbacks = false, $data = false, $wait = false ) {
-		self::__construct( $callbacks, $data, $wait );
-	}
-
-    function serve($data = false)
-    {
-        if (!$data) {
-            if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] !== 'POST') {
-                if ( function_exists( 'status_header' ) ) {
-                    status_header( 405 ); // WP #20986
-                    header( 'Allow: POST' );
-                }
-                header('Content-Type: text/plain'); // merged from WP #9093
-                die('XML-RPC server accepts POST requests only.');
-            }
-
-            global $HTTP_RAW_POST_DATA;
-            if (empty($HTTP_RAW_POST_DATA)) {
-                // workaround for a bug in PHP 5.2.2 - http://bugs.php.net/bug.php?id=41293
-                $data = file_get_contents('php://input');
-            } else {
-                $data =& $HTTP_RAW_POST_DATA;
-            }
-        }
-        $this->message = new IXR_Message($data);
-        if (!$this->message->parse()) {
-            $this->error(-32700, 'parse error. not well formed');
-        }
-        if ($this->message->messageType != 'methodCall') {
-            $this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
-        }
-        $result = $this->call($this->message->methodName, $this->message->params);
-
-        // Is the result an error?
-        if (is_a($result, 'IXR_Error')) {
-            $this->error($result);
-        }
-
-        // Encode the result
-        $r = new IXR_Value($result);
-        $resultxml = $r->getXml();
-
-        // Create the XML
-        $xml = <<<EOD
-<methodResponse>
-  <params>
-    <param>
-      <value>
-      $resultxml
-      </value>
-    </param>
-  </params>
-</methodResponse>
-
-EOD;
-      // Send it
-      $this->output($xml);
-    }
-
-    function call($methodname, $args)
-    {
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
-        }
-        $method = $this->callbacks[$methodname];
-
-        // Perform the callback and send the response
-        if (count($args) == 1) {
-            // If only one parameter just send that instead of the whole array
-            $args = $args[0];
-        }
-
-        // Are we dealing with a function or a method?
-        if (is_string($method) && substr($method, 0, 5) == 'this:') {
-            // It's a class method - check it exists
-            $method = substr($method, 5);
-            if (!method_exists($this, $method)) {
-                return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
-            }
-
-            //Call the method
-            $result = $this->$method($args);
-        } else {
-            // It's a function - does it exist?
-            if (is_array($method)) {
-                if (!is_callable(array($method[0], $method[1]))) {
-                    return new IXR_Error(-32601, 'server error. requested object method "'.$method[1].'" does not exist.');
-                }
-            } else if (!function_exists($method)) {
-                return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
-            }
-
-            // Call the function
-            $result = call_user_func($method, $args);
-        }
-        return $result;
-    }
-
-    function error($error, $message = false)
-    {
-        // Accepts either an error object or an error code and message
-        if ($message && !is_object($error)) {
-            $error = new IXR_Error($error, $message);
-        }
-        $this->output($error->getXml());
-    }
-
-    function output($xml)
-    {
-        $charset = function_exists('get_option') ? get_option('blog_charset') : '';
-        if ($charset)
-            $xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
-        else
-            $xml = '<?xml version="1.0"?>'."\n".$xml;
-        $length = strlen($xml);
-        header('Connection: close');
-        if ($charset)
-            header('Content-Type: text/xml; charset='.$charset);
-        else
-            header('Content-Type: text/xml');
-        header('Date: '.date('r'));
-        echo $xml;
-        exit;
-    }
-
-    function hasMethod($method)
-    {
-        return in_array($method, array_keys($this->callbacks));
-    }
-
-    function setCapabilities()
-    {
-        // Initialises capabilities array
-        $this->capabilities = array(
-            'xmlrpc' => array(
-                'specUrl' => 'http://www.xmlrpc.com/spec',
-                'specVersion' => 1
-        ),
-            'faults_interop' => array(
-                'specUrl' => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
-                'specVersion' => 20010516
-        ),
-            'system.multicall' => array(
-                'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208',
-                'specVersion' => 1
-        ),
-        );
-    }
-
-    function getCapabilities($args)
-    {
-        return $this->capabilities;
-    }
-
-    function setCallbacks()
-    {
-        $this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
-        $this->callbacks['system.listMethods'] = 'this:listMethods';
-        $this->callbacks['system.multicall'] = 'this:multiCall';
-    }
-
-    function listMethods($args)
-    {
-        // Returns a list of methods - uses array_reverse to ensure user defined
-        // methods are listed before server defined methods
-        return array_reverse(array_keys($this->callbacks));
-    }
-
-    function multiCall($methodcalls)
-    {
-        // See http://www.xmlrpc.com/discuss/msgReader$1208
-        $return = array();
-        foreach ($methodcalls as $call) {
-            $method = $call['methodName'];
-            $params = $call['params'];
-            if ($method == 'system.multicall') {
-                $result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
-            } else {
-                $result = $this->call($method, $params);
-            }
-            if (is_a($result, 'IXR_Error')) {
-                $return[] = array(
-                    'faultCode' => $result->code,
-                    'faultString' => $result->message
-                );
-            } else {
-                $return[] = array($result);
-            }
-        }
-        return $return;
-    }
-}

diff --git a/wp-includes/IXR/class-IXR-value.php b/wp-includes/IXR/class-IXR-value.php
@@ -1,138 +0,0 @@
-<?php
-/**
- * IXR_Value
- *
- * @package IXR
- * @since 1.5.0
- */
-class IXR_Value {
-    var $data;
-    var $type;
-
-	/**
-	 * PHP5 constructor.
-	 */
-	function __construct( $data, $type = false )
-    {
-        $this->data = $data;
-        if (!$type) {
-            $type = $this->calculateType();
-        }
-        $this->type = $type;
-        if ($type == 'struct') {
-            // Turn all the values in the array in to new IXR_Value objects
-            foreach ($this->data as $key => $value) {
-                $this->data[$key] = new IXR_Value($value);
-            }
-        }
-        if ($type == 'array') {
-            for ($i = 0, $j = count($this->data); $i < $j; $i++) {
-                $this->data[$i] = new IXR_Value($this->data[$i]);
-            }
-        }
-    }
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function IXR_Value( $data, $type = false ) {
-		self::__construct( $data, $type );
-	}
-
-    function calculateType()
-    {
-        if ($this->data === true || $this->data === false) {
-            return 'boolean';
-        }
-        if (is_integer($this->data)) {
-            return 'int';
-        }
-        if (is_double($this->data)) {
-            return 'double';
-        }
-
-        // Deal with IXR object types base64 and date
-        if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
-            return 'date';
-        }
-        if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
-            return 'base64';
-        }
-
-        // If it is a normal PHP object convert it in to a struct
-        if (is_object($this->data)) {
-            $this->data = get_object_vars($this->data);
-            return 'struct';
-        }
-        if (!is_array($this->data)) {
-            return 'string';
-        }
-
-        // We have an array - is it an array or a struct?
-        if ($this->isStruct($this->data)) {
-            return 'struct';
-        } else {
-            return 'array';
-        }
-    }
-
-    function getXml()
-    {
-        // Return XML for this value
-        switch ($this->type) {
-            case 'boolean':
-                return '<boolean>'.(($this->data) ? '1' : '0').'</boolean>';
-                break;
-            case 'int':
-                return '<int>'.$this->data.'</int>';
-                break;
-            case 'double':
-                return '<double>'.$this->data.'</double>';
-                break;
-            case 'string':
-                return '<string>'.htmlspecialchars($this->data).'</string>';
-                break;
-            case 'array':
-                $return = '<array><data>'."\n";
-                foreach ($this->data as $item) {
-                    $return .= '  <value>'.$item->getXml()."</value>\n";
-                }
-                $return .= '</data></array>';
-                return $return;
-                break;
-            case 'struct':
-                $return = '<struct>'."\n";
-                foreach ($this->data as $name => $value) {
-					$name = htmlspecialchars($name);
-                    $return .= "  <member><name>$name</name><value>";
-                    $return .= $value->getXml()."</value></member>\n";
-                }
-                $return .= '</struct>';
-                return $return;
-                break;
-            case 'date':
-            case 'base64':
-                return $this->data->getXml();
-                break;
-        }
-        return false;
-    }
-
-    /**
-     * Checks whether or not the supplied array is a struct or not
-     *
-     * @param array $array
-     * @return bool
-     */
-    function isStruct($array)
-    {
-        $expected = 0;
-        foreach ($array as $key => $value) {
-            if ((string)$key !== (string)$expected) {
-                return true;
-            }
-            $expected++;
-        }
-        return false;
-    }
-}

diff --git a/wp-includes/Requests/Auth.php b/wp-includes/Requests/Auth.php
@@ -1,33 +0,0 @@
-<?php
-/**
- * Authentication provider interface
- *
- * @package Requests
- * @subpackage Authentication
- */
-
-/**
- * Authentication provider interface
- *
- * Implement this interface to act as an authentication provider.
- *
- * Parameters should be passed via the constructor where possible, as this
- * makes it much easier for users to use your provider.
- *
- * @see Requests_Hooks
- * @package Requests
- * @subpackage Authentication
- */
-interface Requests_Auth {
-	/**
-	 * Register hooks as needed
-	 *
-	 * This method is called in {@see Requests::request} when the user has set
-	 * an instance as the 'auth' option. Use this callback to register all the
-	 * hooks you'll need.
-	 *
-	 * @see Requests_Hooks::register
-	 * @param Requests_Hooks $hooks Hook system
-	 */
-	public function register(Requests_Hooks &$hooks);
-}

diff --git a/wp-includes/Requests/Auth/Basic.php b/wp-includes/Requests/Auth/Basic.php
@@ -1,88 +0,0 @@
-<?php
-/**
- * Basic Authentication provider
- *
- * @package Requests
- * @subpackage Authentication
- */
-
-/**
- * Basic Authentication provider
- *
- * Provides a handler for Basic HTTP authentication via the Authorization
- * header.
- *
- * @package Requests
- * @subpackage Authentication
- */
-class Requests_Auth_Basic implements Requests_Auth {
-	/**
-	 * Username
-	 *
-	 * @var string
-	 */
-	public $user;
-
-	/**
-	 * Password
-	 *
-	 * @var string
-	 */
-	public $pass;
-
-	/**
-	 * Constructor
-	 *
-	 * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`)
-	 * @param array|null $args Array of user and password. Must have exactly two elements
-	 */
-	public function __construct($args = null) {
-		if (is_array($args)) {
-			if (count($args) !== 2) {
-				throw new Requests_Exception('Invalid number of arguments', 'authbasicbadargs');
-			}
-
-			list($this->user, $this->pass) = $args;
-		}
-	}
-
-	/**
-	 * Register the necessary callbacks
-	 *
-	 * @see curl_before_send
-	 * @see fsockopen_header
-	 * @param Requests_Hooks $hooks Hook system
-	 */
-	public function register(Requests_Hooks &$hooks) {
-		$hooks->register('curl.before_send', array(&$this, 'curl_before_send'));
-		$hooks->register('fsockopen.after_headers', array(&$this, 'fsockopen_header'));
-	}
-
-	/**
-	 * Set cURL parameters before the data is sent
-	 *
-	 * @param resource $handle cURL resource
-	 */
-	public function curl_before_send(&$handle) {
-		curl_setopt($handle, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-		curl_setopt($handle, CURLOPT_USERPWD, $this->getAuthString());
-	}
-
-	/**
-	 * Add extra headers to the request before sending
-	 *
-	 * @param string $out HTTP header string
-	 */
-	public function fsockopen_header(&$out) {
-		$out .= sprintf("Authorization: Basic %s\r\n", base64_encode($this->getAuthString()));
-	}
-
-	/**
-	 * Get the authentication string (user:pass)
-	 *
-	 * @return string
-	 */
-	public function getAuthString() {
-		return $this->user . ':' . $this->pass;
-	}
-}

diff --git a/wp-includes/Requests/Cookie.php b/wp-includes/Requests/Cookie.php
diff --git a/wp-includes/Requests/Cookie/Jar.php b/wp-includes/Requests/Cookie/Jar.php
@@ -1,175 +0,0 @@
-<?php
-/**
- * Cookie holder object
- *
- * @package Requests
- * @subpackage Cookies
- */
-
-/**
- * Cookie holder object
- *
- * @package Requests
- * @subpackage Cookies
- */
-class Requests_Cookie_Jar implements ArrayAccess, IteratorAggregate {
-	/**
-	 * Actual item data
-	 *
-	 * @var array
-	 */
-	protected $cookies = array();
-
-	/**
-	 * Create a new jar
-	 *
-	 * @param array $cookies Existing cookie values
-	 */
-	public function __construct($cookies = array()) {
-		$this->cookies = $cookies;
-	}
-
-	/**
-	 * Normalise cookie data into a Requests_Cookie
-	 *
-	 * @param string|Requests_Cookie $cookie
-	 * @return Requests_Cookie
-	 */
-	public function normalize_cookie($cookie, $key = null) {
-		if ($cookie instanceof Requests_Cookie) {
-			return $cookie;
-		}
-
-		return Requests_Cookie::parse($cookie, $key);
-	}
-
-	/**
-	 * Normalise cookie data into a Requests_Cookie
-	 *
-	 * @codeCoverageIgnore
-	 * @deprecated Use {@see Requests_Cookie_Jar::normalize_cookie}
-	 * @return Requests_Cookie
-	 */
-	public function normalizeCookie($cookie, $key = null) {
-		return $this->normalize_cookie($cookie, $key);
-	}
-
-	/**
-	 * Check if the given item exists
-	 *
-	 * @param string $key Item key
-	 * @return boolean Does the item exist?
-	 */
-	public function offsetExists($key) {
-		return isset($this->cookies[$key]);
-	}
-
-	/**
-	 * Get the value for the item
-	 *
-	 * @param string $key Item key
-	 * @return string Item value
-	 */
-	public function offsetGet($key) {
-		if (!isset($this->cookies[$key])) {
-			return null;
-		}
-
-		return $this->cookies[$key];
-	}
-
-	/**
-	 * Set the given item
-	 *
-	 * @throws Requests_Exception On attempting to use dictionary as list (`invalidset`)
-	 *
-	 * @param string $key Item name
-	 * @param string $value Item value
-	 */
-	public function offsetSet($key, $value) {
-		if ($key === null) {
-			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
-		}
-
-		$this->cookies[$key] = $value;
-	}
-
-	/**
-	 * Unset the given header
-	 *
-	 * @param string $key
-	 */
-	public function offsetUnset($key) {
-		unset($this->cookies[$key]);
-	}
-
-	/**
-	 * Get an iterator for the data
-	 *
-	 * @return ArrayIterator
-	 */
-	public function getIterator() {
-		return new ArrayIterator($this->cookies);
-	}
-
-	/**
-	 * Register the cookie handler with the request's hooking system
-	 *
-	 * @param Requests_Hooker $hooks Hooking system
-	 */
-	public function register(Requests_Hooker $hooks) {
-		$hooks->register('requests.before_request', array($this, 'before_request'));
-		$hooks->register('requests.before_redirect_check', array($this, 'before_redirect_check'));
-	}
-
-	/**
-	 * Add Cookie header to a request if we have any
-	 *
-	 * As per RFC 6265, cookies are separated by '; '
-	 *
-	 * @param string $url
-	 * @param array $headers
-	 * @param array $data
-	 * @param string $type
-	 * @param array $options
-	 */
-	public function before_request($url, &$headers, &$data, &$type, &$options) {
-		if (!$url instanceof Requests_IRI) {
-			$url = new Requests_IRI($url);
-		}
-
-		if (!empty($this->cookies)) {
-			$cookies = array();
-			foreach ($this->cookies as $key => $cookie) {
-				$cookie = $this->normalize_cookie($cookie, $key);
-
-				// Skip expired cookies
-				if ($cookie->is_expired()) {
-					continue;
-				}
-
-				if ($cookie->domain_matches($url->host)) {
-					$cookies[] = $cookie->format_for_header();
-				}
-			}
-
-			$headers['Cookie'] = implode('; ', $cookies);
-		}
-	}
-
-	/**
-	 * Parse all cookies from a response and attach them to the response
-	 *
-	 * @var Requests_Response $response
-	 */
-	public function before_redirect_check(Requests_Response &$return) {
-		$url = $return->url;
-		if (!$url instanceof Requests_IRI) {
-			$url = new Requests_IRI($url);
-		}
-
-		$cookies = Requests_Cookie::parse_from_headers($return->headers, $url);
-		$this->cookies = array_merge($this->cookies, $cookies);
-		$return->cookies = $this;
-	}
-}

diff --git a/wp-includes/Requests/Exception.php b/wp-includes/Requests/Exception.php
@@ -1,62 +0,0 @@
-<?php
-/**
- * Exception for HTTP requests
- *
- * @package Requests
- */
-
-/**
- * Exception for HTTP requests
- *
- * @package Requests
- */
-class Requests_Exception extends Exception {
-	/**
-	 * Type of exception
-	 *
-	 * @var string
-	 */
-	protected $type;
-
-	/**
-	 * Data associated with the exception
-	 *
-	 * @var mixed
-	 */
-	protected $data;
-
-	/**
-	 * Create a new exception
-	 *
-	 * @param string $message Exception message
-	 * @param string $type Exception type
-	 * @param mixed $data Associated data
-	 * @param integer $code Exception numerical code, if applicable
-	 */
-	public function __construct($message, $type, $data = null, $code = 0) {
-		parent::__construct($message, $code);
-
-		$this->type = $type;
-		$this->data = $data;
-	}
-
-	/**
-	 * Like {@see getCode()}, but a string code.
-	 *
-	 * @codeCoverageIgnore
-	 * @return string
-	 */
-	public function getType() {
-		return $this->type;
-	}
-
-	/**
-	 * Gives any relevant data
-	 *
-	 * @codeCoverageIgnore
-	 * @return mixed
-	 */
-	public function getData() {
-		return $this->data;
-	}
-}

diff --git a/wp-includes/Requests/Exception/HTTP.php b/wp-includes/Requests/Exception/HTTP.php
@@ -1,71 +0,0 @@
-<?php
-/**
- * Exception based on HTTP response
- *
- * @package Requests
- */
-
-/**
- * Exception based on HTTP response
- *
- * @package Requests
- */
-class Requests_Exception_HTTP extends Requests_Exception {
-	/**
-	 * HTTP status code
-	 *
-	 * @var integer
-	 */
-	protected $code = 0;
-
-	/**
-	 * Reason phrase
-	 *
-	 * @var string
-	 */
-	protected $reason = 'Unknown';
-
-	/**
-	 * Create a new exception
-	 *
-	 * There is no mechanism to pass in the status code, as this is set by the
-	 * subclass used. Reason phrases can vary, however.
-	 *
-	 * @param string|null $reason Reason phrase
-	 * @param mixed $data Associated data
-	 */
-	public function __construct($reason = null, $data = null) {
-		if ($reason !== null) {
-			$this->reason = $reason;
-		}
-
-		$message = sprintf('%d %s', $this->code, $this->reason);
-		parent::__construct($message, 'httpresponse', $data, $this->code);
-	}
-
-	/**
-	 * Get the status message
-	 */
-	public function getReason() {
-		return $this->reason;
-	}
-
-	/**
-	 * Get the correct exception class for a given error code
-	 *
-	 * @param int|bool $code HTTP status code, or false if unavailable
-	 * @return string Exception class name to use
-	 */
-	public static function get_class($code) {
-		if (!$code) {
-			return 'Requests_Exception_HTTP_Unknown';
-		}
-
-		$class = sprintf('Requests_Exception_HTTP_%d', $code);
-		if (class_exists($class)) {
-			return $class;
-		}
-
-		return 'Requests_Exception_HTTP_Unknown';
-	}
-}

diff --git a/wp-includes/Requests/Exception/HTTP/304.php b/wp-includes/Requests/Exception/HTTP/304.php
@@ -1,27 +0,0 @@
-<?php
-/**
- * Exception for 304 Not Modified responses
- *
- * @package Requests
- */
-
-/**
- * Exception for 304 Not Modified responses
- *
- * @package Requests
- */
-class Requests_Exception_HTTP_304 extends Requests_Exception_HTTP {
-	/**
-	 * HTTP status code
-	 *
-	 * @var integer
-	 */
-	protected $code = 304;
-
-	/**
-	 * Reason phrase
-	 *
-	 * @var string
-	 */
-	protected $reason = 'Not Modified';
-}

diff --git a/wp-includes/Requests/Exception/HTTP/305.php b/wp-includes/Requests/Exception/HTTP/305.php
@@ -1,27 +0,0 @@
-<?php
-/**
- * Exception for 305 Use Proxy responses
- *
- * @package Requests
- */
-
-/**
- * Exception for 305 Use Proxy responses
- *
- * @package Requests
- */
-class Requests_Exception_HTTP_305 extends Requests_Exception_HTTP {
-	/**
-	 * HTTP status code
-	 *
-	 * @var integer
-	 */
-	protected $code = 305;
-
-	/**
-	 * Reason phrase
-	 *
-	 * @var string
-	 */
-	protected $reason = 'Use Proxy';
-}

diff --git a/wp-includes/Requests/Exception/HTTP/306.php b/wp-includes/Requests/Exception/HTTP/306.php
@@ -1,27 +0,0 @@
-<?php
-/**
- * Exception for 306 Switch Proxy responses
- *
- * @package Requests
- */
-
-/**
- * Exception for 306 Switch Proxy responses
- *
- * @package Requests
- */
-class Requests_Exception_HTTP_306 extends Requests_Exception_HTTP {
-	/**
-	 * HTTP status code
-	 *
-	 * @var integer
-	 */
-	protected $code = 306;
-
-	/**
-	 * Reason phrase
-	 *
-	 * @var string
-	 */
-	protected $reason = 'Switch Proxy';
-}

diff --git a/wp-includes/Requests/Exception/HTTP/400.php b/wp-includes/Requests/Exception/HTTP/400.php
@@ -1,27 +0,0 @@
-<?php
-/**
- * Exception for 400 Bad Request responses
- *
- * @package Requests
- */
-
-/**
- * Exception for 400 Bad Request responses
- *
- * @package Requests
- */
-class Requests_Exception_HTTP_400 extends Requests_Exception_HTTP {
-	/**
-	 * HTTP status code
-	 *
-	 * @var integer
-	 */
-	protected $code = 400;
-
-	/**
-	 * Reason phrase
-	 *
-	 * @var string
-	 */
-	protected $reason = 'Bad Request';
-}

diff --git a/wp-includes/Requests/Exception/HTTP/401.php b/wp-includes/Requests/Exception/HTTP/401.php
@@ -1,27 +0,0 @@
-<?php
-/**
- * Exception for 401 Unauthorized responses
- *
- * @package Requests
- */
-
-/**
- * Exception for 401 Unauthorized responses
- *
- * @package Requests
- */
-class Requests_Exception_HTTP_401 extends Requests_Exception_HTTP {
-	/**
-	 * HTTP status code
-	 *
-	 * @var integer
-	 */
-	protected $code = 401;
-
-	/**
-	 * Reason phrase
-	 *
-	 * @var string
-	 */
-	protected $reason = 'Unauthorized';
-}

diff --git a/wp-includes/Requests/Exception/HTTP/402.php b/wp-includes/Requests/Exception/HTTP/402.php
@@ -1,27 +0,0 @@
-<?php
-/**
- * Exception for 402 Payment Required responses
- *
- * @package Requests
- */
-
-/**
- * Exception for 402 Payment Required responses
- *
- * @package Requests
- */
-class Requests_Exception_HTTP_402 extends Requests_Exception_HTTP {
-	/**
-	 * HTTP status code
-	 *
-	 * @var integer
-	 */
-	protected $code = 402;
-
-	/**
-	 * Reason phrase
-	 *
-	 * @var string
-	 */
-	protected $reason = 'Payment Required';
-}

diff --git a/wp-includes/Requests/Exception/HTTP/403.php b/wp-includes/Requests/Exception/HTTP/403.php
@@ -1,27 +0,0 @@
-<?php
-/**
- * Exception for 403 Forbidden responses
- *
- * @package Requests
- */
-
-/**
- * Exception for 403 Forbidden responses
- *
- * @package Requests
- */
-class Requests_Exception_HTTP_403 extends Requests_Exception_HTTP {
-	/**
-	 * HTTP status code
-	 *
-	 * @var integer
-	 */
-	protected $code = 403;
-
-	/**
-	 * Reason phrase
-	 *
-	 * @var string
-	 */
-	protected $reason = 'Forbidden';
-}