diff -uNr a/mp-wp/favicon.svg b/mp-wp/favicon.svg
--- a/mp-wp/favicon.svg f8b9c170225c60751012c022ecf52406e2edacfa5d8654ad9c8c3ad00cc4ec6f3748ecc54e90f8fd38bf826342d250cfb9ce2d5f94d14e725578da20068088d9
+++ b/mp-wp/favicon.svg false
@@ -1 +0,0 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg id="Layer_1" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve"><image id="image0" width="32" height="32" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAABGdBTUEAALGPC/xhBQAAACBjSFJN AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ cwAADdcAAA3XAUIom3gAAAAHdElNRQfiBA0GBi4es7jPAAACj0lEQVQ4y02SPYhddRTE5//ue7vr rqhBFvxgN5UgShCx2EKxSbMENNpYWQiCpLNQLNMaREWxSJNUKho7xcQi2igWQpogRizUWGRh84HZ 5b57/x/nnJ/FC1mnnjMznBkFYIVWHTJABgtwKhSygB4CYI+w5mCwDxn6ALUIkI6MFcC2pjLXtFP3 1Icj9DGZpt6F1r+ZSbk/v2p9NzGz8ea7505WrSVloDD76bAZsHlpiYp1QN15sEKIDBS17U8YOP1C qEQ0USnXVwETxr4x5ZeNgb2Nay4wJoXdi0+c9EqTOxCCox9z6tXw5TkFJd1z5HSDEVEcahd2ef2f 9b8aYg+EcwcCoiDgxc03aHReGuk2dwlj0DBh9dLm1ZFBMJAo/1OozRFOa1RY2QcX411Cy4DuUxuJ nqbUtTqTDiwMbgIVy7BLjIBxADGvwMAQAF6BXfIBRYHBSNBYGJeAWNQLMEl4aCUkpJCkSKOCJBVJ qspw5ySDz/G2EKRR5zawiGuFxVAqNDMa0QOLV5NpUMkwx8yc1hgh5+AWiAJSYuTy2m38hyUJaVUr T56xhqECxuHfCnyw/FlPvfJIhRT8+/XW2xG4yIz+2vsM+eV3TgScOsG8dvQ5dtagLjLsf3e0p3/o xmM0nv5xADXg6iEaVQQVn+3x7XGe/cP/fqCHOqW/fvGZNyEzISlpsn2hfn9seOmCzr+yJptZOvTo W69/pP3lkIMRX27XrV/5+Zg9/zk+khhxcyhNAY7tPPznBsbj11bAGRIM0BbbkXeg5zbXzpbu+P3l iyXFJNVJh6ItJwmcgPf0FXBOnxLg05HK6FCzcAi4otrjv3e3ghs+k8CN5kQiJqEJSi1NRZL6eyOm kWymSMm6/wBM4RyPp1z/eAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wNC0xM1QxMzowNjo0Ni0w NzowMAXzFgcAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgtMDQtMTNUMTM6MDY6NDYtMDc6MDB0rq67 AAAAAElFTkSuQmCC"></image></svg>
diff -uNr a/mp-wp/manifest b/mp-wp/manifest
--- a/mp-wp/manifest 00b581121b09f282560a29d90fbb53a6ad22a7799428554bb1d17584200fb45310a8022757daf326c1709b2032434fb9eb4c507743af87e517adda50e2974365
+++ b/mp-wp/manifest dda35ab508d16ff98e3e1dfcc4db121dadb4ed81a432c0f5d9ab6f4bb1208b3fae5f3928e1090d7e7f3ba6643d5e83c2542c9ca7232c05e56b8e2047853ee6d8
@@ -8,3 +8,4 @@
 629903 mp-wp_remove-textselectionjs-pop3-etc-r2 jfw Remove the unreliable JS-based selection (reground: including wrapper spans), posting by POP3 login, and a stray .php.orig file. Neutralize and comment the example pingback updater.
 629903 mp-wp_svg-screenshots-and-errorreporting-r2 jfw Allow .svg extensions in theme screenshot search. Don't clobber the user's errorreporting level without WP_DEBUG. (Reground following antecedent.)
 631542 mp-wp_add-embeddable-codeblocks-and-server-side-selection billymg Add embeddable codeblocks and the server-side select mechanism to the "footnotes" plugin (now "mp-wp content processing")
+634877 mp-wp_remove-all-javascript billymg Remove all JS and a decent chunk of unnecessary PHP code (including importers/exporters, theme/plugin editors, and unused filesystem libraries). Introduce a minor facelift to the admin UI while removing the contents of wp-admin/images/
diff -uNr a/mp-wp/wp-admin/admin-ajax.php b/mp-wp/wp-admin/admin-ajax.php
--- a/mp-wp/wp-admin/admin-ajax.php 15dbf0bc5478ce0bd9c2a705c7ab4a7701e13cc6590a8b47211f39e8a6bc6a8dab0ac895b8ad360aaf9ca6727fe2cdef554b21be787b9a746a1feb5eb28c531f
+++ b/mp-wp/wp-admin/admin-ajax.php false
@@ -1,1044 +0,0 @@
-<?php
-/**
- * WordPress AJAX Process Execution.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/**
- * Executing AJAX process.
- *
- * @since unknown
- */
-define('DOING_AJAX', true);
-define('WP_ADMIN', true);
-
-require_once('../wp-load.php');
-require_once('includes/admin.php');
-
-if ( ! is_user_logged_in() ) {
-
-	if ( $_POST['action'] == 'autosave' ) {
-		$id = isset($_POST['post_ID'])? (int) $_POST['post_ID'] : 0;
-
-		if ( ! $id )
-			die('-1');
-
-		$message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="blank">Please log in again.</a>'), wp_login_url() );
-			$x = new WP_Ajax_Response( array(
-				'what' => 'autosave',
-				'id' => $id,
-				'data' => $message
-			) );
-			$x->send();
-	}
-
-	die('-1');
-}
-
-if ( isset( $_GET['action'] ) ) :
-switch ( $action = $_GET['action'] ) :
-case 'ajax-tag-search' :
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	$s = $_GET['q']; // is this slashed already?
-
-	if ( false !== strpos( $s, ',' ) ) {
-		$s = explode( ',', $s );
-		$s = $s[count( $s ) - 1];
-	}
-	$s = trim( $s );
-	if ( strlen( $s ) < 2 )
-		die; // require 2 chars for matching
-	$results = $wpdb->get_col( "SELECT t.name FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = 'post_tag' AND t.name LIKE ('%". $s . "%')" );
-	echo join( $results, "\n" );
-	die;
-	break;
-default :
-	do_action( 'wp_ajax_' . $_GET['action'] );
-	die('0');
-	break;
-endswitch;
-endif;
-
-$id = isset($_POST['id'])? (int) $_POST['id'] : 0;
-switch ( $action = $_POST['action'] ) :
-case 'delete-comment' :
-	check_ajax_referer( "delete-comment_$id" );
-	if ( !$comment = get_comment( $id ) )
-		die('1');
-	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-		die('-1');
-
-	if ( isset($_POST['spam']) && 1 == $_POST['spam'] ) {
-		if ( 'spam' == wp_get_comment_status( $comment->comment_ID ) )
-			die('1');
-		$r = wp_set_comment_status( $comment->comment_ID, 'spam' );
-	} else {
-		$r = wp_delete_comment( $comment->comment_ID );
-	}
-
-	die( $r ? '1' : '0' );
-	break;
-case 'delete-cat' :
-	check_ajax_referer( "delete-category_$id" );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	$cat = get_category( $id );
-	if ( !$cat || is_wp_error( $cat ) )
-		die('1');
-
-	if ( wp_delete_category( $id ) )
-		die('1');
-	else
-		die('0');
-	break;
-case 'delete-tag' :
-	check_ajax_referer( "delete-tag_$id" );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	$tag = get_term( $id, 'post_tag' );
-	if ( !$tag || is_wp_error( $tag ) )
-		die('1');
-
-	if ( wp_delete_term($id, 'post_tag'))
-		die('1');
-	else
-		die('0');
-	break;
-case 'delete-link-cat' :
-	check_ajax_referer( "delete-link-category_$id" );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	$cat = get_term( $id, 'link_category' );
-	if ( !$cat || is_wp_error( $cat ) )
-		die('1');
-
-	$cat_name = get_term_field('name', $id, 'link_category');
-
-	// Don't delete the default cats.
-	if ( $id == get_option('default_link_category') ) {
-		$x = new WP_AJAX_Response( array(
-			'what' => 'link-cat',
-			'id' => $id,
-			'data' => new WP_Error( 'default-link-cat', sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name) )
-		) );
-		$x->send();
-	}
-
-	$r = wp_delete_term($id, 'link_category');
-	if ( !$r )
-		die('0');
-	if ( is_wp_error($r) ) {
-		$x = new WP_AJAX_Response( array(
-			'what' => 'link-cat',
-			'id' => $id,
-			'data' => $r
-		) );
-		$x->send();
-	}
-	die('1');
-	break;
-case 'delete-link' :
-	check_ajax_referer( "delete-bookmark_$id" );
-	if ( !current_user_can( 'manage_links' ) )
-		die('-1');
-
-	$link = get_bookmark( $id );
-	if ( !$link || is_wp_error( $link ) )
-		die('1');
-
-	if ( wp_delete_link( $id ) )
-		die('1');
-	else
-		die('0');
-	break;
-case 'delete-meta' :
-	check_ajax_referer( "delete-meta_$id" );
-	if ( !$meta = get_post_meta_by_id( $id ) )
-		die('1');
-
-	if ( !current_user_can( 'edit_post', $meta->post_id ) )
-		die('-1');
-	if ( delete_meta( $meta->meta_id ) )
-		die('1');
-	die('0');
-	break;
-case 'delete-post' :
-	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_post', $id ) )
-		die('-1');
-
-	if ( !get_post( $id ) )
-		die('1');
-
-	if ( wp_delete_post( $id ) )
-		die('1');
-	else
-		die('0');
-	break;
-case 'delete-page' :
-	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_page', $id ) )
-		die('-1');
-
-	if ( !get_page( $id ) )
-		die('1');
-
-	if ( wp_delete_post( $id ) )
-		die('1');
-	else
-		die('0');
-	break;
-case 'dim-comment' :
-	if ( !$comment = get_comment( $id ) )
-		die('0');
-
-	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-		die('-1');
-	if ( !current_user_can( 'moderate_comments' ) )
-		die('-1');
-
-	$current = wp_get_comment_status( $comment->comment_ID );
-	if ( $_POST['new'] == $current )
-		die('1');
-
-	if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
-		check_ajax_referer( "approve-comment_$id" );
-		if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
-			die('1');
-	} else {
-		check_ajax_referer( "unapprove-comment_$id" );
-		if ( wp_set_comment_status( $comment->comment_ID, 'hold' ) )
-			die('1');
-	}
-	die('0');
-	break;
-case 'add-category' : // On the Fly
-	check_ajax_referer( $action );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-	$names = explode(',', $_POST['newcat']);
-	if ( 0 > $parent = (int) $_POST['newcat_parent'] )
-		$parent = 0;
-	$post_category = isset($_POST['post_category'])? (array) $_POST['post_category'] : array();
-	$checked_categories = array_map( 'absint', (array) $post_category );
-	$popular_ids = isset( $_POST['popular_ids'] ) ?
-			array_map( 'absint', explode( ',', $_POST['popular_ids'] ) ) :
-			false;
-
-	$x = new WP_Ajax_Response();
-	foreach ( $names as $cat_name ) {
-		$cat_name = trim($cat_name);
-		$category_nicename = sanitize_title($cat_name);
-		if ( '' === $category_nicename )
-			continue;
-		$cat_id = wp_create_category( $cat_name, $parent );
-		$checked_categories[] = $cat_id;
-		if ( $parent ) // Do these all at once in a second
-			continue;
-		$category = get_category( $cat_id );
-		ob_start();
-			wp_category_checklist( 0, $cat_id, $checked_categories, $popular_ids );
-		$data = ob_get_contents();
-		ob_end_clean();
-		$x->add( array(
-			'what' => 'category',
-			'id' => $cat_id,
-			'data' => $data,
-			'position' => -1
-		) );
-	}
-	if ( $parent ) { // Foncy - replace the parent and all its children
-		$parent = get_category( $parent );
-		ob_start();
-			dropdown_categories( 0, $parent );
-		$data = ob_get_contents();
-		ob_end_clean();
-		$x->add( array(
-			'what' => 'category',
-			'id' => $parent->term_id,
-			'old_id' => $parent->term_id,
-			'data' => $data,
-			'position' => -1
-		) );
-
-	}
-	$x->send();
-	break;
-case 'add-link-category' : // On the Fly
-	check_ajax_referer( $action );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-	$names = explode(',', $_POST['newcat']);
-	$x = new WP_Ajax_Response();
-	foreach ( $names as $cat_name ) {
-		$cat_name = trim($cat_name);
-		$slug = sanitize_title($cat_name);
-		if ( '' === $slug )
-			continue;
-		if ( !$cat_id = is_term( $cat_name, 'link_category' ) ) {
-			$cat_id = wp_insert_term( $cat_name, 'link_category' );
-		}
-		$cat_id = $cat_id['term_id'];
-		$cat_name = wp_specialchars(stripslashes($cat_name));
-		$x->add( array(
-			'what' => 'link-category',
-			'id' => $cat_id,
-			'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='$cat_id' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>",
-			'position' => -1
-		) );
-	}
-	$x->send();
-	break;
-case 'add-cat' : // From Manage->Categories
-	check_ajax_referer( 'add-category' );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	if ( '' === trim($_POST['cat_name']) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'cat',
-			'id' => new WP_Error( 'cat_name', __('You did not enter a category name.') )
-		) );
-		$x->send();
-	}
-
-	if ( category_exists( trim( $_POST['cat_name'] ) ) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'cat',
-			'id' => new WP_Error( 'cat_exists', __('The category you are trying to create already exists.'), array( 'form-field' => 'cat_name' ) ),
-		) );
-		$x->send();
-	}
-
-	$cat = wp_insert_category( $_POST, true );
-
-	if ( is_wp_error($cat) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'cat',
-			'id' => $cat
-		) );
-		$x->send();
-	}
-
-	if ( !$cat || (!$cat = get_category( $cat )) )
-		die('0');
-
-	$level = 0;
-	$cat_full_name = $cat->name;
-	$_cat = $cat;
-	while ( $_cat->parent ) {
-		$_cat = get_category( $_cat->parent );
-		$cat_full_name = $_cat->name . ' &#8212; ' . $cat_full_name;
-		$level++;
-	}
-	$cat_full_name = attribute_escape($cat_full_name);
-
-	$x = new WP_Ajax_Response( array(
-		'what' => 'cat',
-		'id' => $cat->term_id,
-		'position' => -1,
-		'data' => _cat_row( $cat, $level, $cat_full_name ),
-		'supplemental' => array('name' => $cat_full_name, 'show-link' => sprintf(__( 'Category <a href="#%s">%s</a> added' ), "cat-$cat->term_id", $cat_full_name))
-	) );
-	$x->send();
-	break;
-case 'add-link-cat' : // From Blogroll -> Categories
-	check_ajax_referer( 'add-link-category' );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	if ( '' === trim($_POST['name']) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'link-cat',
-			'id' => new WP_Error( 'name', __('You did not enter a category name.') )
-		) );
-		$x->send();
-	}
-
-	$r = wp_insert_term($_POST['name'], 'link_category', $_POST );
-	if ( is_wp_error( $r ) ) {
-		$x = new WP_AJAX_Response( array(
-			'what' => 'link-cat',
-			'id' => $r
-		) );
-		$x->send();
-	}
-
-	extract($r, EXTR_SKIP);
-
-	if ( !$link_cat = link_cat_row( $term_id ) )
-		die('0');
-
-	$x = new WP_Ajax_Response( array(
-		'what' => 'link-cat',
-		'id' => $term_id,
-		'position' => -1,
-		'data' => $link_cat
-	) );
-	$x->send();
-	break;
-case 'add-tag' : // From Manage->Tags
-	check_ajax_referer( 'add-tag' );
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	if ( '' === trim($_POST['name']) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'tag',
-			'id' => new WP_Error( 'name', __('You did not enter a tag name.') )
-		) );
-		$x->send();
-	}
-
-	$tag = wp_insert_term($_POST['name'], 'post_tag', $_POST );
-
-	if ( is_wp_error($tag) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'tag',
-			'id' => $tag
-		) );
-		$x->send();
-	}
-
-	if ( !$tag || (!$tag = get_term( $tag['term_id'], 'post_tag' )) )
-		die('0');
-
-	$tag_full_name = $tag->name;
-	$tag_full_name = attribute_escape($tag_full_name);
-
-	$x = new WP_Ajax_Response( array(
-		'what' => 'tag',
-		'id' => $tag->term_id,
-		'position' => '-1',
-		'data' => _tag_row( $tag ),
-		'supplemental' => array('name' => $tag_full_name, 'show-link' => sprintf(__( 'Tag <a href="#%s">%s</a> added' ), "tag-$tag->term_id", $tag_full_name))
-	) );
-	$x->send();
-	break;
-case 'get-tagcloud' :
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	$tags = get_tags( array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
-
-	if ( empty( $tags ) )
-		die( __('No tags found!') );
-
-	foreach ( $tags as $key => $tag ) {
-		$tags[ $key ]->link = '#';
-		$tags[ $key ]->id = $tag->term_id;
-	}
-
-	$return = wp_generate_tag_cloud( $tags );
-
-	if ( empty($return) )
-		die('0');
-
-	echo $return;
-
-	exit;
-	break;
-case 'add-comment' :
-	check_ajax_referer( $action );
-	if ( !current_user_can( 'edit_post', $id ) )
-		die('-1');
-	$search = isset($_POST['s']) ? $_POST['s'] : false;
-	$start = isset($_POST['page']) ? intval($_POST['page']) * 25 - 1: 24;
-	$status = isset($_POST['comment_status']) ? $_POST['comment_status'] : false;
-	$mode = isset($_POST['mode']) ? $_POST['mode'] : 'detail';
-	$p = isset($_POST['p']) ? $_POST['p'] : 0;
-	$comment_type = isset($_POST['comment_type']) ? $_POST['comment_type'] : '';
-	list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1, $p, $comment_type );
-
-	if ( get_option('show_avatars') )
-		add_filter( 'comment_author', 'floated_admin_avatar' );
-
-	if ( !$comments )
-		die('1');
-	$x = new WP_Ajax_Response();
-	foreach ( (array) $comments as $comment ) {
-		get_comment( $comment );
-		ob_start();
-			_wp_comment_row( $comment->comment_ID, $mode, $status, true, true );
-			$comment_list_item = ob_get_contents();
-		ob_end_clean();
-		$x->add( array(
-			'what' => 'comment',
-			'id' => $comment->comment_ID,
-			'data' => $comment_list_item
-		) );
-	}
-	$x->send();
-	break;
-case 'get-comments' :
-	check_ajax_referer( $action );
-
-	$post_ID = (int) $_POST['post_ID'];
-	if ( !current_user_can( 'edit_post', $post_ID ) )
-		die('-1');
-
-	$start = isset($_POST['start']) ? intval($_POST['start']) : 0;
-	$num = isset($_POST['num']) ? intval($_POST['num']) : 10;
-
-	list($comments, $total) = _wp_get_comment_list( false, false, $start, $num, $post_ID );
-
-	if ( !$comments )
-		die('1');
-
-	$comment_list_item = '';
-	$x = new WP_Ajax_Response();
-	foreach ( (array) $comments as $comment ) {
-		get_comment( $comment );
-		ob_start();
-			_wp_comment_row( $comment->comment_ID, 'single', false, false );
-			$comment_list_item .= ob_get_contents();
-		ob_end_clean();
-	}
-	$x->add( array(
-		'what' => 'comments',
-		'data' => $comment_list_item
-	) );
-	$x->send();
-	break;
-case 'replyto-comment' :
-	check_ajax_referer( $action );
-
-	$comment_post_ID = (int) $_POST['comment_post_ID'];
-	if ( !current_user_can( 'edit_post', $comment_post_ID ) )
-		die('-1');
-
-	$status = $wpdb->get_var( $wpdb->prepare("SELECT post_status FROM $wpdb->posts WHERE ID = %d", $comment_post_ID) );
-
-	if ( empty($status) )
-		die('1');
-	elseif ( in_array($status, array('draft', 'pending') ) )
-		die( __('Error: you are replying to a comment on a draft post.') );
-
-	$user = wp_get_current_user();
-	if ( $user->ID ) {
-		$comment_author       = $wpdb->escape($user->display_name);
-		$comment_author_email = $wpdb->escape($user->user_email);
-		$comment_author_url   = $wpdb->escape($user->user_url);
-		$comment_content      = trim($_POST['content']);
-		if ( current_user_can('unfiltered_html') ) {
-			if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) {
-				kses_remove_filters(); // start with a clean slate
-				kses_init_filters(); // set up the filters
-			}
-		}
-	} else {
-		die( __('Sorry, you must be logged in to reply to a comment.') );
-	}
-
-	if ( '' == $comment_content )
-		die( __('Error: please type a comment.') );
-
-	$comment_parent = absint($_POST['comment_ID']);
-	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
-
-	$comment_id = wp_new_comment( $commentdata );
-	$comment = get_comment($comment_id);
-	if ( ! $comment ) die('1');
-
-	$modes = array( 'single', 'detail', 'dashboard' );
-	$mode = isset($_POST['mode']) && in_array( $_POST['mode'], $modes ) ? $_POST['mode'] : 'detail';
-	$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
-	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
-
-	if ( get_option('show_avatars') && 'single' != $mode )
-		add_filter( 'comment_author', 'floated_admin_avatar' );
-
-	$x = new WP_Ajax_Response();
-
-	ob_start();
-		if ( 'dashboard' == $mode ) {
-			require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
-			_wp_dashboard_recent_comments_row( $comment, false );
-		} else {
-			_wp_comment_row( $comment->comment_ID, $mode, false, $checkbox );
-		}
-		$comment_list_item = ob_get_contents();
-	ob_end_clean();
-
-	$x->add( array(
-		'what' => 'comment',
-		'id' => $comment->comment_ID,
-		'data' => $comment_list_item,
-		'position' => $position
-	));
-
-	$x->send();
-	break;
-case 'edit-comment' :
-	check_ajax_referer( 'replyto-comment' );
-
-	$comment_post_ID = (int) $_POST['comment_post_ID'];
-	if ( ! current_user_can( 'edit_post', $comment_post_ID ) )
-		die('-1');
-
-	if ( '' == $_POST['content'] )
-		die( __('Error: please type a comment.') );
-
-	$comment_id = (int) $_POST['comment_ID'];
-	$_POST['comment_status'] = $_POST['status'];
-	edit_comment();
-
-	$mode = ( isset($_POST['mode']) && 'single' == $_POST['mode'] ) ? 'single' : 'detail';
-	$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
-	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
-
-	if ( get_option('show_avatars') && 'single' != $mode )
-		add_filter( 'comment_author', 'floated_admin_avatar' );
-
-	$x = new WP_Ajax_Response();
-
-	ob_start();
-		_wp_comment_row( $comment_id, $mode, true, $checkbox );
-		$comment_list_item = ob_get_contents();
-	ob_end_clean();
-
-	$x->add( array(
-		'what' => 'edit_comment',
-		'id' => $comment->comment_ID,
-		'data' => $comment_list_item,
-		'position' => $position
-	));
-
-	$x->send();
-	break;
-case 'add-meta' :
-	check_ajax_referer( 'add-meta' );
-	$c = 0;
-	$pid = (int) $_POST['post_id'];
-	if ( isset($_POST['metakeyselect']) || isset($_POST['metakeyinput']) ) {
-		if ( !current_user_can( 'edit_post', $pid ) )
-			die('-1');
-		if ( '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
-			die('1');
-		if ( $pid < 0 ) {
-			$now = current_time('timestamp', 1);
-			if ( $pid = wp_insert_post( array(
-				'post_title' => sprintf('Draft created on %s at %s', date(get_option('date_format'), $now), date(get_option('time_format'), $now))
-			) ) ) {
-				if ( is_wp_error( $pid ) ) {
-					$x = new WP_Ajax_Response( array(
-						'what' => 'meta',
-						'data' => $pid
-					) );
-					$x->send();
-				}
-				$mid = add_meta( $pid );
-			} else {
-				die('0');
-			}
-		} else if ( !$mid = add_meta( $pid ) ) {
-			die('0');
-		}
-
-		$meta = get_post_meta_by_id( $mid );
-		$pid = (int) $meta->post_id;
-		$meta = get_object_vars( $meta );
-		$x = new WP_Ajax_Response( array(
-			'what' => 'meta',
-			'id' => $mid,
-			'data' => _list_meta_row( $meta, $c ),
-			'position' => 1,
-			'supplemental' => array('postid' => $pid)
-		) );
-	} else {
-		$mid = (int) array_pop(array_keys($_POST['meta']));
-		$key = $_POST['meta'][$mid]['key'];
-		$value = $_POST['meta'][$mid]['value'];
-		if ( !$meta = get_post_meta_by_id( $mid ) )
-			die('0'); // if meta doesn't exist
-		if ( !current_user_can( 'edit_post', $meta->post_id ) )
-			die('-1');
-		if ( !$u = update_meta( $mid, $key, $value ) )
-			die('1'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
-		$key = stripslashes($key);
-		$value = stripslashes($value);
-		$x = new WP_Ajax_Response( array(
-			'what' => 'meta',
-			'id' => $mid, 'old_id' => $mid,
-			'data' => _list_meta_row( array(
-				'meta_key' => $key,
-				'meta_value' => $value,
-				'meta_id' => $mid
-			), $c ),
-			'position' => 0,
-			'supplemental' => array('postid' => $meta->post_id)
-		) );
-	}
-	$x->send();
-	break;
-case 'add-user' :
-	check_ajax_referer( $action );
-	if ( !current_user_can('create_users') )
-		die('-1');
-	require_once(ABSPATH . WPINC . '/registration.php');
-	if ( !$user_id = add_user() )
-		die('0');
-	elseif ( is_wp_error( $user_id ) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'user',
-			'id' => $user_id
-		) );
-		$x->send();
-	}
-	$user_object = new WP_User( $user_id );
-
-	$x = new WP_Ajax_Response( array(
-		'what' => 'user',
-		'id' => $user_id,
-		'data' => user_row( $user_object, '', $user_object->roles[0] ),
-		'supplemental' => array(
-			'show-link' => sprintf(__( 'User <a href="#%s">%s</a> added' ), "user-$user_id", $user_object->user_login),
-			'role' => $user_object->roles[0]
-		)
-	) );
-	$x->send();
-	break;
-case 'autosave' : // The name of this action is hardcoded in edit_post()
-	define( 'DOING_AUTOSAVE', true );
-
-	$nonce_age = check_ajax_referer( 'autosave', 'autosavenonce' );
-	global $current_user;
-
-	$_POST['post_category'] = explode(",", $_POST['catslist']);
-	$_POST['tags_input'] = explode(",", $_POST['tags_input']);
-	if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
-		unset($_POST['post_category']);
-
-	$do_autosave = (bool) $_POST['autosave'];
-	$do_lock = true;
-
-	$data = '';
-	$message = sprintf( __('Draft Saved at %s.'), date( __('g:i:s a'), current_time( 'timestamp', true ) ) );
-
-	$supplemental = array();
-
-	$id = $revision_id = 0;
-	if($_POST['post_ID'] < 0) {
-		$_POST['post_status'] = 'draft';
-		$_POST['temp_ID'] = $_POST['post_ID'];
-		if ( $do_autosave ) {
-			$id = wp_write_post();
-			$data = $message;
-		}
-	} else {
-		$post_ID = (int) $_POST['post_ID'];
-		$_POST['ID'] = $post_ID;
-		$post = get_post($post_ID);
-
-		if ( $last = wp_check_post_lock( $post->ID ) ) {
-			$do_autosave = $do_lock = false;
-
-			$last_user = get_userdata( $last );
-			$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
-			$data = new WP_Error( 'locked', sprintf(
-				$_POST['post_type'] == 'page' ? __( 'Autosave disabled: %s is currently editing this page.' ) : __( 'Autosave disabled: %s is currently editing this post.' ),
-				wp_specialchars( $last_user_name )
-			) );
-
-			$supplemental['disable_autosave'] = 'disable';
-		}
-
-		if ( 'page' == $post->post_type ) {
-			if ( !current_user_can('edit_page', $post_ID) )
-				die(__('You are not allowed to edit this page.'));
-		} else {
-			if ( !current_user_can('edit_post', $post_ID) )
-				die(__('You are not allowed to edit this post.'));
-		}
-
-		if ( $do_autosave ) {
-			// Drafts are just overwritten by autosave
-			if ( 'draft' == $post->post_status ) {
-				$id = edit_post();
-			} else { // Non drafts are not overwritten.  The autosave is stored in a special post revision.
-				$revision_id = wp_create_post_autosave( $post->ID );
-				if ( is_wp_error($revision_id) )
-					$id = $revision_id;
-				else
-					$id = $post->ID;
-			}
-			$data = $message;
-		} else {
-			$id = $post->ID;
-		}
-	}
-
-	if ( $do_lock && $id && is_numeric($id) )
-		wp_set_post_lock( $id );
-
-	if ( $nonce_age == 2 ) {
-		$supplemental['replace-autosavenonce'] = wp_create_nonce('autosave');
-		$supplemental['replace-getpermalinknonce'] = wp_create_nonce('getpermalink');
-		$supplemental['replace-samplepermalinknonce'] = wp_create_nonce('samplepermalink');
-		$supplemental['replace-closedpostboxesnonce'] = wp_create_nonce('closedpostboxes');
-		if ( $id ) {
-			if ( $_POST['post_type'] == 'post' )
-				$supplemental['replace-_wpnonce'] = wp_create_nonce('update-post_' . $id);
-			elseif ( $_POST['post_type'] == 'page' )
-				$supplemental['replace-_wpnonce'] = wp_create_nonce('update-page_' . $id);
-		}
-	}
-
-	$x = new WP_Ajax_Response( array(
-		'what' => 'autosave',
-		'id' => $id,
-		'data' => $id ? $data : '',
-		'supplemental' => $supplemental
-	) );
-	$x->send();
-	break;
-case 'autosave-generate-nonces' :
-	check_ajax_referer( 'autosave', 'autosavenonce' );
-	$ID = (int) $_POST['post_ID'];
-	if($_POST['post_type'] == 'post') {
-		if(current_user_can('edit_post', $ID))
-			die(wp_create_nonce('update-post_' . $ID));
-	}
-	if($_POST['post_type'] == 'page') {
-		if(current_user_can('edit_page', $ID)) {
-			die(wp_create_nonce('update-page_' . $ID));
-		}
-	}
-	die('0');
-break;
-case 'closed-postboxes' :
-	check_ajax_referer( 'closedpostboxes', 'closedpostboxesnonce' );
-	$closed = isset( $_POST['closed'] )? $_POST['closed'] : '';
-	$closed = explode( ',', $_POST['closed'] );
-	$hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : '';
-	$hidden = explode( ',', $_POST['hidden'] );
-	$page = isset( $_POST['page'] )? $_POST['page'] : '';
-	if ( !preg_match( '/^[a-z-_]+$/', $page ) ) {
-		die(-1);
-	}
-	$current_user = wp_get_current_user();
-	if ( is_array($closed) )
-		update_usermeta($current_user->ID, 'closedpostboxes_'.$page, $closed);
-	if ( is_array($hidden) )
-		update_usermeta($current_user->ID, 'meta-box-hidden_'.$page, $hidden);
-break;
-case 'hidden-columns' :
-	check_ajax_referer( 'hiddencolumns', 'hiddencolumnsnonce' );
-	$hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : '';
-	$hidden = explode( ',', $_POST['hidden'] );
-	$page = isset( $_POST['page'] )? $_POST['page'] : '';
-	if ( !preg_match( '/^[a-z-_]+$/', $page ) ) {
-		die(-1);
-	}
-	$current_user = wp_get_current_user();
-	if ( is_array($hidden) )
-		update_usermeta($current_user->ID, "manage-$page-columns-hidden", $hidden);
-break;
-case 'get-permalink':
-	check_ajax_referer( 'getpermalink', 'getpermalinknonce' );
-	$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
-	die(add_query_arg(array('preview' => 'true'), get_permalink($post_id)));
-break;
-case 'sample-permalink':
-	check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' );
-	$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
-	$title = isset($_POST['new_title'])? $_POST['new_title'] : '';
-	$slug = isset($_POST['new_slug'])? $_POST['new_slug'] : '';
-	die(get_sample_permalink_html($post_id, $title, $slug));
-break;
-case 'inline-save':
-	check_ajax_referer( 'inlineeditnonce', '_inline_edit' );
-
-	if ( ! isset($_POST['post_ID']) || ! ( $post_ID = (int) $_POST['post_ID'] ) )
-		exit;
-
-	if ( 'page' == $_POST['post_type'] ) {
-		if ( ! current_user_can( 'edit_page', $post_ID ) )
-			die( __('You are not allowed to edit this page.') );
-	} else {
-		if ( ! current_user_can( 'edit_post', $post_ID ) )
-			die( __('You are not allowed to edit this post.') );
-	}
-
-	if ( $last = wp_check_post_lock( $post_ID ) ) {
-		$last_user = get_userdata( $last );
-		$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
-		printf( $_POST['post_type'] == 'page' ? __( 'Saving is disabled: %s is currently editing this page.' ) : __( 'Saving is disabled: %s is currently editing this post.' ),	wp_specialchars( $last_user_name ) );
-		exit;
-	}
-
-	$data = &$_POST;
-	$post = get_post( $post_ID, ARRAY_A );
-	$data['content'] = $post['post_content'];
-	$data['excerpt'] = $post['post_excerpt'];
-
-	// rename
-	$data['user_ID'] = $GLOBALS['user_ID'];
-
-	if ( isset($data['post_parent']) )
-		$data['parent_id'] = $data['post_parent'];
-
-	// status
-	if ( isset($data['keep_private']) && 'private' == $data['keep_private'] )
-		$data['post_status'] = 'private';
-	else
-		$data['post_status'] = $data['_status'];
-
-	if ( empty($data['comment_status']) )
-		$data['comment_status'] = 'closed';
-	if ( empty($data['ping_status']) )
-		$data['ping_status'] = 'closed';
-
-	// update the post
-	$_POST = $data;
-	edit_post();
-
-	$post = array();
-	if ( 'page' == $_POST['post_type'] ) {
-		$post[] = get_post($_POST['post_ID']);
-		page_rows($post);
-	} elseif ( 'post' == $_POST['post_type'] ) {
-		$mode = $_POST['post_view'];
-		$post[] = get_post($_POST['post_ID']);
-		post_rows($post);
-	}
-
-	exit;
-	break;
-case 'inline-save-tax':
-	check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' );
-
-	if ( ! current_user_can('manage_categories') )
-		die( __('Cheatin&#8217; uh?') );
-
-	if ( ! isset($_POST['tax_ID']) || ! ( $id = (int) $_POST['tax_ID'] ) )
-		die(-1);
-
-	switch ($_POST['tax_type']) {
-		case 'cat' :
-			$data = array();
-			$data['cat_ID'] = $id;
-			$data['cat_name'] = $_POST['name'];
-			$data['category_nicename'] = $_POST['slug'];
-			if ( isset($_POST['parent']) && (int) $_POST['parent'] > 0 )
-				$data['category_parent'] = $_POST['parent'];
-
-			$cat = get_category($id, ARRAY_A);
-			$data['category_description'] = $cat['category_description'];
-
-			$updated = wp_update_category($data);
-
-			if ( $updated && !is_wp_error($updated) )
-				echo _cat_row( $updated, 0 );
-			else
-				die( __('Category not updated.') );
-
-			break;
-		case 'link-cat' :
-			$updated = wp_update_term($id, 'link_category', $_POST);
-
-			if ( $updated && !is_wp_error($updated) )
-				echo link_cat_row($updated['term_id']);
-			else
-				die( __('Category not updated.') );
-
-			break;
-		case 'tag' :
-			$updated = wp_update_term($id, 'post_tag', $_POST);
-			if ( $updated && !is_wp_error($updated) ) {
-				$tag = get_term( $updated['term_id'], 'post_tag' );
-				if ( !$tag || is_wp_error( $tag ) )
-					die( __('Tag not updated.') );
-
-				echo _tag_row($tag);
-			} else {
-				die( __('Tag not updated.') );
-			}
-
-			break;
-	}
-
-	exit;
-	break;
-case 'meta-box-order':
-	check_ajax_referer( 'meta-box-order' );
-	update_user_option( $GLOBALS['current_user']->ID, "meta-box-order_$_POST[page]", $_POST['order'] );
-	die('1');
-	break;
-case 'find_posts':
-	check_ajax_referer( 'find-posts' );
-
-	if ( empty($_POST['ps']) )
-		exit;
-
-	$what = isset($_POST['pages']) ? 'page' : 'post';
-	$s = stripslashes($_POST['ps']);
-	preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
-	$search_terms = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]);
-
-	$searchand = $search = '';
-	foreach( (array) $search_terms as $term) {
-		$term = addslashes_gpc($term);
-		$search .= "{$searchand}(($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%'))";
-		$searchand = ' AND ';
-	}
-	$term = $wpdb->escape($s);
-	if ( count($search_terms) > 1 && $search_terms[0] != $s )
-		$search .= " OR ($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%')";
-
-	$posts = $wpdb->get_results( "SELECT ID, post_title, post_status, post_date FROM $wpdb->posts WHERE post_type = '$what' AND $search ORDER BY post_date_gmt DESC LIMIT 50" );
-
-	if ( ! $posts )
-		exit( __('No posts found.') );
-
-	$html = '<table class="widefat"><thead><tr><th class="found-radio"><br /></th><th>'.__('Title').'</th><th>'.__('Time').'</th><th>'.__('Status').'</th></tr></thead><tbody>';
-	foreach ( $posts as $post ) {
-
-		switch ( $post->post_status ) {
-			case 'publish' :
-			case 'private' :
-				$stat = __('Published');
-				break;
-			case 'future' :
-				$stat = __('Scheduled');
-				break;
-			case 'pending' :
-				$stat = __('Pending Review');
-				break;
-			case 'draft' :
-				$stat = __('Unpublished');
-				break;
-		}
-
-		if ( '0000-00-00 00:00:00' == $post->post_date ) {
-			$time = '';
-		} else {
-			$time = mysql2date(__('Y/m/d'), $post->post_date);
-		}
-
-		$html .= '<tr class="found-posts"><td class="found-radio"><input type="radio" id="found-'.$post->ID.'" name="found_post_id" value="'.$post->ID.'"></td>';
-		$html .= '<td><label for="found-'.$post->ID.'">'.wp_specialchars($post->post_title, true).'</label></td><td>'.wp_specialchars($time, true).'</td><td>'.wp_specialchars($stat, true).'</td></tr>'."\n\n";
-	}
-	$html .= '</tbody></table>';
-
-	$x = new WP_Ajax_Response();
-	$x->add( array(
-		'what' => $what,
-		'data' => $html
-	));
-	$x->send();
-
-	break;
-default :
-	do_action( 'wp_ajax_' . $_POST['action'] );
-	die('0');
-	break;
-endswitch;
-?>
diff -uNr a/mp-wp/wp-admin/admin-footer.php b/mp-wp/wp-admin/admin-footer.php
--- a/mp-wp/wp-admin/admin-footer.php 6a85d8646f911c892da3e7753a5a49f408c854070abcfd418440ebf76548a350d3f87122a335c8640dc2c22ab37e80ca9af907279d87b57b3142fd74f10bd201
+++ b/mp-wp/wp-admin/admin-footer.php 2079aa7b07deebc0b731f79b5035974be595af08deabff16b0526337252257c55c6bd71c894e0031a8bc6c6f2c27251ad86cfc9139c33f0884d17a1ad4e50320
@@ -12,17 +12,6 @@
 <div class="clear"></div></div><!-- wpcontent -->
 </div><!-- wpwrap -->
 
-<div id="footer">
-<p id="footer-left" class="alignleft"><?php
-do_action( 'in_admin_footer' );
-$upgrade = apply_filters( 'update_footer', '' );
-echo '<span id="footer-thankyou">' . __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.').'</span> | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>'); ?>
-</p>
-<?php // if ( $is_IE ) browse_happy(); ?>
-<p id="footer-upgrade" class="alignright"><?php echo $upgrade; ?></p>
-<div class="clear"></div>
-</div>
 <?php do_action('admin_footer', ''); ?>
-<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff -uNr a/mp-wp/wp-admin/admin-header.php b/mp-wp/wp-admin/admin-header.php
--- a/mp-wp/wp-admin/admin-header.php 34f1ef463ad4d0ffbb338851cab80259f68f8a133728d15279c40b181f47635009c33776fb83203ed9d86357e5d857464ad465622a3c64ef7db587fe0862fd2e
+++ b/mp-wp/wp-admin/admin-header.php 223b71699a0aea566577db897ceb9c0fcdfc65b0ec036e20023f3a067a4767355235276f08a0b16503d1cb8e4a49c3fd9f7d6eeda927899111181942ee065860
@@ -25,33 +25,6 @@
 wp_admin_css( 'css/colors' );
 wp_admin_css( 'css/ie' );
 
-?>
-<script type="text/javascript">
-//<![CDATA[
-addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document).ready(func); else if (typeof wpOnload!='function'){wpOnload=func;} else {var oldonload=wpOnload; wpOnload=function(){oldonload();func();}}};
-
-function convertEntities(o) {
-	var c = function(s) {
-		if (/&[^;]+;/.test(s)) {
-			var e = document.createElement("div");
-			e.innerHTML = s;
-			return !e.firstChild ? s : e.firstChild.nodeValue;
-		}
-		return s;
-	}
-
-	if ( typeof o === 'string' )
-		return c(o);
-	else if ( typeof o === 'object' )
-		for (var v in o) {
-			if ( typeof o[v] === 'string' )
-				o[v] = c(o[v]);
-		}
-	return o;
-};
-//]]>
-</script>
-<?php
 $hook_suffix = '';
 if ( isset($page_hook) )
 	$hook_suffix = "$page_hook";
@@ -103,22 +76,14 @@
 <p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?> |
 <a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p>
 </div>
-
-<?php favorite_actions(); ?>
 </div>
 </div>
 
-<?php if ( get_user_setting('mfold') == 'f' ) { ?>
-<script type="text/javascript">jQuery('#wpcontent').addClass('folded');</script>
-<?php } ?>
-
 <div id="wpbody">
 <?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
 
 <div id="wpbody-content">
 <?php
-screen_meta($hook_suffix);
-
 do_action('admin_notices');
 
 if ( $parent_file == 'options-general.php' ) {
diff -uNr a/mp-wp/wp-admin/admin.php b/mp-wp/wp-admin/admin.php
--- a/mp-wp/wp-admin/admin.php f6b402db844d90d3ad27413bafa675eb850618c500175351f9bfd097e25f648b0df1c4b69c72d45b0d08a1efd83af097b90d09da87f5cc2332e90e6a7b71fc2f
+++ b/mp-wp/wp-admin/admin.php d496746dd161da677abea8f6a78d6d4a6dd2e02c4078ae8d48900e621644723624211499257a2167f1080a4cf71cfe095c8c50cb337b63aae196dbff5a46e73e
@@ -38,12 +38,6 @@
 
 wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
 
-wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7'));
-wp_admin_css_color('fresh', __('Gray'), admin_url("css/colors-fresh.css"), array('#464646', '#6D6D6D', '#F1F1F1', '#DFDFDF'));
-
-wp_enqueue_script( 'common' );
-wp_enqueue_script( 'jquery-color' );
-
 $editing = false;
 
 if (isset($_GET['page'])) {
diff -uNr a/mp-wp/wp-admin/categories.php b/mp-wp/wp-admin/categories.php
--- a/mp-wp/wp-admin/categories.php 371f8d02e7129db277beb5e47bc9bc2ebcfd2027d8361e13b2ec6e4c50ec3d307144e3a8a8b1d4731a5aee6c179201a0a59f21fccf358be59d9f0be4a77f6c5e
+++ b/mp-wp/wp-admin/categories.php 4dbb910f9f1a943c1f5fce4949b27254fce7962131884b836ac44e70eb588c39c4c160a93c6ca39b541a5fa8eb8156d785821286dc893d494083f4fb0c6789ed
@@ -13,7 +13,7 @@
 
 wp_reset_vars( array('action', 'cat') );
 
-if ( isset( $_GET['action'] ) && isset($_GET['delete']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) )
+if ( isset( $_GET['action'] ) && isset($_GET['delete']) && 'delete' == $_GET['action'] )
 	$action = 'bulk-delete';
 
 switch($action) {
@@ -116,10 +116,6 @@
 	 exit;
 }
 
-wp_enqueue_script('admin-categories');
-if ( current_user_can('manage_categories') )
-	wp_enqueue_script('inline-edit-tax');
-
 require_once ('admin-header.php');
 
 $messages[1] = __('Category added.');
@@ -198,13 +194,6 @@
 <?php print_column_headers('categories'); ?>
 	</tr>
 	</thead>
-
-	<tfoot>
-	<tr>
-<?php print_column_headers('categories', false); ?>
-	</tr>
-	</tfoot>
-
 	<tbody id="the-list" class="list:cat">
 <?php
 cat_rows(0, 0, 0, $pagenum, $catsperpage);
@@ -212,29 +201,10 @@
 	</tbody>
 </table>
 
-<div class="tablenav">
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php wp_nonce_field('bulk-categories'); ?>
-</div>
-
-<br class="clear" />
-</div>
-
 </form>
 
 <div class="form-wrap">
 <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_catname(get_option('default_category')))) ?></p>
-<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
 </div>
 
 </div>
@@ -248,7 +218,6 @@
 
 <div class="form-wrap">
 <h3><?php _e('Add Category'); ?></h3>
-<div id="ajax-response"></div>
 <form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate">
 <input type="hidden" name="action" value="addcat" />
 <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-category'); ?>
@@ -289,24 +258,7 @@
 </div><!-- /col-container -->
 </div><!-- /wrap -->
 
-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
-	$(document).ready(function(){
-		$('#doaction, #doaction2').click(function(){
-			if ( $('select[name^="action"]').val() == 'delete' ) {
-				var m = '<?php echo js_escape(__("You are about to delete the selected categories.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
-				return showNotice.warn(m);
-			}
-		});
-	});
-})(jQuery);
-/* ]]> */
-</script>
-
 <?php
-inline_edit_term_row('categories');
-
 break;
 }
 
diff -uNr a/mp-wp/wp-admin/comment.php b/mp-wp/wp-admin/comment.php
--- a/mp-wp/wp-admin/comment.php 95cd3acdf8d8f8a91ce0ab861b2c93d2381569a13662bd482800ff53744488185f2d1c7371d10ba8e0d7a109447f41a094826099d0e4f6486915ffc158f812fa
+++ b/mp-wp/wp-admin/comment.php ed22a73f23acd962cf4004162dffad5ff546c1634d597f7971bfa7e54f6e1532512cb7b0c9b884d9bea3eca0d308f526d2ab9dec5f9e9850d9f7e5a4ae986fa8
@@ -33,13 +33,12 @@
 case 'editcomment' :
 	$title = __('Edit Comment');
 
-	wp_enqueue_script('comment');
 	require_once('admin-header.php');
 
 	$comment_id = absint( $_GET['c'] );
 
 	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'javascript:history.go(-1)') );
+		comment_footer_die( __('Oops, no comment with this ID.') );
 
 	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
 		comment_footer_die( __('You are not allowed to edit comments on this post.') );
@@ -90,7 +89,7 @@
 
 <table width="100%">
 <tr>
-<td><input type='button' class="button" value='<?php _e('No'); ?>' onclick="self.location='<?php echo admin_url('edit-comments.php'); ?>" /></td>
+<td><a class="button" href="<?php echo admin_url('edit-comments.php'); ?>"><?php _e('No'); ?></a></td>
 <td class="textright"><input type='submit' class="button" value='<?php echo $button; ?>' /></td>
 </tr>
 </table>
@@ -237,4 +236,4 @@
 
 include('admin-footer.php');
 
-?>
\ No newline at end of file
+?>
diff -uNr a/mp-wp/wp-admin/css/colors-classic-rtl.css b/mp-wp/wp-admin/css/colors-classic-rtl.css
--- a/mp-wp/wp-admin/css/colors-classic-rtl.css 98c41d5b6114f6a84f3b26b20df0dc247db3515b4319c140ee9e82935f9b824f41f6a2e1981c9f93e2c8955a8de88bc10dda4cf2450178ef036b2c360f9a08e6
+++ b/mp-wp/wp-admin/css/colors-classic-rtl.css false
@@ -1,80 +0,0 @@
-.bar {
-	border-right-color: transparent;
-	border-left-color: #99d;
-}
-
-.plugins .togl {
-	border-right-color: transparent;
-	border-left-color: #ccc;
-}
-
-.post-com-count {
-	background-image: url(../images/bubble_bg-rtl.svg);
-}
-.tablenav .tablenav-pages a {
-	background: #eee url('../images/menu-bits-rtl.svg') repeat-x scroll right -379px;
-}
-#upload-menu li.current {
-	border-right-color: transparent;
-	border-left-color: #448abd;
-}
-
-#adminmenu .wp-submenu .current a.current {
-	background: transparent url(../images/menu-bits-rtl.svg) no-repeat scroll  right -289px;
-}
-
-#adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.svg) no-repeat scroll right -34px;
-}
-
-.folded #adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.svg) no-repeat scroll left 5px;
-}
-
-#adminmenu li.wp-has-current-submenu .wp-menu-toggle,
-#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl.svg) repeat-x scroll right -207px;
-}
-
-#adminmenu .wp-has-current-submenu ul li a.current {
-	background: url(../images/menu-dark-rtl.svg) top right no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu .menu-top .current {
-	background: url(../images/menu-bits-rtl.svg) top right repeat-x;
-}
-
-#adminmenu li.wp-has-current-submenu ul li a {
-	background: url(../images/menu-dark-rtl.svg) bottom right no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl.svg) no-repeat right -207px;
-}
-
-#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
-#adminmenu .wp-menu-open .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl.svg) repeat-x scroll right -109px;
-}
-
-#adminmenu a.wp-has-submenu {
-	background: #f1f1f1 url(../images/menu-bits-rtl.svg) repeat-x scroll right -379px;
-}
-
-#adminmenu .wp-submenu a {
-	background: #FFFFFF url(../images/menu-bits-rtl.svg) no-repeat scroll right -310px;
-}
-
-#adminmenu li.current a,
-#adminmenu .wp-submenu a:hover {
-	background: transparent url(../images/menu-bits-rtl.svg) no-repeat scroll  right -289px;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-submenu {
-	background: #b5b5b5 url(../images/menu-bits-rtl.svg) repeat-x scroll right top;
-}
-
-.meta-box-sortables .postbox:hover .handlediv {
-	background: transparent url(../images/menu-bits-rtl.svg) no-repeat scroll right -111px;
-}
diff -uNr a/mp-wp/wp-admin/css/colors-classic.css b/mp-wp/wp-admin/css/colors-classic.css
--- a/mp-wp/wp-admin/css/colors-classic.css 39b755fafd1e9c60473f1355dfd9eb98d15d65c8c0e9a41b68792c390d585e40339b51152c4b93b40b3fda9a43c3dad38feed579325f786175521b1ab55b2d7c
+++ b/mp-wp/wp-admin/css/colors-classic.css false
@@ -1,1358 +0,0 @@
-html {
-	background-color: #F5FCFD;
-}
-
-.find-box-search {
-	border-color: #dfdfdf;
-	background-color: #f1f1f1;
-}
-
-.find-box {
-	background-color: #f1f1f1;
-}
-
-.find-box-inside {
-	background-color: #fff;
-}
-
-a.page-numbers:hover {
-	border-color: #999;
-}
-
-body,
-#wpbody,
-.form-table .pre {
-	color: #333;
-}
-
-body > #upload-menu {
-	border-bottom-color: #fff;
-}
-
-kbd, code {
-	background: #eaeaea;
-}
-
-div#current-widgets,
-#postcustomstuff table,
-#your-profile fieldset,
-#rightnow,
-div.dashboard-widget,
-#dashboard-widgets p.dashboard-widget-links,
-#replyrow #ed_reply_toolbar input {
-	border-color: #ccc;
-}
-
-#poststuff .inside label.spam {
-	color: red;
-}
-
-#poststuff .inside label.waiting {
-	color: orange;
-}
-
-#poststuff .inside label.approved {
-	color: green;
-}
-
-#postcustomstuff table {
-	border-color: #dfdfdf;
-	background-color: #F9F9F9;
-}
-
-#postcustomstuff thead th {
-	background-color: #F1F1F1;
-}
-
-#postcustomstuff table input,
-#postcustomstuff table textarea {
-	border-color: #dfdfdf;
-	background-color: #fff;
-}
-
-.widefat {
-	border-color: #BBD8E7;
-	background-color: #fff;
-}
-
-div.dashboard-widget-error {
-	background-color: #c43;
-}
-
-div.dashboard-widget-notice {
-	background-color: #cfe1ef;
-}
-
-div.dashboard-widget-submit,
-ul.widget-control-list div.widget-control-actions {
-	border-top-color: #ccc;
-}
-
-div.ui-tabs-panel {
-	border-color: #f1f1f1;
-}
-
-ul#category-tabs li.ui-tabs-selected {
-	background-color: #f1f1f1;
-}
-
-input.disabled,
-textarea.disabled {
-	background-color: #ccc;
-}
-/* #upload-menu li a.upload-tab-link, */
-li.widget-list-control-item h4.widget-title a:hover,
-li.widget-list-control-item h4.widget-title a,
-#dragHelper li.widget-list-control-item h4.widget-title a,
-#draghelper li.widget-list-control-item h4.widget-title a:visited,
-.login #backtoblog a:hover,
-#plugin-information .action-button a,
-#plugin-information .action-button a:hover,
-#plugin-information .action-button a:visited {
-	color: #fff;
-}
-
-li.widget-list-control-item div.widget-control {
-	background-color: #fff;
-	border-color: #dfdfdf;
-}
-
-.metabox-holder .postbox h3,
-#poststuff .postbox h3,
-#poststuff .stuffbox h3 {
-	background: #dfdfdf url("../images/blue-grad.svg") repeat-x left top;
-	text-shadow: #fff 0 1px 0;
-}
-
-.form-table th,
-.form-wrap label {
-	color: #222;
-	text-shadow: #fff 0 1px 0;
-}
-
-.setting-description, .form-wrap p {
-	color: #666;
-}
-
-select {
-	background-color: #fff;
-	border-color: #8CBDD5;
-}
-
-strong .post-com-count span {
-	background-color: #21759b;
-}
-
-ul#widget-list li.widget-list-item h4.widget-title {
-	background-color: #f0f0f0;
-	color: #000;
-}
-
-.sorthelper {
-	background-color: #ccf3fa;
-}
-
-.ac_match, .subsubsub a.current {
-	color: #000;
-}
-
-.wrap h2 {
-	color: #093E56;
-}
-
-.ac_over {
-	background-color: #f0f0b8;
-}
-
-.ac_results {
-	background-color: #fff;
-	border-color: #808080;
-}
-
-.ac_results li {
-	color: #101010;
-}
-
-.alternate, .alt {
-	background-color: #EDFBFC;
-}
-
-.available-theme a.screenshot {
-	background-color: #f1f1f1;
-	border-color: #ddd;
-}
-
-.bar {
-	background-color: #e8e8e8;
-	border-right-color: #99d;
-}
-
-#media-upload {
-	background: #fff;
-}
-#media-upload .slidetoggle {
-	border-top-color: #dfdfdf;
-}
-
-.error, #login #login_error {
-	background-color: #ffebe8;
-	border-color: #c00;
-}
-
-.error a {
-	color: #c00;
-}
-
-.form-invalid {
-	background-color: #ffebe8 !important;
-}
-
-.form-invalid input {
-	border-color: #c00 !important;
-}
-
-.form-table input,
-.form-table textarea,
-.search-input,
-.form-field input,
-.form-field textarea,
-.submit {
-	border-color: #8CBDD5;
-}
-
-.highlight {
-	background-color: #e4f2fd;
-	color: #d54e21;
-}
-
-.howto,
-.nonessential,
-#edit-slug-box,
-.form-input-tip,
-.rss-widget span.rss-date,
-.subsubsub {
-	color: #666;
-}
-
-.media-item {
-	border-bottom-color: #dfdfdf;
-}
-
-#wpbody-content #media-items .describe {
-	border-top-color: #dfdfdf;
-}
-
-.describe input[type="text"],
-.describe textarea {
-	border-color: #dfdfdf;
-}
-
-.media-upload-form label.form-help,
-td.help {
-	color: #9a9a9a;
-}
-
-.post-com-count {
-	background-image: url(../images/bubble_bg.svg);
-	color: #fff;
-}
-
-.post-com-count span {
-	background-color: #bbb;
-	color: #fff;
-}
-
-.post-com-count:hover span {
-	background-color: #d54e21;
-}
-
-.quicktags, .search {
-	background-color: #ccc;
-	color: #000;
-}
-
-.side-info h5, .bordertitle {
-	border-bottom-color: #dadada;
-}
-
-.side-info ul, .widget-description {
-	color: #666;
-}
-
-.button,
-.button-secondary,
-.submit input,
-input[type=button],
-input[type=submit] {
-	border-color: #8CBDD5;
-	color: #093E56;
-}
-
-.button:hover,
-.button-secondary:hover,
-.submit input:hover,
-input[type=button]:hover,
-input[type=submit]:hover {
-	color: #000;
-	border-color: #21759B;
-}
-
-.button,
-.submit input,
-.button-secondary {
-	background: #f2f2f2 url(../images/white-grad.svg) repeat-x scroll left top;
-}
-
-.button:active,
-.submit input:active,
-.button-secondary:active {
-	background: #eee url(../images/white-grad-active.svg) repeat-x scroll left top;
-}
-
-.button-primary,
-.submit .button-primary,
-#login form .submit input {
-	border-color: #298cba !important;
-	font-weight: bold;
-	color: #FFF !important;
-	background: #21759B url(../images/button-grad.svg) repeat-x scroll left top;
-}
-
-.button-primary:active,
-#login form .submit input:active {
-	background: #21759b url(../images/button-grad-active.svg) repeat-x scroll left top !important;
-}
-
-.button[disabled],
-.button:disabled,
-.button-secondary[disabled],
-.button-secondary:disabled,
-a.button.disabled {
-	color: #ccc !important;
-	border-color: #ccc;
-}
-
-.button-primary[disabled],
-.button-primary:disabled {
-	color: #2fa0d5 !important;
-}
-
-a:active,
-a:focus {
-	color: #d54e21;
-}
-
-a:hover,
-#wphead #viewsite a:hover,
-#adminmenu a:hover,
-#adminmenu ul.wp-submenu a:hover,
-#the-comment-list .comment a:hover,
-#rightnow a:hover,
-.subsubsub a:hover,
-.subsubsub a.current:hover,
-#login form .submit input:hover,
-div.dashboard-widget-submit input:hover,
-#media-upload a.del-link:hover,
-.ui-tabs-nav a:hover {
-	color: #d54e21;
-}
-
-#the-comment-list .comment-item,
-#dashboard-widgets #dashboard_quick_press form p.submit {
-	border-color: #dfdfdf;
-}
-
-.button-primary:hover,
-#login form .submit input:hover {
-	border-color: #13455b !important;
-	color: #EAF2FA !important;
-}
-
-#side-info-column #category-tabs .ui-tabs-selected a {
-	color: #333;
-}
-
-#rightnow .rbutton {
-	background-color: #ebebeb;
-	color: #264761;
-}
-
-.submitbox .submit {
-	background-color: #464646;
-	color: #ccc;
-}
-
-.submitbox .submitdelete, a.delete {
-	color: #f00;
-	border-bottom-color: #f00;
-}
-
-.submitbox .submitdelete:hover,
-#media-upload a.delete:hover {
-	color: #fff;
-	background-color: #f00;
-	border-bottom-color: #f00;
-}
-
-#normal-sortables .submitbox .submitdelete:hover {
-	color: #000;
-	background-color: #f00;
-	border-bottom-color: #f00;
-}
-
-.tablenav .dots {
-	border-color: transparent;
-}
-
-.tablenav .next,
-.tablenav .prev {
-	border-color: transparent;
-	color: #21759b;
-}
-
-.tablenav .next:hover,
-.tablenav .prev:hover {
-	border-color: transparent;
-	color: #d54e21;
-}
-
-.updated,
-.login #login_error,
-.login .message {
-	background-color: #ffffe0;
-	border-color: #e6db55;
-}
-
-a.page-numbers {
-	border-bottom-color: #B8D3E2;
-}
-
-div#available-widgets-filter,
-ul#widget-list li.widget-list-item,
-.commentlist li {
-	border-bottom-color: #ccc;
-}
-
-.widefat td,
-.widefat th {
-	border-bottom-color: #BBD8E7;
-}
-
-.widefat th {
-	text-shadow: rgba(255,255,255,0.8) 0 1px 0;
-}
-
-.widefat thead tr th,
-.widefat tfoot tr th,
-h3.dashboard-widget-title,
-h3.dashboard-widget-title span,
-h3.dashboard-widget-title small,
-.find-box-head {
-	color: #333;
-	background: #dfdfdf url(../images/blue-grad.svg) repeat-x scroll left top;
-}
-
-h3.dashboard-widget-title small a {
-	color: #d7d7d7;
-}
-
-h3.dashboard-widget-title small a:hover {
-	color: #fff;
-}
-
-#adminmenu a,
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML,
-#the-comment-list p.comment-author strong a,
-#media-upload a.del-link,
-#media-upload a.delete,
-.ui-tabs-nav a, a {
-	color: #1C6280;
-}
-
-#adminmenu #awaiting-mod,
-#adminmenu .update-plugins,
-#sidemenu a .update-plugins,
-#rightnow .reallynow,
-#plugin-information .action-button {
-	background-color: #d54e21;
-	color: #fff;
-}
-
-#adminmenu li a:hover #awaiting-mod,
-#adminmenu li a:hover .update-plugins,
-#sidemenu li a:hover .update-plugins {
-	background-color: #264761;
-	color: #fff;
-}
-
-#adminmenu li.current a #awaiting-mod,
-#adminmenu li.current a .update-plugins,
-#adminmenu li.wp-has-current-submenu a .update-plugins,
-#adminmenu li.wp-has-current-submenu a .update-plugins {
-	background-color: #ddd;
-	color: #000;
-	text-shadow: none;
-	-moz-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
-	-khtml-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
-	-webkit-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
-	box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
-}
-
-#adminmenu li.current a:hover #awaiting-mod,
-#adminmenu li.current a:hover .update-plugins,
-#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod,
-#adminmenu li.wp-has-current-submenu a:hover .update-plugins {
-	background-color: #264761;
-	color: #fff;
-}
-
-div#media-upload-header {
-	background-color: #f9f9f9;
-	border-bottom-color: #dfdfdf;
-}
-
-div#plugin-information-header {
-	background-color: #e4f2fd;
-	border-bottom-color: #c6d9e9;
-}
-
-#currenttheme img {
-	border-color: #666;
-}
-
-#current-widgets .drop-widget-here {
-	background-color: #ffc;
-}
-
-#dashboard_secondary div.dashboard-widget-content ul li a {
-	background-color: #f9f9f9;
-}
-
-input.readonly, textarea.readonly {
-	background-color: #ddd;
-}
-
-#dragHelper h4.widget-title,
-li.widget-list-control-item h4,
-#dragHelper li.widget-list-control-item h4 {
-	background-color: #2683ae;
-	color: #fff;
-}
-
-#ed_toolbar input,
-#ed_reply_toolbar input {
-	background: #fff url("../images/fade-butt.svg") repeat-x 0 -2px;
-}
-
-#editable-post-name {
-	background-color: #fffbcc;
-}
-
-#edit-slug-box strong,
-.tablenav .displaying-num,
-#submitted-on {
-	color: #777;
-}
-
-.login #nav a {
-	color: #21759b !important;
-}
-
-.login #nav a:hover {
-	color: #d54e21 !important;
-}
-
-#footer,
-#footer-upgrade {
-	background: #073447;
-	color: #999;
-}
-
-#media-items {
-	border-color: #dfdfdf;
-}
-
-#pass-strength-result {
-	background-color: #eee;
-	border-color: #ddd !important;
-}
-
-#pass-strength-result.bad {
-	background-color: #ffb78c;
-	border-color: #ff853c !important;
-}
-
-#pass-strength-result.good {
-	background-color: #ffec8b;
-	border-color: #fc0 !important;
-}
-
-#pass-strength-result.short {
-	background-color: #ffa0a0;
-	border-color: #f04040 !important;
-}
-
-#pass-strength-result.strong {
-	background-color: #c3ff88;
-	border-color: #8dff1c !important;
-}
-
-.checkbox,
-.side-info {
-	background-color: #fff;
-}
-
-.plugins .active {
-	background-color: #e7f7d3;
-}
-
-.plugins .togl {
-	border-right-color: #ccc;
-}
-
-#the-comment-list .unapproved {
-	background-color: #ffffe0;
-}
-
-#the-comment-list .approve a {
-	color: #006505;
-}
-
-#the-comment-list .unapprove a {
-	color: #d98500;
-}
-
-#the-comment-list .delete a {
-	color: #bc0b0b;
-}
-
-.plugins tr {
-	background-color: #fff;
-}
-
-.metabox-holder .postbox,
-#poststuff .postbox,
-#titlediv,
-#poststuff .postarea,
-#poststuff .stuffbox,
-.postbox input[type="text"],
-.postbox textarea,
-.stuffbox input[type="text"],
-.stuffbox textarea {
-	border-color: #BBD8E7;
-}
-
-.metabox-holder .postbox,
-#poststuff .postbox {
-	background-color: #FFF;
-}
-
-.ui-sortable .postbox h3 {
-	color: #093E56;
-}
-
-.ui-sortable .postbox h3:hover {
-	color: #000;
-}
-
-.curtime #timestamp {
-	background-image: url(../images/date-button.svg);
-}
-
-#quicktags #ed_link {
-	color: #00f;
-}
-
-#rightnow .youhave {
-	background-color: #f0f6fb;
-}
-
-#rightnow a {
-	color: #448abd;
-}
-
-#tagchecklist span a,
-#bulk-titles div a {
-	background: url(../images/xit.svg) no-repeat;
-}
-
-#tagchecklist span a:hover,
-#bulk-titles div a:hover {
-	background: url(../images/xit.svg) no-repeat -10px 0;
-}
-
-#update-nag, .plugin-update {
-	background-color: #fffeeb;
-	border-bottom-color: #ccc;
-	border-top-color: #ccc;
-	color: #555;
-}
-
-.login #backtoblog a {
-	color: #ccc;
-}
-
-#wphead {
-	background-color: #073447;
-}
-
-body.login {
-	border-top-color: #093E56;
-}
-
-#wphead h1 a {
-	color: #fff;
-}
-
-#login form input {
-	color: #555;
-}
-
-#wphead h1 a:hover {
-	text-decoration: underline;
-}
-
-#user_info {
-	color: #999;
-}
-
-#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited {
-	color: #ccc;
-	text-decoration: none;
-}
-
-#user_info a:hover, #footer a:hover {
-	color: #fff;
-	text-decoration: underline !important;
-}
-
-#user_info a:active, #footer a:active {
-	color: #ccc !important;
-}
-
-div#media-upload-error,
-.file-error,
-abbr.required,
-.widget-control-remove:hover,
-.delete a:hover {
-	color: #f00;
-}
-
-#media-upload a.delete {
-	color: #888;
-}
-
-/* editors */
-#quicktags {
-	border-color: #dfdfdf;
-	background-color: #dfdfdf;
-}
-
-#ed_toolbar input {
-	border-color: #C3C3C3;
-}
-
-#ed_toolbar input:hover {
-	border-color: #aaa;
-	background: #ddd;
-}
-
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
-	background-color: #f1f1f1;
-	border-color: #dfdfdf;
-	color: #999;
-}
-
-#poststuff #editor-toolbar .active {
-	border-bottom-color: #e9e9e9;
-	background-color: #e9e9e9;
-	color: #333;
-}
-
-#editorcontainer,
-#post-status-info,
-#titlediv #title {
-	border-color: #dfdfdf;
-}
-
-#titlediv #title {
-	background-color: #fff;
-}
-
-#tTips p#tTips_inside {
-	background-color: #ddd;
-	color: #333;
-}
-
-#timestampdiv input,
-#namediv input,
-#tagsdiv #the-tagcloud {
-	border-color: #ddd;
-}
-
-/* menu */
-#adminmenu * {
-	border-color: #BBD8E7;
-}
-
-#adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.svg) no-repeat scroll left 5px;
-}
-
-.folded #adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.svg) no-repeat scroll right -34px;
-}
-
-#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
-#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits.svg) no-repeat scroll left -207px;
-}
-
-#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
-#adminmenu .wp-menu-open .wp-menu-toggle {
-	background: transparent url(../images/menu-bits.svg) no-repeat scroll left -109px;
-}
-
-#adminmenu a.menu-top {
-	background: #EAF3FA url(../images/menu-bits.svg) repeat-x scroll left -379px;
-}
-
-#adminmenu .wp-submenu a {
-	background: #FFFFFF url(../images/menu-bits.svg) no-repeat scroll 0 -310px;
-}
-
-#adminmenu .wp-has-current-submenu ul li a {
-	background: none;
-}
-
-#adminmenu .wp-has-current-submenu ul li a.current {
-	background: url(../images/menu-dark.svg) top left no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu .menu-top .current {
-	background: #6d6d6d url(../images/menu-bits.svg) top left repeat-x;
-	border-color: #6d6d6d;
-	color: #fff;
-	text-shadow: rgba(0,0,0,0.4) 0px -1px 0px;
-}
-
-#adminmenu li.wp-has-current-submenu .wp-submenu,
-#adminmenu li.wp-has-current-submenu ul li a {
-	border-color: #aaa !important;
-}
-
-#adminmenu li.wp-has-current-submenu ul li a {
-	background: url(../images/menu-dark.svg) bottom left no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu ul {
-	border-bottom-color: #aaa;
-}
-
-#adminmenu li.menu-top .current:hover {
-	border-color: #B5B5B5;
-}
-
-#adminmenu .wp-submenu .current a.current {
-	background: transparent url(../images/menu-bits.svg) no-repeat scroll  0 -289px;
-}
-
-#adminmenu .wp-submenu a:hover {
-	background-color: #EAF2FA !important;
-	color: #333 !important;
-}
-
-#adminmenu .wp-submenu li.current,
-#adminmenu .wp-submenu li.current a,
-#adminmenu .wp-submenu li.current a:hover {
-	color: #333;
-	background-color: #f5f5f5;
-	background-image: none;
-	border-color: #e3e3e3;
-	text-shadow: rgba(255,255,255,1) 0px 1px 0px;
-}
-
-#adminmenu .wp-submenu ul {
-	background-color: #fff;
-}
-
-.folded #adminmenu li.menu-top,
-#adminmenu .wp-submenu .wp-submenu-head {
-	background-color: #EAF2FA;
-}
-
-.folded #adminmenu li.wp-has-current-submenu,
-.folded #adminmenu li.menu-top.current {
-	background-color: #BBD8E7;
-}
-
-#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head {
-	background-color: #BBD8E7;
-	border-color: #8CBDD5;
-}
-
-#adminmenu div.wp-submenu {
-	background-color: transparent;
-}
-
-/* menu icons */
-#adminmenu #menu-dashboard div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -61px -33px;
-}
-
-#adminmenu #menu-dashboard:hover div.wp-menu-image,
-#adminmenu  #menu-dashboard.wp-has-current-submenu div.wp-menu-image,
-#adminmenu  #menu-dashboard.current div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -61px -1px;
-}
-
-#adminmenu #menu-posts div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -272px -33px;
-}
-
-#adminmenu #menu-posts:hover div.wp-menu-image,
-#adminmenu #menu-posts.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -272px -1px;
-}
-
-#adminmenu #menu-media div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -121px -33px;
-}
-
-#adminmenu #menu-media:hover div.wp-menu-image,
-#adminmenu #menu-media.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -121px -1px;
-}
-
-#adminmenu #menu-links div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -91px -33px;
-}
-
-#adminmenu #menu-links:hover div.wp-menu-image,
-#adminmenu #menu-links.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -91px -1px;
-}
-
-#adminmenu #menu-pages div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -151px -33px;
-}
-
-#adminmenu #menu-pages:hover div.wp-menu-image,
-#adminmenu #menu-pages.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -151px -1px;
-}
-
-#adminmenu #menu-comments div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -31px -33px;
-}
-
-#adminmenu #menu-comments:hover div.wp-menu-image,
-#adminmenu #menu-comments.wp-has-current-submenu div.wp-menu-image,
-#adminmenu #menu-comments.current div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -31px -1px;
-}
-
-#adminmenu #menu-appearance div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -1px -33px;
-}
-
-#adminmenu #menu-appearance:hover div.wp-menu-image,
-#adminmenu #menu-appearance.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -1px -1px;
-}
-
-#adminmenu #menu-plugins div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -181px -33px;
-}
-
-#adminmenu #menu-plugins:hover div.wp-menu-image,
-#adminmenu #menu-plugins.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -181px -1px;
-}
-
-#adminmenu #menu-users div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -301px -33px;
-}
-
-#adminmenu #menu-users:hover div.wp-menu-image,
-#adminmenu #menu-users.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -301px -1px;
-}
-
-#adminmenu #menu-tools div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -211px -33px;
-}
-
-#adminmenu #menu-tools:hover div.wp-menu-image,
-#adminmenu #menu-tools.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -211px -1px;
-}
-
-#adminmenu #menu-settings div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -241px -33px;
-}
-
-#adminmenu #menu-settings:hover div.wp-menu-image,
-#adminmenu #menu-settings.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu-vs.svg") no-repeat scroll -241px -1px;
-}
-/* end menu */
-
-
-/* Diff */
-table.diff .diff-deletedline {
-	background-color: #ffdddd;
-}
-table.diff .diff-deletedline del {
-	background-color: #ff9999;
-}
-table.diff .diff-addedline {
-	background-color: #ddffdd;
-}
-table.diff .diff-addedline ins {
-	background-color: #99ff99;
-}
-
-#att-info {
-	background-color: #E4F2FD;
-}
-
-/* edit image */
-#sidemenu a {
-	background-color: #f9f9f9;
-	border-color: #f9f9f9;
-	border-bottom-color: #dfdfdf;
-}
-
-#sidemenu a.current {
-	background-color: #fff;
-	border-color: #dfdfdf #dfdfdf #fff;
-	color: #D54E21;
-}
-
-
-#screen-options-wrap,
-#contextual-help-wrap {
-	background-color: #f1f1f1;
-	border-color: #dfdfdf;
-}
-
-#screen-meta-links a.show-settings {
-	color: #606060;
-}
-
-#screen-meta-links a.show-settings:hover {
-	color: #000;
-}
-
-#replysubmit {
-	background-color: #f1f1f1;
-	border-top-color: #ddd;
-}
-
-#replyerror {
-	border-color: #ddd;
-	background-color: #f9f9f9;
-}
-
-#edithead,
-#replyhead {
-	background-color: #f1f1f1;
-}
-
-#ed_reply_toolbar {
-	background-color: #e9e9e9;
-}
-
-/* table vim shortcuts */
-.vim-current {
-	background-color: #E4F2FD !important;
-}
-
-/* Install Plugins */
-.star-average,
-.star.star-rating {
-	background-color: #fc0;
-}
-
-div.star.select:hover {
-	background-color: #d00;
-}
-
-#plugin-information .fyi ul {
-	background-color: #eaf3fa;
-}
-
-#plugin-information .fyi h2.mainheader {
-	background-color: #cee1ef;
-}
-
-#plugin-information pre,
-#plugin-information code {
-	background-color: #ededff;
-}
-
-#plugin-information pre {
-	border: 1px solid #ccc;
-}
-
-/* inline editor */
-.inline-edit-row fieldset input[type="text"],
-.inline-edit-row fieldset textarea,
-#bulk-titles,
-#replyrow input {
-	border-color: #ddd;
-}
-
-.inline-editor div.title {
-	background-color: #EAF3FA;
-}
-
-.inline-editor ul.cat-checklist {
-	background-color: #FFFFFF;
-	border-color: #ddd;
-}
-
-.inline-edit-row p.submit {
-	background-color: #f1f1f1;
-}
-
-.inline-editor .categories .catshow,
-.inline-editor .categories .cathide {
-	color: #21759b;
-}
-
-.inline-editor .quick-edit-save {
-	background-color: #f1f1f1;
-}
-
-#replyrow #ed_reply_toolbar input:hover {
-	border-color: #aaa;
-	background: #ddd;
-}
-
-fieldset.inline-edit-col-right .inline-edit-col {
-	border-color: #dfdfdf;
-}
-
-.attention {
-	color: #D54E21;
-}
-
-.meta-box-sortables .postbox:hover .handlediv {
-	background: transparent url(../images/menu-bits.svg) no-repeat scroll left -111px;
-}
-
-#major-publishing-actions {
-	background: #eaf2fa;
-}
-
-.tablenav .tablenav-pages {
-	color: #555;
-}
-
-.tablenav .tablenav-pages a {
-	border-color: #e3e3e3;
-	background: #eee url('../images/menu-bits.svg') repeat-x scroll left -379px;
-}
-
-.tablenav .tablenav-pages a:hover {
-	color: #d54e21;
-	border-color: #d54321;
-}
-
-.tablenav .tablenav-pages a:active {
-	color: #fff !important;
-}
-
-.tablenav .tablenav-pages .current {
-	background: #dfdfdf;
-	border-color: #d3d3d3;
-}
-
-#availablethemes,
-#availablethemes td {
-	border-color: #ddd;
-}
-
-#current-theme img {
-	border-color: #999;
-}
-
-#TB_window #TB_title a.tb-theme-preview-link,
-#TB_window #TB_title a.tb-theme-preview-link:visited {
-	color: #999;
-}
-
-#TB_window #TB_title a.tb-theme-preview-link:hover,
-#TB_window #TB_title a.tb-theme-preview-link:focus {
-	color: #ccc;
-}
-
-.misc-pub-section {
-	border-bottom-color: #eee;
-}
-
-#minor-publishing {
-	border-bottom-color: #ddd;
-}
-
-#post-body .misc-pub-section {
-	border-right-color: #eee;
-}
-
-.post-com-count span {
-	background-color: #bbb;
-}
-
-.form-table .color-palette td {
-	border-color: #fff;
-}
-
-.sortable-placeholder {
-	border-color: #bbb;
-	background-color: #f5f5f5;
-}
-
-#post-body ul#category-tabs li.ui-tabs-selected a {
-	color: #333;
-}
-
-#wp_editimgbtn,
-#wp_delimgbtn,
-#wp_editgallery,
-#wp_delgallery {
-	border-color: #999;
-	background-color: #eee;
-}
-
-#wp_editimgbtn:hover,
-#wp_delimgbtn:hover,
-#wp_editgallery:hover,
-#wp_delgallery:hover {
-	border-color: #555;
-	background-color: #ccc;
-}
-
-#favorite-first {
-	background: #797979 url(../images/fav.svg) repeat-x 0 center;
-	border-color: #777 !important;
-	border-bottom-color: #666 !important;
-}
-
-#favorite-inside {
-	border-color: #797979;
-	background-color: #797979;
-}
-
-#favorite-toggle {
-	background: transparent url(../images/fav-arrow.svg) no-repeat 0 -4px;
-}
-
-#favorite-actions a {
-	color: #ddd;
-}
-
-#favorite-actions a:hover {
-	color: #fff;
-}
-
-#favorite-inside a:hover {
-	text-decoration: underline;
-}
-
-#favorite-actions .slide-down {
-	border-bottom-color: #626262;
-}
-
-.submit input,
-.button,
-.button-primary,
-.button-secondary,
-.button-highlighted,
-#postcustomstuff .submit input {
-	text-shadow: rgba(255,255,255,1) 0 1px 0;
-}
-
-.button-primary,
-.submit .button-primary {
-	text-shadow: rgba(0,0,0,0.3) 0 -1px 0;
-}
-
-#screen-meta a.show-settings {
-	background-color: transparent;
-	text-shadow: rgba(255,255,255,0.7) 0 1px 0;
-}
-
-#icon-edit,
-#icon-post {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -552px -5px;
-}
-
-#icon-index {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -137px -5px;
-}
-
-#icon-upload {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -251px -5px;
-}
-
-#icon-link-manager,
-#icon-link,
-#icon-link-category {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -190px -5px;
-}
-
-#icon-edit-pages,
-#icon-page {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -312px -5px;
-}
-
-#icon-edit-comments {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -72px -5px;
-}
-
-#icon-themes {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -11px -5px;
-}
-
-#icon-plugins {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -370px -5px;
-}
-
-#icon-users,
-#icon-user-edit {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -600px -5px;
-}
-
-#icon-tools,
-#icon-admin {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -432px -5px;
-}
-
-#icon-options-general {
-	background: transparent url(../images/icons32-vs.svg) no-repeat -492px -5px;
-}
-
-.view-switch #view-switch-list {
-	background: transparent url(../images/list-vs.svg) no-repeat 0 0;
-}
-
-.view-switch #view-switch-list.current {
-	background: transparent url(../images/list-vs.svg) no-repeat -40px 0;
-}
-
-.view-switch #view-switch-excerpt {
-	background: transparent url(../images/list-vs.svg) no-repeat -20px 0;
-}
-
-.view-switch #view-switch-excerpt.current {
-	background: transparent url(../images/list-vs.svg) no-repeat -60px 0;
-}
-
-#header-logo {
-	background: transparent url(../images/wp-logo.svg) no-repeat scroll center center;
-}
diff -uNr a/mp-wp/wp-admin/css/colors-fresh-rtl.css b/mp-wp/wp-admin/css/colors-fresh-rtl.css
--- a/mp-wp/wp-admin/css/colors-fresh-rtl.css 53d4d0f84efb041ba861a55895694ca0b2cce96a70f3c47c7efbd81c263f7dade7669969faf054c551198a662ebd5489d853be17ce0dbd2337228ed7c90da7ec
+++ b/mp-wp/wp-admin/css/colors-fresh-rtl.css false
@@ -1,83 +0,0 @@
-.bar {
-	border-right-color: transparent;
-	border-left-color: #99d;
-}
-
-.plugins .togl {
-	border-right-color: transparent;
-	border-left-color: #ccc;
-}
-
-.post-com-count {
-	background-image: url(../images/bubble_bg-rtl.svg);
-}
-.tablenav .tablenav-pages a {
-	background: #eee url('../images/menu-bits-rtl.svg') repeat-x scroll right -379px;
-}
-#upload-menu li.current {
-	border-right-color: transparent;
-	border-left-color: #448abd;
-}
-
-#adminmenu .wp-submenu .current a.current {
-	background: transparent url(../images/menu-bits-rtl.svg) no-repeat scroll  right -289px;
-}
-
-#adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.svg) no-repeat scroll right -34px;
-}
-
-.folded #adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.svg) no-repeat scroll left 5px;
-}
-
-#adminmenu li.wp-has-current-submenu .wp-menu-toggle,
-#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl.svg) repeat-x scroll right -207px;
-}
-
-#adminmenu .wp-has-current-submenu ul li a.current {
-	background: url(../images/menu-dark-rtl.svg) top right no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu .menu-top .current {
-	background: url(../images/menu-bits-rtl.svg) top right repeat-x;
-}
-
-#adminmenu li.wp-has-current-submenu ul li a {
-	background: url(../images/menu-dark-rtl.svg) bottom right no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl.svg) no-repeat right -207px;
-}
-
-#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
-#adminmenu .wp-menu-open .wp-menu-toggle {
-	background: transparent url(../images/menu-bits-rtl.svg) repeat-x scroll right -109px;
-}
-
-#adminmenu a.wp-has-submenu {
-	background: #f1f1f1 url(../images/menu-bits-rtl.svg) repeat-x scroll right -379px;
-}
-
-#adminmenu .wp-submenu a {
-	background: #FFFFFF url(../images/menu-bits-rtl.svg) no-repeat scroll right -310px;
-}
-
-#adminmenu li.current a,
-#adminmenu .wp-submenu a:hover {
-	background: transparent url(../images/menu-bits-rtl.svg) no-repeat scroll  right -289px;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-submenu {
-	background: #b5b5b5 url(../images/menu-bits-rtl.svg) repeat-x scroll right top;
-}
-
-.meta-box-sortables .postbox:hover .handlediv {
-	background: transparent url(../images/menu-bits-rtl.svg) no-repeat scroll right -111px;
-}
-#favorite-toggle {
-	background: transparent url(../images/fav-arrow-rtl.svg) no-repeat right -4px;
-}
diff -uNr a/mp-wp/wp-admin/css/colors-fresh.css b/mp-wp/wp-admin/css/colors-fresh.css
--- a/mp-wp/wp-admin/css/colors-fresh.css f42d54825380efb049d4161bc4390cc607bcce5b672bbab2d0d81c06b43b19eda5cb492bf807cab5aac877ebc9b7da016a9cf31a5a709caba1c7317f43252c90
+++ b/mp-wp/wp-admin/css/colors-fresh.css false
@@ -1,1358 +0,0 @@
-html {
-	background-color: #f9f9f9;
-}
-
-.find-box-search {
-	border-color: #dfdfdf;
-	background-color: #f1f1f1;
-}
-
-.find-box {
-	background-color: #f1f1f1;
-}
-
-.find-box-inside {
-	background-color: #fff;
-}
-
-a.page-numbers:hover {
-	border-color: #999;
-}
-
-body,
-#wpbody,
-.form-table .pre {
-	color: #333;
-}
-
-body > #upload-menu {
-	border-bottom-color: #fff;
-}
-
-kbd, code {
-	background: #eaeaea;
-}
-
-div#current-widgets,
-#postcustomstuff table,
-#your-profile fieldset,
-#rightnow,
-div.dashboard-widget,
-#dashboard-widgets p.dashboard-widget-links,
-#replyrow #ed_reply_toolbar input {
-	border-color: #ccc;
-}
-
-#poststuff .inside label.spam {
-	color: red;
-}
-
-#poststuff .inside label.waiting {
-	color: orange;
-}
-
-#poststuff .inside label.approved {
-	color: green;
-}
-
-#postcustomstuff table {
-	border-color: #dfdfdf;
-	background-color: #F9F9F9;
-}
-
-#postcustomstuff thead th {
-	background-color: #F1F1F1;
-}
-
-#postcustomstuff table input,
-#postcustomstuff table textarea {
-	border-color: #dfdfdf;
-	background-color: #fff;
-}
-
-.widefat {
-	border-color: #dfdfdf;
-	background-color: #fff;
-}
-
-div.dashboard-widget-error {
-	background-color: #c43;
-}
-
-div.dashboard-widget-notice {
-	background-color: #cfe1ef;
-}
-
-div.dashboard-widget-submit,
-ul.widget-control-list div.widget-control-actions {
-	border-top-color: #ccc;
-}
-
-div.ui-tabs-panel {
-	border-color: #f1f1f1;
-}
-
-ul#category-tabs li.ui-tabs-selected {
-	background-color: #f1f1f1;
-}
-
-input.disabled,
-textarea.disabled {
-	background-color: #ccc;
-}
-/* #upload-menu li a.upload-tab-link, */
-li.widget-list-control-item h4.widget-title a:hover,
-li.widget-list-control-item h4.widget-title a,
-#dragHelper li.widget-list-control-item h4.widget-title a,
-#draghelper li.widget-list-control-item h4.widget-title a:visited,
-.login #backtoblog a:hover,
-#plugin-information .action-button a,
-#plugin-information .action-button a:hover,
-#plugin-information .action-button a:visited {
-	color: #fff;
-}
-
-li.widget-list-control-item div.widget-control {
-	background-color: #fff;
-	border-color: #dfdfdf;
-}
-
-.metabox-holder .postbox h3,
-#poststuff .postbox h3,
-#poststuff .stuffbox h3 {
-	background: #dfdfdf url("../images/gray-grad.svg") repeat-x left top;
-	text-shadow: #fff 0 1px 0;
-}
-
-.form-table th,
-.form-wrap label {
-	color: #222;
-	text-shadow: #fff 0 1px 0;
-}
-
-.setting-description, .form-wrap p {
-	color: #666;
-}
-
-select {
-	background-color: #fff;
-	border-color: #ddd;
-}
-
-strong .post-com-count span {
-	background-color: #21759b;
-}
-
-ul#widget-list li.widget-list-item h4.widget-title {
-	background-color: #f0f0f0;
-	color: #000;
-}
-
-.sorthelper {
-	background-color: #ccf3fa;
-}
-
-.ac_match, .subsubsub a.current {
-	color: #000;
-}
-
-.wrap h2 {
-	color: #464646;
-}
-
-.ac_over {
-	background-color: #f0f0b8;
-}
-
-.ac_results {
-	background-color: #fff;
-	border-color: #808080;
-}
-
-.ac_results li {
-	color: #101010;
-}
-
-.alternate, .alt {
-	background-color: #f9f9f9;
-}
-
-.available-theme a.screenshot {
-	background-color: #f1f1f1;
-	border-color: #ddd;
-}
-
-.bar {
-	background-color: #e8e8e8;
-	border-right-color: #99d;
-}
-
-#media-upload {
-	background: #fff;
-}
-#media-upload .slidetoggle {
-	border-top-color: #dfdfdf;
-}
-
-.error, #login #login_error {
-	background-color: #ffebe8;
-	border-color: #c00;
-}
-
-.error a {
-	color: #c00;
-}
-
-.form-invalid {
-	background-color: #ffebe8 !important;
-}
-
-.form-invalid input {
-	border-color: #c00 !important;
-}
-
-.form-table input,
-.form-table textarea,
-.search-input,
-.form-field input,
-.form-field textarea,
-.submit {
-	border-color: #DFDFDF;
-}
-
-.highlight {
-	background-color: #e4f2fd;
-	color: #d54e21;
-}
-
-.howto,
-.nonessential,
-#edit-slug-box,
-.form-input-tip,
-.rss-widget span.rss-date,
-.subsubsub {
-	color: #666;
-}
-
-.media-item {
-	border-bottom-color: #dfdfdf;
-}
-
-#wpbody-content #media-items .describe {
-	border-top-color: #dfdfdf;
-}
-
-.describe input[type="text"],
-.describe textarea {
-	border-color: #dfdfdf;
-}
-
-.media-upload-form label.form-help,
-td.help {
-	color: #9a9a9a;
-}
-
-.post-com-count {
-	background-image: url(../images/bubble_bg.svg);
-	color: #fff;
-}
-
-.post-com-count span {
-	background-color: #bbb;
-	color: #fff;
-}
-
-.post-com-count:hover span {
-	background-color: #d54e21;
-}
-
-.quicktags, .search {
-	background-color: #ccc;
-	color: #000;
-}
-
-.side-info h5, .bordertitle {
-	border-bottom-color: #dadada;
-}
-
-.side-info ul, .widget-description {
-	color: #666;
-}
-
-.button,
-.button-secondary,
-.submit input,
-input[type=button],
-input[type=submit] {
-	border-color: #bbb;
-	color: #464646;
-}
-
-.button:hover,
-.button-secondary:hover,
-.submit input:hover,
-input[type=button]:hover,
-input[type=submit]:hover {
-	color: #000;
-	border-color: #666;
-}
-
-.button,
-.submit input,
-.button-secondary {
-	background: #f2f2f2 url(../images/white-grad.svg) repeat-x scroll left top;
-}
-
-.button:active,
-.submit input:active,
-.button-secondary:active {
-	background: #eee url(../images/white-grad-active.svg) repeat-x scroll left top;
-}
-
-.button-primary,
-.submit .button-primary,
-#login form .submit input {
-	border-color: #298cba !important;
-	font-weight: bold;
-	color: #FFF !important;
-	background: #21759B url(../images/button-grad.svg) repeat-x scroll left top;
-}
-
-.button-primary:active,
-#login form .submit input:active {
-	background: #21759b url(../images/button-grad-active.svg) repeat-x scroll left top !important;
-}
-
-.button[disabled],
-.button:disabled,
-.button-secondary[disabled],
-.button-secondary:disabled,
-a.button.disabled {
-	color: #ccc !important;
-	border-color: #ccc;
-}
-
-.button-primary[disabled],
-.button-primary:disabled {
-	color: #2fa0d5 !important;
-}
-
-a:active,
-a:focus {
-	color: #d54e21;
-}
-
-a:hover,
-#wphead #viewsite a:hover,
-#adminmenu a:hover,
-#adminmenu ul.wp-submenu a:hover,
-#the-comment-list .comment a:hover,
-#rightnow a:hover,
-.subsubsub a:hover,
-.subsubsub a.current:hover,
-#login form .submit input:hover,
-div.dashboard-widget-submit input:hover,
-#media-upload a.del-link:hover,
-.ui-tabs-nav a:hover {
-	color: #d54e21;
-}
-
-#the-comment-list .comment-item,
-#dashboard-widgets #dashboard_quick_press form p.submit {
-	border-color: #dfdfdf;
-}
-
-.button-primary:hover,
-#login form .submit input:hover {
-	border-color: #13455b !important;
-	color: #EAF2FA !important;
-}
-
-#side-info-column #category-tabs .ui-tabs-selected a {
-	color: #333;
-}
-
-#rightnow .rbutton {
-	background-color: #ebebeb;
-	color: #264761;
-}
-
-.submitbox .submit {
-	background-color: #464646;
-	color: #ccc;
-}
-
-.submitbox .submitdelete, a.delete {
-	color: #f00;
-	border-bottom-color: #f00;
-}
-
-.submitbox .submitdelete:hover,
-#media-upload a.delete:hover {
-	color: #fff;
-	background-color: #f00;
-	border-bottom-color: #f00;
-}
-
-#normal-sortables .submitbox .submitdelete:hover {
-	color: #000;
-	background-color: #f00;
-	border-bottom-color: #f00;
-}
-
-.tablenav .dots {
-	border-color: transparent;
-}
-
-.tablenav .next,
-.tablenav .prev {
-	border-color: transparent;
-	color: #21759b;
-}
-
-.tablenav .next:hover,
-.tablenav .prev:hover {
-	border-color: transparent;
-	color: #d54e21;
-}
-
-.updated,
-.login #login_error,
-.login .message {
-	background-color: #ffffe0;
-	border-color: #e6db55;
-}
-
-a.page-numbers {
-	border-bottom-color: #B8D3E2;
-}
-
-div#available-widgets-filter,
-ul#widget-list li.widget-list-item,
-.commentlist li {
-	border-bottom-color: #ccc;
-}
-
-.widefat td,
-.widefat th {
-	border-color: #dfdfdf;
-}
-
-.widefat th {
-	text-shadow: rgba(255,255,255,0.8) 0 1px 0;
-}
-
-.widefat thead tr th,
-.widefat tfoot tr th,
-h3.dashboard-widget-title,
-h3.dashboard-widget-title span,
-h3.dashboard-widget-title small,
-.find-box-head {
-	color: #333;
-	background: #dfdfdf url(../images/gray-grad.svg) repeat-x scroll left top;
-}
-
-h3.dashboard-widget-title small a {
-	color: #d7d7d7;
-}
-
-h3.dashboard-widget-title small a:hover {
-	color: #fff;
-}
-
-#adminmenu a,
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML,
-#the-comment-list p.comment-author strong a,
-#media-upload a.del-link,
-#media-upload a.delete,
-.ui-tabs-nav a, a {
-	color: #21759b;
-}
-
-#adminmenu #awaiting-mod,
-#adminmenu .update-plugins,
-#sidemenu a .update-plugins,
-#rightnow .reallynow,
-#plugin-information .action-button {
-	background-color: #d54e21;
-	color: #fff;
-}
-
-#adminmenu li a:hover #awaiting-mod,
-#adminmenu li a:hover .update-plugins,
-#sidemenu li a:hover .update-plugins {
-	background-color: #264761;
-	color: #fff;
-}
-
-#adminmenu li.current a #awaiting-mod,
-#adminmenu li.current a .update-plugins,
-#adminmenu li.wp-has-current-submenu a .update-plugins,
-#adminmenu li.wp-has-current-submenu a .update-plugins {
-	background-color: #ddd;
-	color: #000;
-	text-shadow: none;
-	-moz-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
-	-khtml-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
-	-webkit-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
-	box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
-}
-
-#adminmenu li.current a:hover #awaiting-mod,
-#adminmenu li.current a:hover .update-plugins,
-#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod,
-#adminmenu li.wp-has-current-submenu a:hover .update-plugins {
-	background-color: #264761;
-	color: #fff;
-}
-
-div#media-upload-header {
-	background-color: #f9f9f9;
-	border-bottom-color: #dfdfdf;
-}
-
-div#plugin-information-header {
-	background-color: #e4f2fd;
-	border-bottom-color: #c6d9e9;
-}
-
-#currenttheme img {
-	border-color: #666;
-}
-
-#current-widgets .drop-widget-here {
-	background-color: #ffc;
-}
-
-#dashboard_secondary div.dashboard-widget-content ul li a {
-	background-color: #f9f9f9;
-}
-
-input.readonly, textarea.readonly {
-	background-color: #ddd;
-}
-
-#dragHelper h4.widget-title,
-li.widget-list-control-item h4,
-#dragHelper li.widget-list-control-item h4 {
-	background-color: #2683ae;
-	color: #fff;
-}
-
-#ed_toolbar input,
-#ed_reply_toolbar input {
-	background: #fff url("../images/fade-butt.svg") repeat-x 0 -2px;
-}
-
-#editable-post-name {
-	background-color: #fffbcc;
-}
-
-#edit-slug-box strong,
-.tablenav .displaying-num,
-#submitted-on {
-	color: #777;
-}
-
-.login #nav a {
-	color: #21759b !important;
-}
-
-.login #nav a:hover {
-	color: #d54e21 !important;
-}
-
-#footer,
-#footer-upgrade {
-	background: #464646;
-	color: #999;
-}
-
-#media-items {
-	border-color: #dfdfdf;
-}
-
-#pass-strength-result {
-	background-color: #eee;
-	border-color: #ddd !important;
-}
-
-#pass-strength-result.bad {
-	background-color: #ffb78c;
-	border-color: #ff853c !important;
-}
-
-#pass-strength-result.good {
-	background-color: #ffec8b;
-	border-color: #fc0 !important;
-}
-
-#pass-strength-result.short {
-	background-color: #ffa0a0;
-	border-color: #f04040 !important;
-}
-
-#pass-strength-result.strong {
-	background-color: #c3ff88;
-	border-color: #8dff1c !important;
-}
-
-.checkbox,
-.side-info {
-	background-color: #fff;
-}
-
-.plugins .active {
-	background-color: #e7f7d3;
-}
-
-.plugins .togl {
-	border-right-color: #ccc;
-}
-
-#the-comment-list .unapproved {
-	background-color: #ffffe0;
-}
-
-#the-comment-list .approve a {
-	color: #006505;
-}
-
-#the-comment-list .unapprove a {
-	color: #d98500;
-}
-
-#the-comment-list .delete a {
-	color: #bc0b0b;
-}
-
-.plugins tr {
-	background-color: #fff;
-}
-
-.metabox-holder .postbox,
-#poststuff .postbox,
-#titlediv,
-#poststuff .postarea,
-#poststuff .stuffbox,
-.postbox input[type="text"],
-.postbox textarea,
-.stuffbox input[type="text"],
-.stuffbox textarea {
-	border-color: #dfdfdf;
-}
-
-.metabox-holder .postbox,
-#poststuff .postbox {
-	background-color: #FFF;
-}
-
-.ui-sortable .postbox h3 {
-	color: #464646;
-}
-
-.ui-sortable .postbox h3:hover {
-	color: #000;
-}
-
-.curtime #timestamp {
-	background-image: url(../images/date-button.svg);
-}
-
-#quicktags #ed_link {
-	color: #00f;
-}
-
-#rightnow .youhave {
-	background-color: #f0f6fb;
-}
-
-#rightnow a {
-	color: #448abd;
-}
-
-#tagchecklist span a,
-#bulk-titles div a {
-	background: url(../images/xit.svg) no-repeat;
-}
-
-#tagchecklist span a:hover,
-#bulk-titles div a:hover {
-	background: url(../images/xit.svg) no-repeat -10px 0;
-}
-
-#update-nag, .plugin-update {
-	background-color: #fffeeb;
-	border-bottom-color: #ccc;
-	border-top-color: #ccc;
-	color: #555;
-}
-
-.login #backtoblog a {
-	color: #ccc;
-}
-
-#wphead {
-	background-color: #464646;
-}
-
-body.login {
-	border-top-color: #464646;
-}
-
-#wphead h1 a {
-	color: #fff;
-}
-
-#login form input {
-	color: #555;
-}
-
-#wphead h1 a:hover {
-	text-decoration: underline;
-}
-
-#user_info {
-	color: #999;
-}
-
-#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited {
-	color: #ccc;
-	text-decoration: none;
-}
-
-#user_info a:hover, #footer a:hover {
-	color: #fff;
-	text-decoration: underline !important;
-}
-
-#user_info a:active, #footer a:active {
-	color: #ccc !important;
-}
-
-div#media-upload-error,
-.file-error,
-abbr.required,
-.widget-control-remove:hover,
-.delete a:hover {
-	color: #f00;
-}
-
-#media-upload a.delete {
-	color: #888;
-}
-
-/* editors */
-#quicktags {
-	border-color: #dfdfdf;
-	background-color: #dfdfdf;
-}
-
-#ed_toolbar input {
-	border-color: #C3C3C3;
-}
-
-#ed_toolbar input:hover {
-	border-color: #aaa;
-	background: #ddd;
-}
-
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
-	background-color: #f1f1f1;
-	border-color: #dfdfdf;
-	color: #999;
-}
-
-#poststuff #editor-toolbar .active {
-	border-bottom-color: #e9e9e9;
-	background-color: #e9e9e9;
-	color: #333;
-}
-
-#editorcontainer,
-#post-status-info,
-#titlediv #title {
-	border-color: #dfdfdf;
-}
-
-#titlediv #title {
-	background-color: #fff;
-}
-
-#tTips p#tTips_inside {
-	background-color: #ddd;
-	color: #333;
-}
-
-#timestampdiv input,
-#namediv input,
-#tagsdiv #the-tagcloud {
-	border-color: #ddd;
-}
-
-/* menu */
-#adminmenu * {
-	border-color: #e3e3e3;
-}
-
-#adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.svg) no-repeat scroll left 5px;
-}
-
-.folded #adminmenu li.wp-menu-separator {
-	background: transparent url(../images/menu-arrows.svg) no-repeat scroll right -34px;
-}
-
-#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
-#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
-	background: transparent url(../images/menu-bits.svg) no-repeat scroll left -207px;
-}
-
-#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
-#adminmenu .wp-menu-open .wp-menu-toggle {
-	background: transparent url(../images/menu-bits.svg) no-repeat scroll left -109px;
-}
-
-#adminmenu a.menu-top {
-	background: #f1f1f1 url(../images/menu-bits.svg) repeat-x scroll left -379px;
-}
-
-#adminmenu .wp-submenu a {
-	background: #FFFFFF url(../images/menu-bits.svg) no-repeat scroll 0 -310px;
-}
-
-#adminmenu .wp-has-current-submenu ul li a {
-	background: none;
-}
-
-#adminmenu .wp-has-current-submenu ul li a.current {
-	background: url(../images/menu-dark.svg) top left no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
-#adminmenu .menu-top .current {
-	background: #6d6d6d url(../images/menu-bits.svg) top left repeat-x;
-	border-color: #6d6d6d;
-	color: #fff;
-	text-shadow: rgba(0,0,0,0.4) 0px -1px 0px;
-}
-
-#adminmenu li.wp-has-current-submenu .wp-submenu,
-#adminmenu li.wp-has-current-submenu ul li a {
-	border-color: #aaa !important;
-}
-
-#adminmenu li.wp-has-current-submenu ul li a {
-	background: url(../images/menu-dark.svg) bottom left no-repeat !important;
-}
-
-#adminmenu li.wp-has-current-submenu ul {
-	border-bottom-color: #aaa;
-}
-
-#adminmenu li.menu-top .current:hover {
-	border-color: #B5B5B5;
-}
-
-#adminmenu .wp-submenu .current a.current {
-	background: transparent url(../images/menu-bits.svg) no-repeat scroll  0 -289px;
-}
-
-#adminmenu .wp-submenu a:hover {
-	background-color: #EAF2FA !important;
-	color: #333 !important;
-}
-
-#adminmenu .wp-submenu li.current,
-#adminmenu .wp-submenu li.current a,
-#adminmenu .wp-submenu li.current a:hover {
-	color: #333;
-	background-color: #f5f5f5;
-	background-image: none;
-	border-color: #e3e3e3;
-	text-shadow: rgba(255,255,255,1) 0px 1px 0px;
-}
-
-#adminmenu .wp-submenu ul {
-	background-color: #fff;
-}
-
-.folded #adminmenu li.menu-top,
-#adminmenu .wp-submenu .wp-submenu-head {
-	background-color: #F1F1F1;
-}
-
-.folded #adminmenu li.wp-has-current-submenu,
-.folded #adminmenu li.menu-top.current {
-	background-color: #e6e6e6;
-}
-
-#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head {
-	background-color: #EAEAEA;
-	border-color: #aaa;
-}
-
-#adminmenu div.wp-submenu {
-	background-color: transparent;
-}
-
-/* menu icons */
-#adminmenu #menu-dashboard div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -61px -33px;
-}
-
-#adminmenu #menu-dashboard:hover div.wp-menu-image,
-#adminmenu  #menu-dashboard.wp-has-current-submenu div.wp-menu-image,
-#adminmenu  #menu-dashboard.current div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -61px -1px;
-}
-
-#adminmenu #menu-posts div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -272px -33px;
-}
-
-#adminmenu #menu-posts:hover div.wp-menu-image,
-#adminmenu #menu-posts.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -272px -1px;
-}
-
-#adminmenu #menu-media div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -121px -33px;
-}
-
-#adminmenu #menu-media:hover div.wp-menu-image,
-#adminmenu #menu-media.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -121px -1px;
-}
-
-#adminmenu #menu-links div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -91px -33px;
-}
-
-#adminmenu #menu-links:hover div.wp-menu-image,
-#adminmenu #menu-links.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -91px -1px;
-}
-
-#adminmenu #menu-pages div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -151px -33px;
-}
-
-#adminmenu #menu-pages:hover div.wp-menu-image,
-#adminmenu #menu-pages.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -151px -1px;
-}
-
-#adminmenu #menu-comments div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -31px -33px;
-}
-
-#adminmenu #menu-comments:hover div.wp-menu-image,
-#adminmenu #menu-comments.wp-has-current-submenu div.wp-menu-image,
-#adminmenu #menu-comments.current div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -31px -1px;
-}
-
-#adminmenu #menu-appearance div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -1px -33px;
-}
-
-#adminmenu #menu-appearance:hover div.wp-menu-image,
-#adminmenu #menu-appearance.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -1px -1px;
-}
-
-#adminmenu #menu-plugins div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -181px -33px;
-}
-
-#adminmenu #menu-plugins:hover div.wp-menu-image,
-#adminmenu #menu-plugins.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -181px -1px;
-}
-
-#adminmenu #menu-users div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -301px -33px;
-}
-
-#adminmenu #menu-users:hover div.wp-menu-image,
-#adminmenu #menu-users.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -301px -1px;
-}
-
-#adminmenu #menu-tools div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -211px -33px;
-}
-
-#adminmenu #menu-tools:hover div.wp-menu-image,
-#adminmenu #menu-tools.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -211px -1px;
-}
-
-#adminmenu #menu-settings div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -241px -33px;
-}
-
-#adminmenu #menu-settings:hover div.wp-menu-image,
-#adminmenu #menu-settings.wp-has-current-submenu div.wp-menu-image {
-	background: transparent url("../images/menu.svg") no-repeat scroll -241px -1px;
-}
-/* end menu */
-
-
-/* Diff */
-table.diff .diff-deletedline {
-	background-color: #ffdddd;
-}
-table.diff .diff-deletedline del {
-	background-color: #ff9999;
-}
-table.diff .diff-addedline {
-	background-color: #ddffdd;
-}
-table.diff .diff-addedline ins {
-	background-color: #99ff99;
-}
-
-#att-info {
-	background-color: #E4F2FD;
-}
-
-/* edit image */
-#sidemenu a {
-	background-color: #f9f9f9;
-	border-color: #f9f9f9;
-	border-bottom-color: #dfdfdf;
-}
-
-#sidemenu a.current {
-	background-color: #fff;
-	border-color: #dfdfdf #dfdfdf #fff;
-	color: #D54E21;
-}
-
-
-#screen-options-wrap,
-#contextual-help-wrap {
-	background-color: #f1f1f1;
-	border-color: #dfdfdf;
-}
-
-#screen-meta-links a.show-settings {
-	color: #606060;
-}
-
-#screen-meta-links a.show-settings:hover {
-	color: #000;
-}
-
-#replysubmit {
-	background-color: #f1f1f1;
-	border-top-color: #ddd;
-}
-
-#replyerror {
-	border-color: #ddd;
-	background-color: #f9f9f9;
-}
-
-#edithead,
-#replyhead {
-	background-color: #f1f1f1;
-}
-
-#ed_reply_toolbar {
-	background-color: #e9e9e9;
-}
-
-/* table vim shortcuts */
-.vim-current {
-	background-color: #E4F2FD !important;
-}
-
-/* Install Plugins */
-.star-average,
-.star.star-rating {
-	background-color: #fc0;
-}
-
-div.star.select:hover {
-	background-color: #d00;
-}
-
-#plugin-information .fyi ul {
-	background-color: #eaf3fa;
-}
-
-#plugin-information .fyi h2.mainheader {
-	background-color: #cee1ef;
-}
-
-#plugin-information pre,
-#plugin-information code {
-	background-color: #ededff;
-}
-
-#plugin-information pre {
-	border: 1px solid #ccc;
-}
-
-/* inline editor */
-.inline-edit-row fieldset input[type="text"],
-.inline-edit-row fieldset textarea,
-#bulk-titles,
-#replyrow input {
-	border-color: #ddd;
-}
-
-.inline-editor div.title {
-	background-color: #EAF3FA;
-}
-
-.inline-editor ul.cat-checklist {
-	background-color: #FFFFFF;
-	border-color: #ddd;
-}
-
-.inline-edit-row p.submit {
-	background-color: #f1f1f1;
-}
-
-.inline-editor .categories .catshow,
-.inline-editor .categories .cathide {
-	color: #21759b;
-}
-
-.inline-editor .quick-edit-save {
-	background-color: #f1f1f1;
-}
-
-#replyrow #ed_reply_toolbar input:hover {
-	border-color: #aaa;
-	background: #ddd;
-}
-
-fieldset.inline-edit-col-right .inline-edit-col {
-	border-color: #dfdfdf;
-}
-
-.attention {
-	color: #D54E21;
-}
-
-.meta-box-sortables .postbox:hover .handlediv {
-	background: transparent url(../images/menu-bits.svg) no-repeat scroll left -111px;
-}
-
-#major-publishing-actions {
-	background: #eaf2fa;
-}
-
-.tablenav .tablenav-pages {
-	color: #555;
-}
-
-.tablenav .tablenav-pages a {
-	border-color: #e3e3e3;
-	background: #eee url('../images/menu-bits.svg') repeat-x scroll left -379px;
-}
-
-.tablenav .tablenav-pages a:hover {
-	color: #d54e21;
-	border-color: #d54321;
-}
-
-.tablenav .tablenav-pages a:active {
-	color: #fff !important;
-}
-
-.tablenav .tablenav-pages .current {
-	background: #dfdfdf;
-	border-color: #d3d3d3;
-}
-
-#availablethemes,
-#availablethemes td {
-	border-color: #ddd;
-}
-
-#current-theme img {
-	border-color: #999;
-}
-
-#TB_window #TB_title a.tb-theme-preview-link,
-#TB_window #TB_title a.tb-theme-preview-link:visited {
-	color: #999;
-}
-
-#TB_window #TB_title a.tb-theme-preview-link:hover,
-#TB_window #TB_title a.tb-theme-preview-link:focus {
-	color: #ccc;
-}
-
-.misc-pub-section {
-	border-bottom-color: #eee;
-}
-
-#minor-publishing {
-	border-bottom-color: #ddd;
-}
-
-#post-body .misc-pub-section {
-	border-right-color: #eee;
-}
-
-.post-com-count span {
-	background-color: #bbb;
-}
-
-.form-table .color-palette td {
-	border-color: #fff;
-}
-
-.sortable-placeholder {
-	border-color: #bbb;
-	background-color: #f5f5f5;
-}
-
-#post-body ul#category-tabs li.ui-tabs-selected a {
-	color: #333;
-}
-
-#wp_editimgbtn,
-#wp_delimgbtn,
-#wp_editgallery,
-#wp_delgallery {
-	border-color: #999;
-	background-color: #eee;
-}
-
-#wp_editimgbtn:hover,
-#wp_delimgbtn:hover,
-#wp_editgallery:hover,
-#wp_delgallery:hover {
-	border-color: #555;
-	background-color: #ccc;
-}
-
-#favorite-first {
-	background: #797979 url(../images/fav.svg) repeat-x left center;
-	border-color: #777 !important;
-	border-bottom-color: #666 !important;
-}
-
-#favorite-inside {
-	border-color: #797979;
-	background-color: #797979;
-}
-
-#favorite-toggle {
-	background: transparent url(../images/fav-arrow.svg) no-repeat 0 -4px;
-}
-
-#favorite-actions a {
-	color: #ddd;
-}
-
-#favorite-actions a:hover {
-	color: #fff;
-}
-
-#favorite-inside a:hover {
-	text-decoration: underline;
-}
-
-#favorite-actions .slide-down {
-	border-bottom-color: #626262;
-}
-
-.submit input,
-.button,
-.button-primary,
-.button-secondary,
-.button-highlighted,
-#postcustomstuff .submit input {
-	text-shadow: rgba(255,255,255,1) 0 1px 0;
-}
-
-.button-primary,
-.submit .button-primary {
-	text-shadow: rgba(0,0,0,0.3) 0 -1px 0;
-}
-
-#screen-meta a.show-settings {
-	background-color: transparent;
-	text-shadow: rgba(255,255,255,0.7) 0 1px 0;
-}
-
-#icon-edit,
-#icon-post {
-	background: transparent url(../images/icons32.svg) no-repeat -552px -5px;
-}
-
-#icon-index {
-	background: transparent url(../images/icons32.svg) no-repeat -137px -5px;
-}
-
-#icon-upload {
-	background: transparent url(../images/icons32.svg) no-repeat -251px -5px;
-}
-
-#icon-link-manager,
-#icon-link,
-#icon-link-category {
-	background: transparent url(../images/icons32.svg) no-repeat -190px -5px;
-}
-
-#icon-edit-pages,
-#icon-page {
-	background: transparent url(../images/icons32.svg) no-repeat -312px -5px;
-}
-
-#icon-edit-comments {
-	background: transparent url(../images/icons32.svg) no-repeat -72px -5px;
-}
-
-#icon-themes {
-	background: transparent url(../images/icons32.svg) no-repeat -11px -5px;
-}
-
-#icon-plugins {
-	background: transparent url(../images/icons32.svg) no-repeat -370px -5px;
-}
-
-#icon-users,
-#icon-user-edit {
-	background: transparent url(../images/icons32.svg) no-repeat -600px -5px;
-}
-
-#icon-tools,
-#icon-admin {
-	background: transparent url(../images/icons32.svg) no-repeat -432px -5px;
-}
-
-#icon-options-general {
-	background: transparent url(../images/icons32.svg) no-repeat -492px -5px;
-}
-
-.view-switch #view-switch-list {
-	background: transparent url(../images/list.svg) no-repeat 0 0;
-}
-
-.view-switch #view-switch-list.current {
-	background: transparent url(../images/list.svg) no-repeat -40px 0;
-}
-
-.view-switch #view-switch-excerpt {
-	background: transparent url(../images/list.svg) no-repeat -20px 0;
-}
-
-.view-switch #view-switch-excerpt.current {
-	background: transparent url(../images/list.svg) no-repeat -60px 0;
-}
-
-#header-logo {
-	background: transparent url(../images/wp-logo.svg) no-repeat scroll center center;
-}
diff -uNr a/mp-wp/wp-admin/css/dashboard-rtl.css b/mp-wp/wp-admin/css/dashboard-rtl.css
--- a/mp-wp/wp-admin/css/dashboard-rtl.css 5d11294fdb3f269debb35877e198d8eb016ad0feea31b34eb7e5ceeff03e0f063fccb8ac8a2f05bbe2f3679cbfae694f3e6e96131144908f0e38c953a86a3b95
+++ b/mp-wp/wp-admin/css/dashboard-rtl.css false
@@ -1,93 +0,0 @@
-#dashboard-widgets-wrap .has-sidebar {
-	margin-right: 0;
-	margin-left: -51%;
-}
-#dashboard-widgets-wrap .has-sidebar .has-sidebar-content {
-	margin-right: 0;
-	margin-left: 51%;
-}
-.view-all {
-	right: auto;
-	left: 0;
-}
-#dashboard_right_now p.sub, #dashboard-widgets h4, #dashboard_quick_press h4, a.rsswidget, #dashboard_plugins h4, #dashboard_plugins h5, #dashboard_recent_comments .comment-meta .approve {
-	font-family: Tahoma, Arial;
-}
-#dashboard_right_now td.b {
-	padding-right: 0;
-	padding-left: 6px;
-	text-align: left;
-	font-family: Tahoma, Arial;
-}
-#dashboard_right_now .t {
-	padding-right: 0;
-	padding-left: 12px;
-}
-#dashboard_right_now .versions a {
-	font-family: Tahoma, Arial;
-}
-#dashboard_right_now a.button {
-	float: left;
-	clear: left;
-}
-#dashboard-widgets h3 .postbox-title-action {
-	right: auto;
-	left: 30px;
-}
-#the-comment-list .pingback {
-	padding-left: 0 !important;
-	padding-right: 9px !important;
-}
-/* Recent Comments */
-#the-comment-list .comment-item {
-	padding: 1em 70px 1em 10px;
-}
-#the-comment-list .comment-item .avatar {
-	float: right;
-	margin-left: 0;
-	margin-right: -60px;
-}
-/* Feeds */
-.rss-widget cite {
-	text-align: left;
-}
-.rss-widget span.rss-date {
-	font-family: Tahoma, Arial;
-	margin-left: 0;
-	margin-right: 3px;
-}
-/* QuickPress */
-#dashboard_quick_press h4 {
-	float: right;
-	text-align: left;
-}
-#dashboard_quick_press h4 label {
-	margin-right: 0;
-	margin-left: 10px;
-}
-#dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap {
-	margin: 0 5em 1em 0;
-}
-#dashboard_quick_press #media-buttons {
-	margin: 0 5em .5em 0;
-	padding: 0 10px 0 0;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit {
-	margin-left: 0;
-	margin-right: 4.6em;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit input {
-	float: right;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
-	margin: 0 10px 0 1em;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit #publish {
-	float: left;
-}
-/* Recent Drafts */
-#dashboard_recent_drafts h4 abbr {
-	font-family: Tahoma, Arial;
-	margin-left:0;
-	margin-right: 3px;
-}
diff -uNr a/mp-wp/wp-admin/css/dashboard.css b/mp-wp/wp-admin/css/dashboard.css
--- a/mp-wp/wp-admin/css/dashboard.css 7eddde7772d1e7c38d7421a20a7dbba10df2bddd98fe521be4cfe3c15af6db0b273c11a1a8426ca04c9f1a4fe3da8e3382aa6a347382b34215ed7e6d5f98d280
+++ b/mp-wp/wp-admin/css/dashboard.css 8da6bc5d353248ef901e8893e0b6f638a8919644747dfc170788e6325e29217b8d5421dd4c45be195a6f31e6f28dfda9207a38429abdc9a61c1f1d88035b5bc4
@@ -1,4 +1,4 @@
-.postbox p, .postbox ul, .postbox ol, .postbox blockquote, #wp-version-message { font-size: 11px; }
+.postbox p, .postbox ul, .postbox ol, .postbox blockquote { font-size: 11px; }
 
 .edit-box {
 	display: none;
@@ -21,7 +21,7 @@
 	margin: 0;
 	padding: 0;
 	width: 99%;
-	color: #333;
+	color: #303434;
 }
 
 form .textarea-wrap {
@@ -69,7 +69,7 @@
 }
 
 div.postbox div.inside {
-	margin: 10px;
+	margin: 0 10px 10px 10px;
 	position: relative;
 }
 
@@ -88,8 +88,8 @@
 }
 
 #dashboard-widgets h4 {
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-size: 13px;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	font-size: 11px;
 	margin: 0 0 .2em;
 	padding: 0;
 }
@@ -105,14 +105,6 @@
 	font-size: 12px;
 }
 
-#dashboard_right_now p.sub {
-	font-style: italic;
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	padding: 5px 10px 15px;
-	color: #777;
-	font-size: 13px;
-}
-
 #dashboard_right_now .table {
 	background: #f9f9f9;
 	border-top: #ececec 1px solid;
@@ -138,12 +130,13 @@
 #dashboard_right_now td.b {
 	padding-right: 6px;
 	text-align: right;
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
 	font-size: 14px;
 }
 
 #dashboard_right_now td.b a {
-	font-size: 18px;
+	font-size: 16px;
+	font-weight: bold;
 }
 
 #dashboard_right_now td.b a:hover {
@@ -151,7 +144,7 @@
 }
 
 #dashboard_right_now .t {
-	font-size: 12px;
+	font-size: 11px;
 	padding-right: 12px;
 	padding-top: 6px;
 	color: #777;
@@ -211,7 +204,7 @@
 
 #the-comment-list .comment-item {
 	padding: 1em 10px 1em 70px;
-	border-top: 1px solid;
+	border-top: 1px solid #eee;
 }
 
 #the-comment-list .pingback {
@@ -262,54 +255,6 @@
 	font-size: 10px;
 }
 
-/* QuickPress */
-
-#dashboard_quick_press h4 {
-	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-	float: left;
-	width: 5.5em;
-	clear: both;
-	font-weight: normal;
-	text-align: right;
-	padding-top: 5px;
-	font-size: 12px;
-}
-
-#dashboard_quick_press h4 label {
-	margin-right: 10px;
-}
-
-#dashboard_quick_press .input-text-wrap,
-#dashboard_quick_press .textarea-wrap {
-	margin: 0 0 1em 5em;
-}
-
-#dashboard_quick_press #media-buttons {
-	margin: 0 0 .5em 5em;
-	padding: 0 0 0 10px;
-	font-size: 11px;
-}
-
-#dashboard_quick_press #media-buttons a {
-	vertical-align: bottom;
-}
-
-#dashboard-widgets #dashboard_quick_press form p.submit {
-	margin-left: 4.6em;
-}
-
-#dashboard-widgets #dashboard_quick_press form p.submit input {
-	float: left;
-}
-
-#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
-	margin: 0 1em 0 10px;
-}
-
-#dashboard-widgets #dashboard_quick_press form p.submit #publish {
-	float: right;
-}
-
 /* Recent Drafts */
 #dashboard_recent_drafts ul {
 	margin: 0;
diff -uNr a/mp-wp/wp-admin/css/farbtastic-rtl.css b/mp-wp/wp-admin/css/farbtastic-rtl.css
--- a/mp-wp/wp-admin/css/farbtastic-rtl.css 2bf6f8e23fe295014dbbf797cc021102ecd3dc888f7d4f675c7297c9fe4606b2f226a1599e6282ae0ab5d2b6b03ba5ef26bec3a245e24ca518e20b9933020a31
+++ b/mp-wp/wp-admin/css/farbtastic-rtl.css false
@@ -1,7 +0,0 @@
-.farbtastic .color, .farbtastic .overlay {
-	left: 0;
-	right: 47px;
-}
-.farbtastic .marker {
-	margin: -8px -8px 0 0;
-}
diff -uNr a/mp-wp/wp-admin/css/farbtastic.css b/mp-wp/wp-admin/css/farbtastic.css
--- a/mp-wp/wp-admin/css/farbtastic.css 3885d052a170b8f305fe47dba1a246eb0b9aabef48e30a83891c66512435fdf6bb284f6f1f181cc4d2fb0552d7661fa23db68ef8193b54a9b9ee69dcb4b7b189
+++ b/mp-wp/wp-admin/css/farbtastic.css false
@@ -1,32 +0,0 @@
-.farbtastic {
-  position: relative;
-}
-.farbtastic * {
-  position: absolute;
-  cursor: crosshair;
-}
-.farbtastic, .farbtastic .wheel {
-  width: 195px;
-  height: 195px;
-}
-.farbtastic .color, .farbtastic .overlay {
-  top: 47px;
-  left: 47px;
-  width: 101px;
-  height: 101px;
-}
-.farbtastic .wheel {
-  background: url(../images/wheel.svg) no-repeat;
-  width: 195px;
-  height: 195px;
-}
-.farbtastic .overlay {
-  background: url(../images/mask.svg) no-repeat;
-}
-.farbtastic .marker {
-  width: 17px;
-  height: 17px;
-  margin: -8px 0 0 -8px;
-  overflow: hidden;
-  background: url(../images/marker.svg) no-repeat;
-}
diff -uNr a/mp-wp/wp-admin/css/global-rtl.css b/mp-wp/wp-admin/css/global-rtl.css
--- a/mp-wp/wp-admin/css/global-rtl.css 09d014c1b926f87f579ff15fb1610c2d1cc2ebed87c76a42d99f8c4a7078b3a680f079173bee90c68f76a5c66c12ee2af8f588c56e7f608f8046848e9d3fe460
+++ b/mp-wp/wp-admin/css/global-rtl.css false
@@ -1,74 +0,0 @@
-/* 2 column liquid layout */
-#adminmenu {
-	float: right;
-	clear: right;
-	margin-right:-160px;
-	margin-left: 5px;
-}
-div.folded #adminmenu {
-	margin-left: 0;
-	margin-right: -45px;
-}
-/* inner 2 column liquid layout */
-.inner-sidebar {
-	float: left;
-	clear: left;
-}
-.has-sidebar {
-	float: right;
-	clear: right;
-	margin-right: 0;
-	margin-left: -340px;
-}
-.has-sidebar .has-sidebar-content {
-	margin-right: 0;
-	margin-left: 305px;
-}
-#wpbody {
-	margin-left:0;
-	margin-right: 175px;
-}
-.folded #wpbody {
-	margin-left: 0;
-	margin-right: 60px;
-}
-#wpbody-content {
-	float: right;
-}
-/* 2 columns main area */
-#col-right {
-	float: left;
-	clear: left;
-}
-.wrap {
-	margin: 0 5px 0 15px;
-}
-/* styles for use by people extending the WordPress interface */
-body, td, textarea, input, select {
-	font-family: Tahoma, arial;
-}
-.alignleft {
-	float: right;
-}
-.alignright {
-	float: left;
-}
-.subsubsub {
-	float: right;
-}
-.widefat th {
-	text-align: right;
-}
-.widefat th input {
-	margin: 0 8px 0 0;
-}
-.wrap h2 {
-	font-family: arial;
-	padding: 14px 0 3px 15px;
-}
-.wrap h2.long-header {
-	padding-left: 0;
-}
-.updated, .error {
-	clear: both;
-}
diff -uNr a/mp-wp/wp-admin/css/global.css b/mp-wp/wp-admin/css/global.css
--- a/mp-wp/wp-admin/css/global.css ab8bc61ed9622a262135a0d980cf00dd63d174976649d82e55557d5c1aeb39e72f13104e97170eddfebdca1f0ae7f661f614a207f629ee51365838cc4abaec6b
+++ b/mp-wp/wp-admin/css/global.css ad11969a6ce4d1b04a5d746ef26b2d4d79726f46f19c50ab69cc79ddeb6689a4046982053c18033c4bde7daa0c2f26b62ce3e338f8db93d8a3c2842d9968af93
@@ -1,25 +1,10 @@
-/* http://meyerweb.com/eric/tools/css/reset/ */
-/* v1.0 | 20080212 */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
+* {
 	margin: 0;
 	padding: 0;
-	border: 0;
-	outline: 0;
-/*	font-size: 100%;
-	vertical-align: baseline; */
-	background: transparent;
 }
 body {
 	line-height: 1;
+	box-sizing: border-box;
 }
 ol, ul {
 	list-style: none;
@@ -33,12 +18,6 @@
 	content: none;
 }
 
-/* remember to define focus styles! */
-/*
-:focus {
-	outline: 0;
-}
-*/
 /* remember to highlight inserts somehow! */
 ins {
 	text-decoration: none;
@@ -47,16 +26,6 @@
 	text-decoration: line-through;
 }
 
-/* tables still need 'cellspacing="0"' in the markup */
-/*
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-*/
-/* end reset css */
-
-
 /* 2 column liquid layout */
 #wpwrap {
 	height: auto;
@@ -66,16 +35,13 @@
 
 #wpcontent {
 	height: 100%;
-	padding-bottom: 50px;
 }
 
 #wpbody {
 	clear: both;
-	margin-left: 175px;
-}
-
-.folded #wpbody {
-	margin-left: 60px;
+	margin-left: 155px;
+	background: #f5f6f7;
+	box-shadow: inset 2px 0 10px 0 rgba(0,0,0,0.05);
 }
 
 #wpbody-content {
@@ -90,27 +56,12 @@
 	margin-top: 15px;
 	margin-right: 5px;
 	margin-bottom: 15px;
-	margin-left: -160px;
+	margin-left: -150px;
 	position: relative;
 	padding: 0;
 	list-style: none;
 }
 
-.folded #adminmenu {
-	margin-left: -45px;
-}
-
-.folded #adminmenu,
-.folded #adminmenu li.menu-top {
-	width: 28px;
-}
-
-#footer {
-	clear: both;
-	position: relative;
-	width: 100%;
-}
-
 /* inner 2 column liquid layout */
 
 .inner-sidebar {
@@ -177,8 +128,7 @@
 }
 
 .hidden,
-.closed .inside,
-.hide-if-no-js {
+.closed .inside {
 	display: none;
 }
 
@@ -281,6 +231,83 @@
   margin: 2.33em 0;
 }
 
+/* BUTTONS */
+.button,
+.button-secondary,
+.submit input,
+input[type=button],
+input[type=submit] {
+	border-color: #bbb;
+	color: #464646;
+}
+
+.button:hover,
+.button-secondary:hover,
+.submit input:hover,
+input[type=button]:hover,
+input[type=submit]:hover {
+	color: #000;
+	border-color: #999;
+}
+
+.button,
+.submit input,
+.button-secondary {
+	background: #f2f2f2 linear-gradient(#fff, #e8e8e8);
+	box-shadow: 0 1px 0 0 #fff;
+}
+
+.button:active,
+.submit input:active,
+.button-secondary:active {
+	background: #eee;
+}
+
+.button-primary,
+.submit .button-primary,
+#login form .submit input,
+input[type=button].button-primary,
+input[type=submit].button-primary {
+	border-color: #004980;
+	font-weight: bold;
+	color: #fff;
+	background: linear-gradient(#1199c9, #0676c9);
+	box-shadow: 0 1px 0 0 #fff;
+}
+
+.button-primary:hover,
+.submit .button-primary:hover,
+#login form .submit input:hover,
+input[type=button].button-primary:hover,
+input[type=submit].button-primary:hover {
+	border-color: #00355b;
+	box-shadow: 0 3px 15px 0 rgba(0,0,0,0.1);
+}
+
+.button-primary:active,
+#login form .submit input:active,
+input[type=button].button-primary:active,
+input[type=submit].button-primary:active {
+	background: #006cbc;
+}
+
+.button[disabled],
+.button:disabled,
+.button-secondary[disabled],
+.button-secondary:disabled,
+a.button.disabled {
+	color: #ccc;
+	border-color: #ccc;
+}
+
+.button-primary[disabled],
+.button-primary:disabled {
+	color: #2fa0d5;
+}
+
+/* END BUTTONS */
+
+
 .subsubsub {
 	list-style: none;
 	margin: 8px 0 5px;
@@ -314,17 +341,16 @@
 }
 
 .widefat {
-	border-width: 1px;
-	border-style: solid;
+	border: none;
 	border-collapse: separate;
 	border-spacing: 0;
 	width: 100%;
 	clear: both;
-	margin: 0;
+	margin: 10px 0 0 0;
 	-moz-border-radius: 4px;
-	-khtml-border-radius: 4px;
 	-webkit-border-radius: 4px;
 	border-radius: 4px;
+	background: #fff;
 }
 
 .widefat * {
@@ -337,12 +363,18 @@
 
 .widefat td,
 .widefat th {
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
+	border-bottom: 1px solid #ebebeb;
 	font-size: 11px;
 	vertical-align: text-top;
 }
 
+.widefat th {
+	background: #d7dbdb;
+	padding: 7px 7px 5px;
+	text-align: left;
+	border-bottom: 1px solid #babdbe;	
+}
+
 .widefat td {
 	padding: 7px 7px 5px;
 	vertical-align: top;
@@ -351,43 +383,22 @@
 .widefat thead tr th:first {
 	-moz-border-radius-topleft: 4px;
 	-webkit-border-top-left-radius: 4px;
-	-khtml-border-top-left-radius: 4px;
 	border-top-left-radius: 4px;
 }
 
 .widefat thead tr th:last {
 	-moz-border-radius-topright: 4px;
 	-webkit-border-top-right-radius: 4px;
-	-khtml-border-top-right-radius: 4px;
 	border-top-right-radius: 4px;
 }
 
-.widefat tfoot tr th:first {
-	-moz-border-radius-bottomleft: 4px;
-	-webkit-border-bottom-left-radius: 4px;
-	-khtml-border-bottom-left-radius: 4px;
-	border-bottom-left-radius: 4px;
-}
-
-.widefat tfoot tr th:last {
-	-moz-border-radius-bottomright: 4px;
-	-webkit-border-bottom-right-radius: 4px;
-	-khtml-border-bottom-right-radius: 4px;
-	border-bottom-right-radius: 4px;
-}
-
 .widefat td p {
 	font-size: 11px;
 }
 
-.widefat th {
-	padding: 7px 7px 8px;
-	text-align: left;
-	line-height: 1.3em;
-}
-
-.widefat th input {
-	margin: 0 0 0 8px;
+.widefat th input,
+.widefat .check-column input {
+	margin: 3px 0 0 8px;
 	padding: 0;
 	vertical-align: text-top;
 }
@@ -398,7 +409,7 @@
 
 }
 
-.widefat tbody th.check-column {
+.widefat tbody .check-column {
 	padding: 7px 0 22px;
 }
 
@@ -415,19 +426,18 @@
 }
 
 .wrap {
-	margin: 0 15px 0 5px;
+	margin: 0 15px;
 }
 
 .updated,
 .error {
-	border-width: 1px;
-	border-style: solid;
+	border: 1px solid #e6db55;
+	background: rgb(255, 251, 204);
 	padding: 0 0.6em;
 	margin: 5px 15px 2px;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
 }
 
 .updated p,
@@ -443,11 +453,12 @@
 }
 
 .wrap h2 {
-	font: italic normal normal 24px/29px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	font-size: 24px;
+	font-weight: bold;
 	margin: 0;
-	padding: 14px 15px 3px 0;
+	padding: 8px 15px 3px 0;
 	line-height: 35px;
-	text-shadow: rgba(255,255,255,1) 0px 1px 0px;
 }
 
 .wrap h2.long-header {
diff -uNr a/mp-wp/wp-admin/css/ie-rtl.css b/mp-wp/wp-admin/css/ie-rtl.css
--- a/mp-wp/wp-admin/css/ie-rtl.css da639339b917854c07f8af9db49d428ac9efb9407ceba879719450b0d41be7849dfce75fed7a9b984c246c10a07adca1be34083dc91c1645f7fc2db74d14a1c5
+++ b/mp-wp/wp-admin/css/ie-rtl.css false
@@ -1,91 +0,0 @@
-* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
-	background: url(../images/menu-bits-rtl.svg) no-repeat scroll right -109px;
-}
-
-* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
-	background: url(../images/menu-bits-rtl.svg) no-repeat scroll right -206px;
-}
-* html #adminmenu {
-	margin-left:0;
-	margin-right: -80px;
-}
-* html div.folded #adminmenu {
-	margin-left: 0;
-	margin-right: -22px;
-}
-#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
-	padding: 3px 10px 4px 4px;
-}
-.inline-edit-row fieldset label span.title {
-	float: right;
-}
-.inline-edit-row fieldset label span.input-text-wrap {
-	margin-right: 0;
-}
-p.search-box {
-	float: left;
-}
-* html #poststuff h2 {
-	margin-right: 0;
-}
-#bh {
-	margin: 7px 10px 0 0;
-	float: left;
-}
-#user_info + div#favorite-actions {
-	right: auto;
-	left: 15px;
-}
-#wphead-info {
-	float: left;
-}
-/* without this dashboard widgets appear in one column for some screen widths */
-div#dashboard-widgets {
-	padding-right: 0;
-	padding-left: 1px;
-}
-#tagchecklist span a {
-	margin: 4px -9px 0 0;
-}
-.widefat th input {
-	margin: 0 5px 0 0;
-}
-/* ---------- add by navid */
-#TB_window {
-	width: 670px;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin-right: 335px !important;
-}
-#dashboard_plugins {
-	direction: ltr;
-}
-#dashboard_plugins h3.hndle {
-	direction: rtl;
-}
-#dashboard_incoming_links ul li,
-#dashboard_secondary ul li,
-#dashboard_primary ul li,
-p.row-actions {
-	width: 100%;
-}
-#favorite-inside {
-	position: absolute;
-	right:0;
-}
-#post-status-info {
-	height: 25px;
-}
-#screen-meta {
-	position: static;
-}
-p.submit { /* quick edit and reply in edit-comments.php */
-	height:22px;
-}
-.inner-sidebar { /* fix edit single comment */
-	position: static;
-}
-form#widgets-filter { /* fix widget page */
-	position: static;
-}
diff -uNr a/mp-wp/wp-admin/css/ie.css b/mp-wp/wp-admin/css/ie.css
--- a/mp-wp/wp-admin/css/ie.css 3ece7e10f20be0bc3dc6c9dae1dc4fc625b52326d2ffe0bd7c0d0eafd27c674f4098d4f295a52f3102db8c6b2c7c63d3b67c1c0ba8fffb063c8c3bb848d8365b
+++ b/mp-wp/wp-admin/css/ie.css false
@@ -1,343 +0,0 @@
-/* Fixes for IE bugs */
-
-input.button,
-input.button-secondary,
-input.button-highlighted {
-	padding: 0;
-}
-
-#minor-publishing-actions input,
-#major-publishing-actions input,
-#minor-publishing-actions .preview {
-	min-width: auto;
-	padding-left: 0;
-	padding-right: 0;
-}
-
-#wpbody-content .postbox {
-	border: 1px solid #dfdfdf;
-}
-
-#wpbody-content .postbox h3 {
-	margin-bottom: -1px;
-}
-
-* html #side-info-column {
-	height: auto;
-}
-
-* html #wpbody-content #screen-options-link-wrap {
-	display: inline-block;
-	width: 150px;
-	text-align: center;
-}
-
-* html #wpbody-content #contextual-help-link-wrap {
-	display: inline-block;
-	width: 100px;
-	text-align: center;
-}
-
-/*
-* html body.minwidth {
-	_width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%");
-}
-
-* html #wpbody {
-	_width: expression(document.documentElement.clientWidth > 982 ? "980px" : "99.9%");
-}
-*/
-
-* html #adminmenu {
-	margin-left: -80px;
-}
-
-* html div.folded #adminmenu {
-	margin-left: -22px;
-}
-
-* html #wpcontent #adminmenu li.menu-top {
-	display: inline;
-	padding: 0;
-	margin: 0;
-}
-
-#wpcontent.folded #adminmenu li.menu-top {
-	display: block;
-}
-
-ul#adminmenu {
-	z-index: 99;
-}
-
-#adminmenu li.menu-top a.menu-top {
-	min-width: auto;
-	width: auto;
-}
-
-#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu {
-	font-style: normal;
-}
-
-* html #wpcontent #adminmenu .wp-menu-open .wp-menu-toggle {
-	background: none;
-}
-
-* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
-	background: url(../images/menu-bits.svg) no-repeat scroll left -109px;
-}
-
-* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
-	background: url(../images/menu-bits.svg) no-repeat scroll left -206px;
-}
-
-* html #adminmenu div.wp-menu-image {
-	height: 29px;
-}
-
-#wpcontent #adminmenu .wp-submenu li {
-	padding: 0;
-}
-
-#adminmenu,
-.wp-submenu,
-.wp-submenu li,
-.wp-menu-toggle {
-	zoom: 100%;
-}
-
-#wpcontent.folded #adminmenu li.wp-menu-separator {
-	width: 28px;
-}
-
-#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
-	padding: 3px 4px 4px 10px;
-	zoom: 100%;
-}
-
-#wpcontent.folded #adminmenu .menu-top {
-	height: 30px;
-}
-
-.folded #adminmenu .wp-submenu {
-	margin: -1px 0 0 0;
-}
-
-#template,
-#template div,
-#editcat,
-#addcat {
-	zoom: 100%;
-}
-
-.submitbox {
-	margin-top: 10px;
-}
-
-/* Inline Editor */
-#wpbody-content .quick-edit-row-post .inline-edit-col-left {
-	width: 39%;
-}
-
-#wpbody-content .inline-edit-row-post .inline-edit-col-center {
-	width: 19%;
-}
-
-#wpbody-content .quick-edit-row-page .inline-edit-col-left {
-	width: 49%;
-}
-
-#wpbody-content .bulk-edit-row .inline-edit-col-left {
-	width: 29%;
-}
-
-.inline-edit-row p.submit {
-	zoom: 100%;
-}
-
-.inline-edit-row fieldset label span.title {
-	display: block;
-	float: left;
-	width: 5em;
-}
-
-.inline-edit-row fieldset label span.input-text-wrap {
-	margin-left: 0;
-	zoom: 100%;
-}
-
-#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input {
-	line-height: 130%;
-}
-
-#wpbody-content .inline-edit-row .input-text-wrap input {
-	width: 95%;
-}
-
-#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input {
-	width: 8em;
-}
-/* end Inline Editor */
-
-* html .row-actions {
-	visibility: visible;
-}
-
-#dashboard-widgets h3 a {
-	height: 20px;
-	line-height: 20px;
-}
-
-#the-comment-list .comment-item,
-ul#widget-list li.widget-list-item {
-	zoom: 100%;
-}
-
-#wphead-info {
-	float: right;
-}
-
-#titlediv #title {
-	width: 98%;
-}
-
-a.button {
-	line-height: 1.4em;
-	margin: 1px;
-}
-
-* html div.widget-liquid-left-holder,
-* html div.widget-liquid-right {
-	display: block;
-	position: relative;
-}
-
-#screen-options-wrap {
-	overflow: hidden;
-}
-
-#favorite-actions {
-	z-index: 12;
-}
-
-#favorite-inside,
-#favorite-inside a,
-.favorite-action {
-	zoom: 100%;
-}
-
-#post-status-info,
-#wpwrap,
-#wpcontent,
-#post,
-#wrap,
-#postdiv,
-#poststuff,
-.metabox-holder,
-#titlediv,
-#post-body,
-#editorcontainer,
-.tablenav,
-.widget-control-list,
-li.widget-list-control-item,
-#dragHelper,
-li.widget-list-control-item h4,
-.widget-sortable,
-.widget-control-actions,
-#tagchecklist,
-#col-container,
-#col-left,
-#col-right {
-	display: block;
-	zoom: 100%;
-}
-
-p.search-box {
-	position: static;
-	float: right;
-	margin: -3px 0 4px;
-}
-
-* html #editorcontainer {
-	padding: 0;
-}
-
-#editorcontainer #content {
-	overflow: auto;
-	margin: auto;
-	width: 98%;
-}
-
-form#template div {
-	width: 100%;
-}
-
-#ed_toolbar input {
-	overflow: visible;
-	padding: 0 4px;
-}
-
-#poststuff h2 {
-	font-size: 1.6em;
-}
-
-* html #poststuff h2 {
-	margin-left: 0;
-}
-
-#bh {
-	margin: 7px 10px 0 0;
-	float: right;
-}
-
-/* without this dashboard widgets appear in one column for some screen widths */
-div#dashboard-widgets {
-	padding-right: 1px;
-}
-
-#tagchecklist span, #tagchecklist span a {
-	display: inline-block;
-	display: block;
-}
-
-#tagchecklist span a {
-	margin: 4px 0 0 -9px;
-}
-
-.tablenav .button-secondary, .nav .button-secondary {
-	padding: 0 1px;
-	vertical-align: middle;
-}
-
-.tablenav select {
-	font-size: 13px;
-	display: inline-block;
-	vertical-align: top;
-	margin-top: 2px;
-}
-
-table.ie-fixed {
-	table-layout: fixed;
-}
-
-.widefat tr, .widefat th {
-	margin-bottom: 0;
-	border-spacing: 0;
-}
-
-.widefat th input {
-	margin: 0 0 0 5px;
-}
-
-.widefat .check-column {
-	padding: 6px 0 2px;
-}
-
-.widefat tbody th.check-column {
-	padding: 4px 0 22px;
-}
-
-.tablenav a.button-secondary {
-	display: inline-block;
-	padding: 2px 5px;
-}
diff -uNr a/mp-wp/wp-admin/css/install-rtl.css b/mp-wp/wp-admin/css/install-rtl.css
--- a/mp-wp/wp-admin/css/install-rtl.css 5c585c14f0c2ea87ed1ecefabbfafdcd94d30af1d2f4c60c0d1028da88439b9c743c66f93b1ae0581b4f78163e680d5cecf1f54074787b7ce4ae7c191e871f18
+++ b/mp-wp/wp-admin/css/install-rtl.css false
@@ -1,16 +0,0 @@
-body {
-	font-family: Tahoma, arial;
-}
-h1 {
-	font-family: arial;
-	margin: 5px -4px 0 0;
-}
-ul, ol { padding: 5px 22px 5px 5px; }
-.step, th { text-align: right; }
-.submit input, .button, .button-secondary {
-	font-family: Tahoma, arial;
-	margin-right:0;
-}
-.form-table th {
-	text-align: right;
-}
diff -uNr a/mp-wp/wp-admin/css/install.css b/mp-wp/wp-admin/css/install.css
--- a/mp-wp/wp-admin/css/install.css 3a2ff837f6a13ee750a33de77e1aee9fec09035c160ddbac6bbf81a2a56dba4dae07917a32e9a9ae3a06f384b3d9eaf7d1cb2253ea764b73bedfe0808219eef1
+++ b/mp-wp/wp-admin/css/install.css c884356307fe7085683e3b096d54af451799023294a9b72d29baec052c3dc0877283e52b2d7c29153189a496e4ac33ab7311cb45b200d506aa7f952f61a674fd
@@ -2,13 +2,12 @@
 
 body {
 	background: #fff;
-	color: #333;
+	color: #303434;
 	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
 	margin: 2em auto 0 auto;
 	width: 700px;
 	padding: 1em 2em;
 	-moz-border-radius: 11px;
-	-khtml-border-radius: 11px;
 	-webkit-border-radius: 11px;
 	border-radius: 11px;
 	border: 1px solid #dfdfdf;
@@ -58,12 +57,10 @@
 	border: 1px solid #bbb;
 	color: #464646;
 	-moz-border-radius: 15px;
-	-khtml-border-radius: 15px;
 	-webkit-border-radius: 15px;
 	border-radius: 15px;
 	-moz-box-sizing: content-box;
 	-webkit-box-sizing: content-box;
-	-khtml-box-sizing: content-box;
 	box-sizing: content-box;
 }
 
@@ -73,11 +70,11 @@
 }
 
 .button, .submit input, .button-secondary {
-	background: #f2f2f2 url(../images/white-grad.svg) repeat-x scroll left top;
+	background: #f2f2f2;
 }
 
 .button:active, .submit input:active, .button-secondary:active {
-	background: #eee url(../images/white-grad-active.svg) repeat-x scroll left top;
+	background: #eee;
 }
 
 .form-table {
diff -uNr a/mp-wp/wp-admin/css/login-rtl.css b/mp-wp/wp-admin/css/login-rtl.css
--- a/mp-wp/wp-admin/css/login-rtl.css fe30aa78b15cca883b16f976d0ac0082d27b4476faaa9e2a564a846b5e74ee4a2c6845f34d0d6fc356a9a5b8572cb41d0d41df4646adbbdfd70dc6b8c21c7ae1
+++ b/mp-wp/wp-admin/css/login-rtl.css false
@@ -1,30 +0,0 @@
-body {
-	font-family: Tahoma, arial;
-}
-form {
-	margin-right: 8px;
-	margin-left: 0;
-}
-form .forgetmenot {
-	float: right;
-}
-#login form .submit input {
-	font-family: Tahoma, arial;
-}
-form .submit { float: left; }
-#backtoblog a {
-	left: auto;
-	right: 15px;
-}
-#login_error, .message {
-	margin: 0 8px 16px 0;
-}
-#nav { margin: 0 8px 0 0; }
-#user_pass, #user_login, #user_email {
-	margin-left: 6px;
-	margin-right: 0;
-	direction:ltr;
-}
-h1 a {
-	text-decoration: none;
-}
diff -uNr a/mp-wp/wp-admin/css/login.css b/mp-wp/wp-admin/css/login.css
--- a/mp-wp/wp-admin/css/login.css 587df820eb42311f2042de9e7218327dfe4cfc7b655bfebf5cb88db6d1840906c944455ff114a88f7ea69769b7f60df9a289d47197516b9128f5acf5b6f43400
+++ b/mp-wp/wp-admin/css/login.css 8fa4fe366ba593b79e09bcb375647106703d0483efe12c1bc600130b70633ff1a31db6d563429d61dda24d5a8fd9d0df999726f3175e0bfb8b0b43314d4cdc23
@@ -11,14 +11,12 @@
 	padding: 16px 16px 40px 16px;
 	font-weight: normal;
 	-moz-border-radius: 11px;
-	-khtml-border-radius: 11px;
 	-webkit-border-radius: 11px;
-	border-radius: 5px;
+	border-radius: 4px;
 	background: #fff;
 	border: 1px solid #e5e5e5;
 	-moz-box-shadow: rgba(200,200,200,1) 0 4px 18px;
 	-webkit-box-shadow: rgba(200,200,200,1) 0 4px 18px;
-	-khtml-box-shadow: rgba(200,200,200,1) 0 4px 18px;
 	box-shadow: rgba(200,200,200,1) 0 4px 18px;
 }
 
@@ -26,19 +24,33 @@
 
 #login form .submit input {
 	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-	padding: 3px 10px;
-	border: none;
-	font-size: 12px;
+	text-decoration: none;
+	font-size: 11px;
+	line-height: 16px;
+	padding: 2px 8px;
+	cursor: pointer;
 	border-width: 1px;
 	border-style: solid;
-	-moz-border-radius: 11px;
-	-khtml-border-radius: 11px;
-	-webkit-border-radius: 11px;
-	border-radius: 11px;
-	cursor: pointer;
-	text-decoration: none;
-	margin-top: -3px;
-	text-shadow: rgba(0,0,0,0.3) 0 -1px 0;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+}
+
+.button-primary {
+	border-color: #004980;
+	font-weight: bold;
+	color: #fff;
+	background: linear-gradient(#1199c9, #0676c9);
+	box-shadow: 0 1px 0 0 #fff;
+}
+
+.button-primary:hover {
+	border-color: #00355b;
+	box-shadow: 0 3px 15px 0 rgba(0,0,0,0.1);
+}
+
+.button-primary:active {
+	background: #006cbc;
 }
 
 #login form p {
@@ -59,18 +71,10 @@
 
 form p { margin-bottom: 24px; }
 
-h1 a {
-	background: url(../images/logo-login.svg) no-repeat top center;
+h1 {
 	width: 326px;
 	height: 67px;
-	text-indent: -9999px;
-	overflow: hidden;
-	padding-bottom: 15px;
-	display: block;
-}
-
-#nav {
-	text-shadow: rgba(255,255,255,1) 0 1px 0;
+	text-align: center;
 }
 
 #backtoblog a {
@@ -78,19 +82,19 @@
 	top: 7px;
 	left: 15px;
 	text-decoration: none;
+	color: #fff;
 }
 
 #login { width: 320px; margin: 7em auto; }
 
 #login_error, .message {
 	margin: 0 0 16px 8px;
-	border-width: 1px;
-	border-style: solid;
+	border: 1px solid #e6db55;
+	background: rgb(255, 251, 204);
 	padding: 12px;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
 }
 
 #nav { margin: 0 0 0 8px; padding: 16px; }
diff -uNr a/mp-wp/wp-admin/css/media-rtl.css b/mp-wp/wp-admin/css/media-rtl.css
--- a/mp-wp/wp-admin/css/media-rtl.css 706c8cfd052de05246f11d5a5b55da423f15e6270c5f6b1c5008b01bb8672e32bad1068faafe1d2146e68f70a40c29d581f35d2059d4be0a3943397f998b26ae
+++ b/mp-wp/wp-admin/css/media-rtl.css false
@@ -1,93 +0,0 @@
-body#media-upload ul#sidemenu {
-	left: auto;
-	right: 0;
-}
-#search-filter {
-	text-align: left;
-}
-/* specific to the image upload form */
-.align .field label {
-	padding: 0 28px 0 0;
-	margin: 0 0 0 1em;
-}
-.image-align-none-label, .image-align-left-label, .image-align-center-label, .image-align-right-label {
-	background-position: center right;
-}
-tr.image-size div.image-size-item {
-	float: right;
-}
-tr.image-size label {
-	margin: 0 1em 0 0;
-}
-.filename.original {
-	float: right;
-}
-.crunching {
-	text-align: left;
-	margin-right: 0;
-	margin-left: 5px;
-}
-button.dismiss {
-	right: auto;
-	left: 5px;
-}
-.file-error {
-	margin: 0 50px 5px 0;
-}
-.progress {
-	left: auto;
-	right: 0;
-}
-.describe td {
-	padding: 0 0 0 5px;
-}
-.bar {
-	border-right-width: 0;
-	border-left-width: 3px;
-	border-right-style: none;
-	border-left-style: solid;
-}
-.media-item .pinkynail {
-	float: right;
-}
-.describe-toggle-on,
-.describe-toggle-off {
-	float: left;
-	margin-right: 0;
-	margin-left: 20px;
-}
-/* Specific to Uploader */
-#media-upload .media-upload-form p {
-	margin: 0 0 1em 1em;
-}
-.filename {
-	float: right;
-	margin-left: 0;
-	margin-right: 10px;
-}
-#media-upload .describe th.label {
-	text-align: right;
-}
-.menu_order {
-	float: left;
-}
-.media-upload-form label.form-help, td.help, #media-upload p.help, #media-upload label.help {
-	font-family: Tahoma, Arial;
-}
-#gallery-settings #basic th.label {
-	padding: 5px 0 5px 5px;
-}
-#gallery-settings .title, h3.media-title {
-	font-family: Tahoma, Arial;
-}
-#gallery-settings .describe th.label {
-	text-align: right;
-}
-#gallery-settings label,
-#gallery-settings legend {
-	margin-right: 0;
-	margin-left: 15px;
-}
-#gallery-settings .align .field label {
-	margin: 0 0 0 1.5em;
-}
diff -uNr a/mp-wp/wp-admin/css/media.css b/mp-wp/wp-admin/css/media.css
--- a/mp-wp/wp-admin/css/media.css a6d228df4415a1ddee08a386825b0ff1a6875344c256010653f38665bc6375eaa98269880cff0d285126695c89459ffcafb89b092ed8580674c5e61a3d5c648d
+++ b/mp-wp/wp-admin/css/media.css 38b490fd39db8d4a11500dfd796cd7c10e391d9b9676977c64b523656d9babf40cd17fe123edf4c238915af48f3cf1c7ac509f0b05c0c969918bd12a23762f62
@@ -68,22 +68,6 @@
 	margin: 0 1em 0 0;
 }
 
-.image-align-none-label {
-	background: url(../images/align-none.svg) no-repeat center left;
-}
-
-.image-align-left-label {
-	background: url(../images/align-left.svg) no-repeat center left;
-}
-
-.image-align-center-label {
-	background: url(../images/align-center.svg) no-repeat center left;
-}
-
-.image-align-right-label {
-	background: url(../images/align-right.svg) no-repeat center left;
-}
-
 tr.image-size td {
 	width: 460px;
 }
diff -uNr a/mp-wp/wp-admin/css/plugin-install-rtl.css b/mp-wp/wp-admin/css/plugin-install-rtl.css
--- a/mp-wp/wp-admin/css/plugin-install-rtl.css e41b4dec130277f1105cacf9669cd3208b49d45809aa990737388768a85a4fe83482512fc78cec16f3cc222f29c7a3f367469c25cfc2bfd5098597070bd91391
+++ b/mp-wp/wp-admin/css/plugin-install-rtl.css false
@@ -1,43 +0,0 @@
-div.star {
-	left: auto;
-	right: 0;
-	letter-spacing: 0;
-}
-.star img, div.star a, div.star a:hover, div.star a:visited {
-	right: auto;
-	left: 0;
-}
-#plugin-information ul#sidemenu {
-	left: auto;
-	right: 0;
-}
-#plugin-information h2 {
-	margin-right: 0;
-	margin-left: 200px;
-}
-#plugin-information .fyi {
-	margin-left: 5px;
-	margin-right: 20px;
-}
-#plugin-information .fyi h2 {
-	margin-left: 0;
-}
-#plugin-information .fyi ul {
-	padding: 10px 7px 10px 5px;
-}
-#plugin-information #section-screenshots li p {
-	padding-left: 0;
-	padding-right: 20px;
-}
-#plugin-information .updated,
-#plugin-information pre {
-	margin-right: 0;
-	margin-left: 215px;
-}
-#plugin-information .updated, #plugin-information .error {
-	clear: none;
-	direction: rtl;
-}
-#section-description {
-	direction: ltr;
-}
diff -uNr a/mp-wp/wp-admin/css/plugin-install.css b/mp-wp/wp-admin/css/plugin-install.css
--- a/mp-wp/wp-admin/css/plugin-install.css 71b90176bf4774f8f41e8c6a3e771d4aaa2b2250665e8eb702e33792f1ec90843696ae39b33eddc0233a52368d38dcf3943b68555fbcef151f97c1b980a3ca7c
+++ b/mp-wp/wp-admin/css/plugin-install.css false
@@ -1,149 +0,0 @@
-/* NOTE: the following CSS rules(.star*) are taken more or less straight from the bbPress rating plugin. */
-div.star-holder {
-	position: relative;
-	height: 19px;
-	width: 100px;
-	font-size: 19px;
-}
-
-div.star {
-	height: 100%;
-	position: absolute;
-	top: 0;
-	left: 0;
-	background-color: transparent;
-	letter-spacing: 1ex;
-	border: none;
-}
-
-.star1 { width: 20%; }
-.star2 { width: 40%; }
-.star3 { width: 60%; }
-.star4 { width: 80%; }
-.star5 { width: 100%; }
-
-.star img, div.star a, div.star a:hover, div.star a:visited {
-	display: block;
-	position: absolute;
-	right: 0;
-	border: none;
-	text-decoration: none;
-}
-
-div.star img {
-	width: 19px;
-	height: 19px;
-	border-left: 1px solid #fff;
-	border-right: 1px solid #fff;
-}
-
-/* Start custom CSS */
-/* Header on thickbox */
-#plugin-information-header {
-	margin: 0;
-	padding: 0 5px;
-	font-weight: bold;
-	position: relative;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	height: 2.5em;
-}
-#plugin-information ul#sidemenu {
-	font-weight: normal;
-	margin: 0 5px;
-	position: absolute;
-	left: 0;
-	bottom: -1px;
-}
-
-/* Install sidemenu */
-#plugin-information p.action-button {
-	width: 100%;
-	padding-bottom: 0;
-	margin-bottom: 0;
-	margin-top: 10px;
-	-moz-border-radius: 3px 0 0 3px;
-	-webkit-border-top-left-radius: 3px;
-	-khtml-border-top-left-radius: 3px;
-	border-top-left-radius: 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-	border-top-bottom-radius: 3px;
-}
-
-#plugin-information .action-button a {
-	text-align: center;
-	font-weight: bold;
-	text-decoration: none;
-	display: block;
-	line-height: 2em;
-}
-
-#plugin-information h2 {
-	clear: none !important;
-	margin-right: 200px;
-}
-
-#plugin-information .fyi {
-	margin-left: 10px;
-	margin-bottom: 50px;
-	width: 210px;
-}
-
-#plugin-information .fyi h2 {
-	font-size: 0.9em;
-	margin-bottom: 0;
-	margin-right: 0;
-}
-
-#plugin-information .fyi h2.mainheader {
-	padding: 5px;
-	-moz-border-radius-topleft: 3px;
-	-webkit-border-top-left-radius: 3px;
-	-khtml-border-top-left-radius: 3px;
-	border-top-left-radius: 3px;
-}
-
-#plugin-information .fyi ul {
-	padding: 10px 5px 10px 7px;
-	margin: 0;
-	list-style: none;
-	-moz-border-radius-bottomleft: 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-	border-top-bottom-radius: 3px;
-}
-
-#plugin-information .fyi li {
-	margin-right: 0;
-}
-
-#plugin-information #section-holder {
-	padding: 10px;
-}
-
-#plugin-information .section ul,
-#plugin-information .section ol {
-	margin-left: 16px;
-	list-style-type: square;
-	list-style-image: none;
-}
-
-#plugin-information #section-screenshots li img {
-	vertical-align: text-top;
-}
-
-#plugin-information #section-screenshots li p {
-	font-style: italic;
-	padding-left: 20px;
-	padding-bottom: 2em;
-}
-
-#plugin-information .updated,
-#plugin-information pre {
-	margin-right: 215px;
-}
-
-#plugin-information pre {
-	padding: 7px;
-}
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/css/theme-editor-rtl.css b/mp-wp/wp-admin/css/theme-editor-rtl.css
--- a/mp-wp/wp-admin/css/theme-editor-rtl.css 713c562e77f6cec28cadcabfd626cb6972f66274bbc4ef99ec1252e1aa949026da1c893c51dc4c2b3eec99847bb8d488243a90008b6eb4325f868a721127c06a
+++ b/mp-wp/wp-admin/css/theme-editor-rtl.css false
@@ -1,12 +0,0 @@
-#templateside {
-	float: left;
-}
-#themeselector {
-	padding-right: 0;
-	padding-left: 5px;
-	float: left;
-}
-div.tablenav {
-	margin-right: 0;
-	margin-left: 210px;
-}
diff -uNr a/mp-wp/wp-admin/css/theme-editor.css b/mp-wp/wp-admin/css/theme-editor.css
--- a/mp-wp/wp-admin/css/theme-editor.css 706a65caed9197a30da7516cb77768a99b76dd9a1a194941cc95a9918454836b5cedd8181d0e281738118eb2f7342d568589437b653a560ac290aa1c29191ec9
+++ b/mp-wp/wp-admin/css/theme-editor.css false
@@ -1,66 +0,0 @@
-#template textarea {
-	font-family: Consolas, Monaco, Courier, monospace;
-	font-size: 12px;
-	width: 97%;
-}
-
-#template p {
-	width: 97%;
-}
-
-#templateside {
-	float: right;
-	width: 190px;
-}
-
-#templateside h3, #postcustomstuff p.submit {
-	margin: 0;
-}
-
-h3#bordertitle {
-	margin-bottom: 10px;
-}
-
-#templateside h4 {
-	margin-bottom: 0;
-}
-
-#templateside ol, #templateside ul {
-	list-style: none;
-	margin: .5em;
-	padding: 0;
-}
-
-#templateside ol li, #templateside ul li {
-	margin: 1px 0;
-}
-
-#themeselector {
-	padding-right: 5px;
-	float: right;
-	position: relative;
-	bottom: 25px;
-	top:20px;
-}
-
-#themeselector select {
-	margin: 0;
-	padding: 0;
-}
-
-.nonessential {
-	font-size: small;
-}
-
-.highlight {
-	padding: 1px;
-}
-
-div.bordertitle h2 {
-	border: none;
-	padding-bottom: 0;
-}
-
-div.tablenav {
-	margin-right: 210px;
-}
diff -uNr a/mp-wp/wp-admin/css/widgets-rtl.css b/mp-wp/wp-admin/css/widgets-rtl.css
--- a/mp-wp/wp-admin/css/widgets-rtl.css bc3af16194eebd59242e3e9f90e8b4d8792e051a36faf273095f861a132c3586040fb3b383cfe0a8aa5796c4bad49dee942c77929dd58391f232598ed8d6c315
+++ b/mp-wp/wp-admin/css/widgets-rtl.css false
@@ -1,27 +0,0 @@
-h4.widget-title span {
-	float: right;
-}
-h4.widget-title a {
-	float: left;
-	margin-left: 0;
-	margin-right: 1em;
-}
-ul#widget-list li.widget-list-item h4.widget-title {
-	float: right;
-}
-ul#widget-list li.widget-list-item div.widget-description {
-	margin: 0 200px 0 0;
-	padding: 0 4em 0 0;
-}
-.widget-control-save,
-.widget-control-remove {
-	margin-right: 0;
-	margin-left: 8px;
-	float: right;
-}
-li.widget-list-control-item h4.widget-title a,
-#dragHelper li.widget-list-control-item h4.widget-title a,
-#draghelper li.widget-list-control-item h4.widget-title a:visited {
-	right: auto;
-	left: 1em;
-}
diff -uNr a/mp-wp/wp-admin/css/widgets.css b/mp-wp/wp-admin/css/widgets.css
--- a/mp-wp/wp-admin/css/widgets.css be6966c8cca6095f5544d2b04b153bb0b5764b6dbba2764ec3d941d6884c5a183ae59535815c9fe14d39859bed3d4e55b3082ffbeb5b39bf3337244e2b595bff
+++ b/mp-wp/wp-admin/css/widgets.css 0e2494b546e842f858a44d0175d04fccdb967b3ff4c2b1f6d2ad54da1b107eb46627a491afb0aa13829b25f218948fe06580672b53e7f6da779e9d31671f500d
@@ -60,7 +60,6 @@
 	float: left;
 	font-size: 13px;
 	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
@@ -100,7 +99,6 @@
 li.widget-list-control-item {
 	margin: 1em 0;
 	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
@@ -114,7 +112,6 @@
 	padding: 0.4em 0.8em;
 	position: relative;
 	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
diff -uNr a/mp-wp/wp-admin/css/wp-admin.css b/mp-wp/wp-admin/css/wp-admin.css
--- a/mp-wp/wp-admin/css/wp-admin.css false
+++ b/mp-wp/wp-admin/css/wp-admin.css a01fb7c35645965388bcbcae02eda7baa152ff84680a3770d5169e3754a15f712ee366b367b5e74fe959ddb1af79bd614696d4d52b21df6e7ce6c99c3a9e52fb
@@ -0,0 +1,2213 @@
+
+p, ul, ol, blockquote { font-size: 12px; }
+
+a {
+	color: #006cbc;	
+}
+
+a:hover {
+	color: #d54e21;
+}
+
+input[type=text], textarea {
+	border: 1px solid #d7dbdb;
+}
+
+input[type=text]:focus,
+textarea:focus {
+	border: 1px solid #2898dd;
+}
+
+.plugins .name,
+#pass-strength-result.strong,
+#pass-strength-result.short,
+.button-highlighted,
+#ed_reply_toolbar #ed_reply_strong {
+	font-weight: bold;
+}
+
+.plugins p {
+	margin: 0 4px;
+	padding: 0;
+}
+
+.plugins .togl {
+	width: 150px;
+}
+
+.import-system {
+	font-size: 16px;
+}
+
+.anchors {
+	margin: 10px 20px 10px 20px;
+}
+
+table#availablethemes {
+	border-spacing: 0;
+	border: none;
+	margin: 10px auto;
+	width: 100%;
+}
+
+td.available-theme {
+	vertical-align: top;
+	width: 240px;
+	margin: 0;
+	padding: 20px;
+	text-align: left;
+}
+
+table#availablethemes td {
+	border: 1px solid #ddd;
+}
+
+table#availablethemes td.right,
+table#availablethemes td.left  {
+	border-right: 0 none;
+	border-left: 0 none;
+}
+
+table#availablethemes td.bottom {
+	border-bottom: 0 none;
+}
+
+#wphead {
+	background: #303434;
+}
+
+#wphead h1 a {
+	color: #ccc;
+}
+
+#wphead h1 a:hover {
+	color: #fff;
+}
+
+#user_info {
+	color: #999;
+}
+
+#user_info a:link, #user_info a:visited {
+	color: #ccc;
+	text-decoration: none;
+}
+
+#user_info a:hover {
+	color: #fff;
+	text-decoration: underline;
+}
+
+#user_info a:active {
+	color: #ccc;
+}
+
+.available-theme a.screenshot {
+	width: 240px;
+	height: 180px;
+	display: block;
+	border-width: 1px;
+	border-style: solid;
+	margin-bottom: 10px;
+	overflow: hidden;
+}
+
+.available-theme img {
+	width: 240px;
+}
+
+.available-theme h3 {
+	margin: 15px 0 5px;
+}
+
+#current-theme {
+	margin: 1em 0 1.5em;
+}
+
+#current-theme a {
+	border-bottom: none;
+}
+
+#current-theme h3 {
+	font-size: 17px;
+	font-weight: normal;
+	margin: 0;
+}
+
+#current-theme .description {
+	margin-top: 5px;
+}
+
+#current-theme img {
+	float: left;
+	border-width: 1px;
+	border-style: solid;
+	margin-right: 1em;
+	margin-bottom: 1.5em;
+	width: 150px;
+}
+
+#TB_window #TB_title a.tb-theme-preview-link,
+#TB_window #TB_title a.tb-theme-preview-link:visited {
+	font-weight: bold;
+	text-decoration: none;
+}
+
+.checkbox {
+	border: none;
+	margin: 0;
+	padding: 0;
+}
+
+.code, code {
+	font-family: Consolas, Monaco, Courier, monospace;
+}
+
+kbd, code {
+	padding: 1px 3px;
+	margin: 0 1px;
+	font-size: 11px;
+}
+
+.commentlist li {
+	padding: 1em 1em .2em;
+	margin: 0;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+.commentlist li li {
+	border-bottom: 0;
+	padding: 0;
+}
+
+.commentlist p {
+	padding: 0;
+	margin: 0 0 .8em;
+}
+
+.post-categories {
+	display: inline;
+	margin: 0;
+	padding: 0;
+}
+
+.post-categories li {
+	display: inline;
+}
+
+.search {
+	font: 12px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+}
+
+.submit {
+	padding: 1.5em 0;
+	margin: 5px 0;
+	-moz-border-radius: 0 0 3px 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px;
+	border-bottom-right-radius: 3px;
+}
+
+form p.submit a.cancel:hover {
+	text-decoration: none;
+}
+
+#submitdiv h3,
+#pagesubmitdiv h3 {
+	margin-bottom: 0 !important;
+}
+
+#misc-publishing-actions {
+	padding: 6px 0 16px 0;
+}
+
+.misc-pub-section {
+	padding: 6px;
+	border-bottom: 1px solid #d7dbdb;
+}
+
+.misc-pub-section-last {
+	border-bottom: 0 none;
+}
+
+#minor-publishing-actions {
+	padding: 6px;
+	text-align: right;
+}
+
+#minor-publishing {
+	border-bottom: 1px solid #d7dbdb;
+}
+
+#save-post {
+	float: left;
+}
+
+.preview {
+	float: right;
+}
+
+#major-publishing-actions {
+	padding: 6px;
+	clear: both;
+	border-top: none;
+}
+
+#minor-publishing-actions input,
+#major-publishing-actions input,
+#minor-publishing-actions .preview {
+	min-width: 80px;
+	text-align: center;
+}
+
+#delete-action {
+	line-height: 25px;
+	vertical-align: middle;
+	text-align: left;
+	float: left;
+}
+
+#publishing-action {
+	text-align: right;
+	float: right;
+}
+
+#post-body #minor-publishing {
+	padding-bottom: 10px;
+}
+
+#post-body #misc-publishing-actions {
+	padding: 0;
+}
+
+#post-body .misc-pub-section {
+	border-right-width: 1px;
+	border-right-style: solid;
+	border-bottom: 0 none;
+	min-height: 30px;
+	float: left;
+	max-width: 32%;
+}
+
+#post-body .misc-pub-section-last {
+	border-right: 0;
+}
+
+#sticky-span {
+	margin-left: 18px;
+}
+
+.side-info {
+	margin: 0;
+	padding: 4px;
+	font-size: 11px;
+}
+
+.side-info h5 {
+	padding-bottom: 7px;
+	font-size: 14px;
+	margin: 12px 2px 5px;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+.side-info ul {
+	margin: 0;
+	padding-left: 18px;
+	list-style: square;
+}
+
+.submit input,
+.button,
+.button-primary,
+.button-secondary,
+.button-highlighted,
+#postcustomstuff .submit input {
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	text-decoration: none;
+	font-size: 11px;
+	line-height: 16px;
+	padding: 2px 8px;
+	cursor: pointer;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+}
+
+a.button,
+a.button-primary,
+a.button-secondary {
+	line-height: 1.2em;
+	-webkit-border-radius: 2px;
+	padding: 4px 10px;
+}
+
+#doaction {
+	margin-right: 8px;
+}
+
+.tablenav select[name="action"] {
+	width: 120px;
+}
+
+.tablenav select[name="m"] {
+	width: 120px;
+}
+
+.tablenav select#cat {
+	width: 150px;
+}
+
+#wpcontent select {
+	font: 11px/20px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	padding: 0;
+	box-shadow: 0 1px 0 0 #fff;
+	height: 2em;
+}
+
+#wpcontent option {
+	padding: 2px;
+}
+
+.approve {
+	display: none;
+}
+
+.unapproved .approve, .spam .approve {
+	display: inline;
+}
+
+.unapproved .unapprove {
+	display: none;
+}
+
+.narrow {
+	width: 70%;
+	margin-bottom: 40px;
+}
+
+.narrow p {
+	line-height: 150%;
+}
+
+table .vers {
+	text-align: center;
+}
+
+textarea.all-options, input.all-options {
+	width: 250px;
+}
+
+#namediv table {
+	width: 100%;
+}
+
+#namediv td.first {
+	width: 10px;
+	white-space: nowrap;
+}
+
+#namediv input {
+	width: 98%;
+}
+
+#namediv p {
+	margin: 10px 0;
+}
+
+#wpbody-content .metabox-holder {
+	padding-top: 10px;
+}
+
+#content {
+	margin: 0;
+	width: 100%;
+}
+
+#editorcontainer #content {
+	padding: 6px;
+	line-height: 150%;
+	outline: none;
+	-moz-border-radius: 6px 6px 0 0;
+	-webkit-border-radius: 6px 6px 0 0;
+	border-radius: 6px 6px 0 0;
+}
+
+#editorcontainer {
+	border-collapse: separate;
+	-moz-border-radius: 6px 6px 0 0;
+	-webkit-border-radius: 6px 6px 0 0;
+	border-radius: 6px 6px 0 0;
+}
+
+#ed_toolbar input {
+	margin: 3px 1px 4px;
+	line-height: 18px;
+	display: inline-block;
+	border-width: 1px;
+	border-style: solid;
+	min-width: 26px;
+	padding: 2px 4px;
+	font-size: 12px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+#ed_reply_toolbar #ed_reply_link {
+	text-decoration: underline;
+}
+
+#ed_reply_toolbar #ed_reply_del {
+	text-decoration: line-through;
+}
+
+#ed_reply_toolbar #ed_reply_em {
+	font-style: italic;
+}
+
+#excerpt, .attachmentlinks {
+	margin: 0;
+	height: 4em;
+	width: 98%;
+}
+
+/* post meta postbox */
+#postcustomstuff table,
+#postcustomstuff input,
+#postcustomstuff textarea {
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+#postcustomstuff .updatemeta,
+#postcustomstuff .deletemeta {
+	margin: auto;
+}
+
+#postcustomstuff thead th {
+	padding: 5px 8px 8px;
+}
+
+#postcustom #postcustomstuff .submit,
+#pagecustomdiv #postcustomstuff .submit {
+	border: 0 none;
+	float: none;
+	padding: 5px 8px;
+}
+
+#side-sortables #postcustom #postcustomstuff .submit,
+#side-sortables #pagecustomdiv #postcustomstuff .submit {
+	padding: 0 5px;
+}
+
+#side-sortables #postcustom #postcustomstuff td.left input,
+#side-sortables #pagecustomdiv #postcustomstuff td.left input {
+	margin: 3px 3px 0;
+}
+
+#side-sortables #postcustom #postcustomstuff #the-list textarea,
+#side-sortables #pagecustomdiv #postcustomstuff #the-list textarea {
+	height: 85px;
+	margin: 3px;
+}
+
+#postcustomstuff table {
+	margin: 0;
+	width: 100%;
+	border: none;
+	border-spacing: 0;
+	text-align: left;
+}
+
+#postcustomstuff table input,
+#postcustomstuff table select,
+#postcustomstuff table textarea {
+	width: 95%;
+	margin: 8px 0 8px 8px;
+}
+
+#postcustomstuff th.left,
+#postcustomstuff td.left {
+	width: 38%;
+}
+
+#postcustomstuff .submit input {
+	width: auto;
+}
+
+#postcustomstuff #newmeta .submit {
+	padding: 0 8px;
+}
+
+#postcustomstuff table #addmetasub {
+	width: auto;
+}
+
+#postcustomstuff #newmetaleft {
+	vertical-align: top;
+}
+
+#postcustomstuff #newmetaleft a {
+	padding: 0 10px;
+	text-decoration: none;
+}
+
+#save {
+	width: 15em;
+}
+
+#template div {
+	margin-right: 190px;
+}
+
+* html #template div {
+	margin-right: 0;
+}
+
+/* A handy div class for hiding controls.
+Some browsers will disable them when you
+set display: none; */
+.zerosize {
+	height: 0;
+	width: 0;
+	margin: 0;
+	border: 0;
+	padding: 0;
+	overflow: hidden;
+	position: absolute;
+}
+
+* html #themeselect {
+	padding: 0 3px;
+	height: 22px;
+}
+
+#your-profile legend {
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-size: 22px;
+}
+
+#howto {
+	font-size: 11px;
+	margin: 0 5px;
+	display: block;
+}
+
+div.nav {
+	height: 2em;
+	padding: 7px 10px;
+	vertical-align: text-top;
+	margin: 5px 0;
+}
+
+.nav .button-secondary {
+	padding: 2px 4px;
+}
+
+a.page-numbers {
+	border-bottom-style: solid;
+	border-bottom-width: 2px;
+	font-weight: bold;
+	margin-right: 1px;
+	padding: 0 2px;
+}
+
+p.pagenav {
+	margin: 0;
+	display: inline;
+}
+
+.pagenav span {
+	font-weight: bold;
+	margin: 0 6px;
+}
+
+.row-title {
+	font-size: 12px !important;
+	font-weight: bold;
+}
+
+.column-comment p {
+	margin: 0.6em 0;
+}
+
+.column-author img, .column-username img {
+	float: left;
+	margin-right: 10px;
+	margin-top: 3px;
+}
+
+.tablenav a.button-secondary {
+	display: block;
+	margin: 3px 8px 0 0;
+}
+
+.tablenav {
+	clear: both;
+	height: 30px;
+	margin: 6px 0 4px;
+	vertical-align: middle;
+}
+
+.tablenav .tablenav-pages {
+	float: right;
+	display: block;
+	cursor: default;
+	height: 30px;
+	line-height: 30px;
+	font-size: 11px;
+}
+
+.tablenav .tablenav-pages a, .tablenav-pages span.current  {
+	text-decoration: none;
+	font-weight: normal;
+	padding: 3px 6px;
+	border: 1px solid #ccc;
+	background: #ebebed;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+}
+
+.tablenav .tablenav-pages a {
+	border-color: #006cbc;
+	background: none;
+	font-weight: bold;
+}
+
+.tablenav .displaying-num {
+	margin-right: 10px;
+	font-size: 11px;
+	font-family: monospace;
+}
+
+.tablenav .actions {
+	padding: 2px 8px 0 0;
+}
+
+td.media-icon {
+	vertical-align: middle;
+	text-align: center;
+	width: 80px;
+}
+
+td.media-icon img {
+	max-width: 80px;
+	max-height: 60px;
+}
+
+#update-nag, .plugin-update {
+	line-height: 29px;
+	font-size: 12px;
+	text-align: center;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-top-width: 1px;
+	border-top-style: solid;
+}
+
+#update-nag a, .plugin-update a {
+	font-size: 1.1em;
+}
+
+#pass-strength-result {
+	border-style: solid;
+	border-width: 1px;
+	float: left;
+	margin: 12px 5px 5px 1px;
+	padding: 3px 5px;
+	text-align: center;
+	width: 200px;
+}
+
+.row-actions {
+	visibility: hidden;
+	padding: 2px 0 0;
+}
+
+tr:hover .row-actions,
+div.comment-item:hover .row-actions {
+	visibility: visible;
+}
+
+/* Admin Header */
+#wphead-info {
+	margin: 0 0 0 15px;
+	padding-right: 15px;
+}
+
+#user_info {
+	float: right;
+	font-size: 12px;
+	line-height: 46px;
+	height: 46px;
+}
+
+#user_info p {
+	margin: 0;
+	padding: 0;
+	line-height: 46px;
+}
+
+#wphead {
+	height: 46px;
+}
+
+#wphead a,
+#adminmenu a,
+#sidemenu a,
+#taglist a,
+#catlist a,
+#show-settings a {
+	text-decoration: none;
+}
+
+#header-logo {
+	display: none;
+	float: left;
+	margin: 7px 0 0 15px;
+}
+
+#wphead h1 {
+	padding: 10px 8px 5px;
+	margin: 0;
+	float: left;
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-weight: normal;
+	font-size: 21px;
+}
+
+#wphead h1.long-title {
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-size: 18px;
+	padding: 12px 10px 5px;
+}
+
+#wphead h1 span {
+	font-size: 50%;
+}
+
+/* ADMIN MENU */
+#adminmenu li {
+	line-height: 12px;
+}
+#adminmenu li.wp-menu-separator {
+	border-bottom: 1px solid #ddd;
+	margin: 10px 0;
+}
+
+#adminmenu li.menu-top {
+	margin-top: 8px;
+}
+#adminmenu li.menu-top-first {
+	margin-top: 0;
+}
+#adminmenu a.menu-top {
+	font-weight: bold;
+}
+
+#adminmenu .wp-submenu a {
+	padding-left: 3px;
+}
+
+#adminmenu li {
+	margin: 0;
+}
+
+#adminmenu a {
+	display: block;
+	color: #303434;
+	padding: 3px;
+	margin-left: -2px;
+	border-left: 3px solid transparent;
+}
+
+#adminmenu a.current {
+	border-left: 3px solid #303434;
+}
+
+#adminmenu a:hover {
+	background: #eee;
+}
+
+#adminmenu .pending-count {
+	-moz-border-radius: 12px;
+	-webkit-border-radius: 12px;
+	border-radius: 12px;
+	padding: 2px 6px;
+	background: orange;
+	color: #fff;
+}
+
+#adminmenu .count-0 {
+	display: none;
+}
+
+/* END ADMIN MENU */
+
+/* Tables used on comment.php and option/setting pages */
+
+.form-table {
+	border-collapse: collapse;
+	margin-top: 0.5em;
+	width: 100%;
+	margin-bottom: -8px;
+	clear: both;
+}
+
+.form-table td,
+#wpbody-content .describe td {
+	margin-bottom: 9px;
+	padding: 4px 10px 12px;
+	line-height: 20px;
+	font-size: 11px;
+}
+
+.form-table th,
+.form-wrap label {
+	font-weight: normal;
+}
+
+.form-table th,
+#wpbody-content .describe th {
+	vertical-align: top;
+	text-align: left;
+	padding: 10px;
+	width: 200px;
+}
+
+.form-table th.th-full {
+	width: auto;
+}
+
+.form-table input,
+.form-table textarea,
+#wpbody-content .describe input,
+#wpbody-content .describe textarea {
+	border-width: 1px;
+	border-style: solid;
+}
+
+.form-table div.color-option {
+	display: block;
+	clear: both;
+	margin-top: 12px;
+}
+
+.form-table input.tog {
+	margin-top: 2px;
+	margin-right: 2px;
+	float: left;
+}
+
+.form-table table.color-palette {
+	vertical-align: bottom;
+	float: left;
+	margin: -8px 3px 8px;
+}
+
+.form-table .color-palette td {
+	border-width: 1px 1px 0;
+	border-stile: solid solid none;
+	height: 10px;
+	line-height: 20px;
+	width: 10px;
+}
+
+textarea.large-text {
+	width: 99%;
+}
+
+.form-table input.regular-text {
+	width: 325px;
+}
+
+.form-table input.small-text {
+	width: 50px;
+}
+
+#profile-page .form-table textarea {
+	width: 500px;
+	margin-bottom: 6px;
+}
+
+#profile-page .form-table input[type=text] {
+	width: 300px;
+}
+
+.form-table .pre {
+	padding: 8px;
+	margin: 0;
+}
+
+.pre {
+	/* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
+	white-space: pre-wrap; /* css-3 */
+	white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
+	white-space: -pre-wrap; /* Opera 4-6 */
+	white-space: -o-pre-wrap; /* Opera 7 */
+	word-wrap: break-word; /* Internet Explorer 5.5+ */
+}
+
+table.form-table td .updated {
+	font-size: 13px;
+}
+
+/* divs for cats and tags pages */
+
+.form-wrap {
+	margin: 10px 0;
+	width: 97%;
+}
+
+.form-wrap p,
+.form-wrap label {
+	font-size: 11px;
+}
+
+.form-wrap label {
+	display: block;
+	padding: 2px;
+	font-size: 12px;
+}
+
+.form-field input,
+.form-field textarea {
+	border-style: solid;
+	border-width: 1px;
+	width: 95%;
+}
+
+.form-wrap p {
+	margin: 2px 0 5px;
+}
+
+.setting-description, .form-wrap p {
+	font-style: italic;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+.form-wrap .form-field {
+	margin: 0 0 10px;
+	padding: 8px;
+}
+
+.col-wrap h3 {
+	margin: 12px 0;
+	font-size: 1.1em;
+}
+
+.col-wrap p.submit {
+	margin-top: -10px;
+}
+
+.tagcloud {
+	width: 97%;
+	margin: 0 0 40px;
+}
+
+.tagcloud h3 {
+	margin: 2px 0 12px;
+}
+
+/* Post Screen */
+#normal-sortables {
+	min-height: 50px;
+}
+
+.postbox {
+	position: relative;
+	min-width: 255px;
+	width: 99.5%;
+}
+
+#trackback_url {
+	width: 99%;
+}
+
+#normal-sortables .postbox .submit {
+	background: transparent none;
+	border: 0 none;
+	float: right;
+	padding: 0 12px;
+	margin: 0;
+}
+
+#normal-sortables .postbox #replyrow .submit {
+	float: none;
+	margin: 0;
+	padding: 3px 7px;
+}
+
+#side-sortables {
+	min-height: 300px;
+}
+
+#side-sortables .submitbox .submit input,
+#side-sortables .submitbox .submit .preview,
+#side-sortables .submitbox .submit a.preview:hover {
+	border: 0 none;
+}
+
+#side-sortables .inside-submitbox .insidebox,
+.stuffbox .insidebox {
+	margin: 11px 0;
+}
+
+#side-sortables .comments-box,
+#side-sortables #show-comments {
+	display: none;
+}
+
+#post-body #tagsdiv #newtag {
+	margin-right: 5px;
+	width: 16em;
+}
+
+#side-info-column input#post_password {
+	width: 94%
+}
+
+#side-info-column #tagsdiv #newtag {
+	width: 68%;
+}
+
+#post-status-info {
+	font-size: 12px;
+	line-height: 2;
+	padding: 0 15px 0 7px;
+	border: 1px solid #ddd;
+	border-top: none;
+	-moz-border-radius: 0 0 6px 6px;
+	-webkit-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+
+#editorcontent #post-status-info {
+	border: none;
+}
+
+#pagesubmitdiv div.inside,
+#linksubmitdiv div.inside,
+ div.inside {
+	padding: 0;
+	margin: 0;
+}
+
+#comment-status-radio p {
+	margin: 3px 0 5px;
+}
+
+#comment-status-radio input {
+	margin: 2px 3px 5px 0;
+	vertical-align: middle;
+}
+
+#comment-status-radio label {
+	padding: 5px 0;
+}
+
+#tagchecklist {
+	margin-left: 10px;
+	font-size: 12px;
+	overflow: auto;
+}
+
+#tagchecklist strong {
+	margin-left: -8px;
+	position: absolute;
+}
+
+#tagchecklist span {
+	margin-right: 25px;
+	display: block;
+	float: left;
+	font-size: 11px;
+	line-height: 1.8em;
+	white-space: nowrap;
+	cursor: default;
+}
+
+#tagchecklist span a {
+	margin: 6px 0pt 0pt -9px;
+	cursor: pointer;
+	width: 10px;
+	height: 10px;
+	display: block;
+	float: left;
+	text-indent: -9999px;
+	overflow: hidden;
+	position: absolute;
+}
+
+.howto {
+	font-style: italic;
+	display: block;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+.ac_results {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	position: absolute;
+	z-index: 10000;
+	display: none;
+	border-width: 1px;
+	border-style: solid;
+}
+
+.ac_results li {
+	padding: 2px 5px;
+	white-space: nowrap;
+	text-align: left;
+}
+
+.ac_over {
+	cursor: pointer;
+}
+
+.ac_match {
+	text-decoration: underline;
+}
+
+#poststuff h2 {
+	margin-top: 20px;
+	font-size: 1.5em;
+	margin-bottom: 15px;
+	padding: 0 0 3px;
+	clear: left;
+}
+
+.ui-sortable .postbox h3 {
+	cursor: pointer;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	user-select: none;
+}
+
+.ui-sortable .postbox .hndle span {
+	padding: 6px 0;
+}
+
+.ui-sortable .postbox .hndle {
+	background: #eee;
+}
+
+.hndle a {
+	font-size: 11px;
+	font-weight: normal;
+}
+
+.sortable-placeholder {
+	border-width: 1px;
+	border-style: dashed;
+	z-index: -1;
+}
+
+#poststuff h3,
+.metabox-holder h3 {
+	font-size: 10px;
+	font-weight: normal;
+	padding: 7px 9px;
+	margin: 0;
+	line-height: 1;
+	text-transform: uppercase;
+	color: #555;
+	font-family: monospace;
+}
+
+.metabox-holder .postbox,
+#poststuff .postbox,
+#poststuff .stuffbox {
+	background: #fff;
+	margin-bottom: 20px;
+	border: 1px solid #d7dbdb;
+	line-height: 1;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	box-shadow: inset 0 1px 3px 0 rgba(0,0,0,0.05), 0 1px 0 0 #fff;
+}
+
+.metabox-holder .postbox h3,
+#poststuff .postbox h3,
+#poststuff .stuffbox h3 {
+	-moz-border-radius: 4px 4px 0 0;
+	-webkit-border-top-right-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	border-top-left-radius: 4px;
+}
+
+.postbox table.form-table {
+	margin-bottom: 0;
+}
+
+.postbox input[type="text"],
+.postbox textarea,
+.stuffbox input[type="text"],
+.stuffbox textarea {
+	border-width: 1px;
+	border-style: solid;
+}
+
+.postbox input.tags-input {
+	width: 100%;
+}
+
+#poststuff .inside,
+#poststuff .inside p {
+	font-size: 11px;
+	margin: 6px;
+}
+
+#poststuff .inside .submitbox p {
+	margin: 1em 0;
+}
+
+#post-visibility-select {
+	line-height: 1.5em;
+	margin-top: 3px;
+}
+
+#poststuff #submitdiv .inside {
+	margin: 0;
+}
+
+#titlediv, #poststuff .postarea {
+	margin-bottom: 20px;
+}
+
+#titlediv {
+	margin-bottom: 20px;
+}
+#titlediv label { cursor: text; }
+
+#titlediv div.inside {
+	margin: 0;
+}
+
+#poststuff #titlewrap {
+	border: 0;
+	padding: 0;
+
+}
+
+#titlediv #title {
+	padding: 6px 8px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	font-size: 18px;
+	width: 100%;
+	outline: none;
+}
+
+#poststuff .inside-submitbox,
+#side-info-column .inside-submitbox {
+	margin: 0 3px;
+	font-size: 11px;
+}
+
+input#link_description,
+input#link_url {
+	width: 98%;
+}
+
+#pending {
+	background: 0 none;
+	border: 0 none;
+	padding: 0;
+	font-size: 11px;
+	margin-top: -1px;
+}
+
+#edit-slug-box {
+	display: flex;
+	margin-top: 5px;
+	padding: 0 7px;
+}
+
+#edit-slug-box strong,
+#edit-slug-box span#sample-permalink {
+	margin-top: 9px;
+}
+
+#edit-slug-box input {
+	flex-grow: 1;
+}
+
+.postarea h3 label {
+	float: left;
+}
+
+.postarea #add-media-button {
+	float: right;
+	margin: 7px 0pt 0pt;
+	position: relative;
+	right: 10px;
+}
+
+#poststuff #editor-toolbar {
+	height: 30px;
+}
+
+#poststuff #edButtonPreview,
+#poststuff #edButtonHTML {
+	display: block;
+	height: 18px;
+	margin: 5px 5px 0 0;
+	padding: 4px 5px 2px;
+	float: right;
+	cursor: pointer;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 3px 3px 0 0;
+	-webkit-border-top-right-radius: 3px;
+	-webkit-border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+}
+
+#poststuff #edButtonHTML {
+	margin-right: 15px;
+}
+
+#media-buttons {
+	cursor: default;
+	padding: 8px 8px 0;
+}
+
+#media-buttons a {
+	cursor: pointer;
+	padding: 0 0 5px 10px;
+}
+
+#media-buttons img {
+	vertical-align: middle;
+}
+
+.submitbox .submit {
+	text-align: left;
+	padding: 12px 10px 10px;
+	font-size: 11px;
+}
+
+.submitbox .submitdelete {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	text-decoration: none;
+	padding: 1px 2px;
+}
+
+.inside-submitbox #post_status {
+	margin: 2px 0 2px -2px;
+}
+
+.submitbox .submit a:hover {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+.submitbox .submit input {
+	margin-bottom: 8px;
+	margin-right: 4px;
+	padding: 6px;
+}
+
+#post-status-select {
+	line-height: 2.5em;
+	margin-top: 3px;
+}
+
+/* Categories */
+
+#category-adder {
+	margin-left: 120px;
+	padding: 4px 0;
+}
+
+#category-adder h4 {
+	margin: 0 0 8px;
+}
+
+#side-info-column #category-adder {
+	margin: 0;
+}
+
+#post-body #category-add input, #category-add select {
+	width: 30%;
+}
+
+#side-info-column #category-add input {
+	width: 94%;
+}
+
+#side-info-column #category-add select {
+	width: 100%;
+}
+
+#category-add input#category-add-sumbit {
+	width: auto;
+}
+
+#post-body ul#category-tabs {
+	float: left;
+	width: 120px;
+	text-align: right;
+	/* Negative margin for the sake of those without JS: all tabs display */
+	margin: 0 -120px 0 0;
+	padding: 0;
+}
+
+#post-body ul#category-tabs li {
+	padding: 8px;
+}
+
+#post-body ul#category-tabs li.ui-tabs-selected {
+	-moz-border-radius: 3px 0 0 3px;
+	-webkit-border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	border-top-left-radius: 3px;
+	border-bottom-left-radius: 3px;
+}
+
+#post-body ul#category-tabs li.ui-tabs-selected a {
+	font-weight: bold;
+	text-decoration: none;
+}
+
+#side-info-column #category-tabs li {
+	display: inline;
+	padding-right: 8px;
+}
+
+#side-info-column #category-tabs a {
+	text-decoration: none;
+}
+
+#side-info-column #category-tabs {
+	margin-bottom: 3px;
+}
+
+#categorydiv ul,
+#linkcategorydiv ul {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+#categorydiv ul.categorychecklist ul,
+#linkcategorydiv ul.categorychecklist ul {
+	margin-left: 18px;
+}
+
+ul.categorychecklist li {
+	margin: 0;
+	padding: 0;
+	line-height: 19px;
+}
+
+/* positioning etc. */
+
+form#tags-filter {
+	position: relative;
+}
+
+p.search-box {
+	float: right;
+	margin: -5px 0 0;
+}
+
+.search-input {
+	border: 1px solid #ccc;
+	box-shadow: 0 1px 0 0 #fff, inset 0 1px 2px 0 rgba(0,0,0,0.05);
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px; 
+	padding: 2px;
+}
+
+#posts-filter fieldset {
+	float: left;
+	margin: 0 1.5ex 1em 0;
+	padding: 0;
+}
+
+#posts-filter fieldset legend {
+	padding: 0 0 .2em 1px;
+}
+
+.bordertitle {
+	padding-bottom: 5px;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+/* Edit posts */
+
+td.post-title strong {
+	display: block;
+	margin-bottom: .2em;
+}
+
+td.post-title p {
+	margin: 6px 0;
+}
+
+/* Global classes */
+
+.wp-hidden-children .wp-hidden-child,
+.ui-tabs-hide {
+	display: none;
+}
+
+.commentlist .avatar {
+	vertical-align: text-top;
+}
+
+.defaultavatarpicker .avatar {
+	margin: 2px 0;
+	vertical-align: middle;
+}
+
+body.wp-admin {
+	min-width: 785px;
+	background: #fff;
+}
+
+.view-switch {
+	float: right;
+	margin: 9px 10px 0 0;
+	color: #999;
+}
+
+.view-switch.view-switch-with-border {
+	border-right: 1px solid #ccc;
+}
+
+.view-switch a {
+	text-decoration: none;
+	font-size: 11px;
+	margin-right: 10px;
+}
+
+.filter {
+	float: left;
+	margin: -5px 0 0 10px;
+}
+
+.filter .subsubsub {
+	margin-left: -10px;
+	margin-top: 13px;
+}
+
+#the-comment-list td.comment p.comment-author {
+	margin-top: 0;
+	margin-left: 0;
+}
+
+#the-comment-list p.comment-author img {
+	float: left;
+	margin-right: 8px;
+}
+
+#the-comment-list p.comment-author strong a {
+	border: none;
+}
+
+#the-comment-list td {
+	vertical-align: top;
+}
+
+#the-comment-list td.comment {
+	word-wrap: break-word;
+}
+
+#the-comment-list .check-column {
+	padding-top: 8px;
+}
+
+#templateside ul li a {
+	text-decoration: none;
+}
+
+.tablenav .delete {
+	margin-right: 20px;
+}
+
+td.action-links, th.action-links {
+	text-align: right;
+}
+
+/* Diff */
+
+table.diff {
+	width: 100%;
+}
+
+table.diff col.content {
+	width: 50%;
+}
+
+table.diff tr {
+	background-color: transparent;
+}
+
+table.diff td, table.diff th {
+	padding: .5em;
+	font-family: Consolas, Monaco, Courier, monospace;
+	border: none;
+}
+
+table.diff .diff-deletedline del, table.diff .diff-addedline ins {
+	text-decoration: none;
+}
+
+#wp-word-count {
+	display: block;
+}
+
+fieldset {
+	border: 0;
+	padding: 0;
+	margin: 0;
+}
+
+.tool-box {
+	margin: 15px 0 35px;
+}
+
+.tool-box .buttons {
+	margin: 15px 0;
+}
+
+.tool-box .title {
+	margin: 8px 0;
+	font: 18px/24px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+}
+
+.pressthis a {
+	font-size: 1.2em;
+}
+
+#wp_editbtns,
+#wp_gallerybtns {
+	padding: 2px;
+	position: absolute;
+	display: none;
+	z-index: 999998;
+}
+
+#wp_editimgbtn,
+#wp_delimgbtn,
+#wp_editgallery,
+#wp_delgallery {
+	margin: 2px;
+	padding: 2px;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.settings-toggle {
+	text-align: right;
+	margin: 5px 7px 15px 0;
+	font-size: 12px;
+}
+
+.settings-toggle h3 {
+	margin: 0;
+}
+
+#timestampdiv select {
+	height: 20px;
+	line-height: 20px;
+	padding: 0;
+}
+
+#jj, #hh, #mn {
+	width: 2em;
+	padding: 1px;
+	font-size: 12px;
+}
+
+#aa {
+	width: 3.4em;
+	padding: 1px;
+	font-size: 12px;
+}
+
+.curtime #timestamp {
+	background-repeat: no-repeat;
+	background-position: left top;
+	padding-left: 18px;
+}
+
+#timestampdiv {
+	padding-top: 5px;
+	line-height: 23px;
+}
+
+#timestampdiv p {
+	margin: 8px 0 6px;
+}
+
+#timestampdiv input {
+	border-width: 1px;
+	border-style: solid;
+}
+
+/* media popup 0819 */
+#sidemenu {
+	margin: -30px 15px 0 315px;
+	list-style: none;
+	position: relative;
+	float: right;
+	padding-left: 10px;
+	font-size: 12px;
+}
+
+#sidemenu a {
+	padding: 0 7px;
+	display: block;
+	float: left;
+	line-height: 28px;
+	border-top-width: 1px;
+	border-top-style: solid;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+#sidemenu li {
+	display: inline;
+	line-height: 200%;
+	list-style: none;
+	text-align: center;
+	white-space: nowrap;
+	margin: 0;
+	padding: 0;
+}
+
+#sidemenu a.current {
+	font-weight: normal;
+	padding-left: 6px;
+	padding-right: 6px;
+	-moz-border-radius: 4px 4px 0 0;
+	-webkit-border-top-left-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	border-width: 1px;
+	border-style: solid;
+}
+
+#sidemenu {
+	margin: -30px 15px 0 315px;
+	list-style: none;
+	position: relative;
+	float: right;
+	padding-left: 10px;
+	font-size: 12px;
+}
+
+#sidemenu a {
+	padding: 0 7px;
+	display: block;
+	float: left;
+	line-height: 28px;
+	border-top-width: 1px;
+	border-top-style: solid;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+#sidemenu li a .count-0 {
+	display: none;
+}
+
+/* reply to comments */
+#replyrow {
+	font-size: 11px;
+}
+
+#replyrow input {
+	border-width: 1px;
+	border-style: solid;
+}
+
+#replyrow td {
+	padding: 2px;
+}
+
+#replyrow #editorcontainer {
+	border: 0 none;
+}
+
+#replysubmit {
+	margin: 0;
+	padding: 3px 7px;
+}
+
+#replysubmit span.waiting,
+#commentstatusdiv span.waiting {
+	padding: 0 10px;
+	vertical-align: top;
+}
+
+#replysubmit .button {
+	margin-right: 5px;
+}
+
+#replyrow #editor-toolbar {
+	display: none;
+}
+
+#replyhead {
+	font-size: 12px;
+	font-weight: bold;
+	padding: 2px 10px 4px;
+}
+
+#edithead .inside {
+	float: left;
+	padding: 3px 0 2px 5px;
+	margin: 0;
+	text-align: center;
+	font-size: 11px;
+}
+
+#edithead .inside input {
+	width: 180px;
+	font-size: 11px;
+}
+
+#edithead label {
+	padding: 2px 0;
+}
+
+#replycontainer {
+	padding: 5px;
+	border: 0 none;
+	height: 120px;
+	overflow: hidden;
+	position: relative;
+}
+
+#replycontent {
+	resize: none;
+	margin: 0;
+	width: 100%;
+	height: 100%;
+	padding: 0;
+	line-height: 150%;
+	border: 0 none;
+	outline: none;
+	font-size: 12px;
+}
+
+#replyrow #ed_reply_toolbar {
+	margin: 0;
+	padding: 2px 3px;
+}
+
+#replyrow #ed_reply_toolbar input {
+	margin: 1px 2px 1px 1px;
+	min-width: 24px;
+	padding: 3px 4px;
+	font-size: 11px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+ul.cat-checklist {
+	height: 12em;
+	border-style: solid;
+	border-width: 1px;
+	overflow-y: scroll;
+	padding: 0 5px;
+	margin: 0 0 5px;
+}
+
+#bulk-titles {
+	display: block;
+	height: 12em;
+	border-style: solid;
+	border-width: 1px;
+	overflow-y: scroll;
+	padding: 0 5px;
+	margin: 0 0 5px;
+}
+
+#bulk-titles {
+	line-height: 140%;
+}
+#bulk-titles div {
+	margin: 0.2em 0.3em;
+}
+
+#bulk-titles div a {
+	cursor: pointer;
+	display: block;
+	float: left;
+	height: 10px;
+	margin: 3px 3px 0 -2px;
+	overflow: hidden;
+	position: relative;
+	text-indent: -9999px;
+	width: 10px;
+}
+
+/* Media library */
+#wpbody-content #media-items .describe {
+	border-collapse: collapse;
+	width: 100%;
+	border-top-style: solid;
+	border-top-width: 1px;
+	clear: both;
+	cursor: default;
+	padding: 5px;
+	width: 100%;
+}
+
+#wpbody-content .describe .media-item-info tr {
+	background-color: transparent;
+}
+
+#wpbody-content .filename {
+	margin-left: 10px;
+}
+
+#wpbody-content .media-item .thumbnail {
+	max-height: 128px;
+	max-width: 128px;
+}
+
+#wpbody-content .media-upload-form label {
+	display: block;
+	font-size: 13px;
+	margin: 0.5em;
+}
+
+abbr.required {
+	border: medium none;
+	text-decoration: none;
+}
+
+#wpbody-content .describe input[type="text"],
+#wpbody-content .describe textarea {
+	width: 460px;
+}
+
+#wpbody-content .describe p.help {
+	margin: 0;
+	padding: 0;
+}
+
+.describe-toggle-on, .describe-toggle-off {
+	display: block;
+	line-height: 36px;
+	float: right;
+	margin-right: 20px;
+}
+
+.describe-toggle-off {
+	display: none;
+}
+
+#wpbody-content .media-item {
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+	min-height: 36px;
+	position: relative;
+	width: 100%;
+}
+
+#wpbody-content #media-items {
+	border-style: solid solid none;
+	border-width: 1px;
+	width: 670px;
+}
+
+#wpbody-content #media-items .filename {
+	float: left;
+	line-height: 36px;
+	margin-left: 10px;
+	max-width: 430px;
+	overflow: hidden;
+}
+
+.media-item .pinkynail {
+	float: left;
+	height: 32px;
+	margin: 2px;
+	max-width: 40px;
+	max-height: 40px;
+}
+
+.media-item  .startopen,
+.media-item .startclosed {
+	display: none;
+}
+
+/* find posts */
+.find-box {
+	width: 400px;
+	height: 250px;
+	overflow: hidden;
+	padding: 33px 5px 50px;
+	position: absolute;
+	z-index: 1000;
+}
+
+.find-box-head {
+	cursor: move;
+	font-weight: bold;
+	height: 2em;
+	line-height: 2em;
+	padding: 1px 12px;
+	position: absolute;
+	top: 5px;
+	width: 100%;
+}
+
+.find-box-inside {
+	overflow: auto;
+	width: 100%;
+	height: 100%;
+}
+
+.find-box-search {
+	padding: 12px;
+	border-width: 1px;
+	border-style: none none solid;
+}
+
+#find-posts-response {
+	margin: 8px 0;
+	padding: 0 1px;
+}
+
+#find-posts-response table {
+	width: 100%;
+}
+
+#find-posts-response .found-radio {
+	padding: 8px 0 0 8px;
+	width: 15px;
+}
+
+.find-box-buttons {
+	bottom: 12px;
+	left: 12px;
+	position: absolute;
+}
+
+.find-box-search label {
+	padding-right: 6px;
+}
+
+#utc-time, #local-time {
+	padding-left: 25px;
+	font-style: italic;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+ul#dismissed-updates {
+	display: none;
+}
+form.upgrade {
+	margin-top: 8px;
+}
+
+#tagsdiv #the-tagcloud {
+	margin: 5px 5px 10px;
+	padding: 8px;
+	border-width: 1px;
+	border-style: solid;
+	line-height: 1.8em;
+	word-spacing: 3px;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+}
+
+br.clear {
+	height: 2px;
+	line-height: 2px;
+}
+
+.swfupload {
+	margin: 5px 10px;
+	vertical-align: middle;
+}
+
+/* table.fixed column width */
+table.fixed {
+	table-layout: fixed;
+}
+
+.fixed .column-date,
+.fixed .column-parent,
+.fixed .column-visible,
+.fixed .column-links {
+	width: 10%;
+}
+
+.fixed .column-response,
+.fixed .column-author,
+.fixed .column-categories,
+.fixed .column-tags,
+.fixed .column-rel,
+.fixed .column-role {
+	width: 15%;
+}
+
+.fixed .column-comments {
+	width: 60px;
+}
+
+.fixed .column-slug {
+	width: 25%;
+}
+
+.fixed .column-posts {
+	width: 10%;
+}
+
+.fixed .column-icon {
+	width: 80px;
+}
+
+#commentstatusdiv .fixed .column-author,
+#comments-form .fixed .column-author,
+#commentstatusdiv .fixed .column-date {
+	width: 20%;
+}
+
+.widefat th,
+.widefat td {
+	overflow: hidden;
+}
+
+.key-labels label {
+	line-height: 24px;
+}
+
+.subtitle {
+	font-size: 0.75em;
+	line-height: 1;
+	padding-left: 25px;
+}
diff -uNr a/mp-wp/wp-admin/custom-header.php b/mp-wp/wp-admin/custom-header.php
--- a/mp-wp/wp-admin/custom-header.php 3e4322c7d8f1757f883a9f11abec332b8c952d7b050c801e4ba60e72853509f0603e0ea63b093dacf4ca158fe309043984900efa5ea0348c2d1cd9d0eb46388f
+++ b/mp-wp/wp-admin/custom-header.php false
@@ -1,470 +0,0 @@
-<?php
-/**
- * The custom header image script.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/**
- * The custom header image class.
- *
- * @since unknown
- * @package WordPress
- * @subpackage Administration
- */
-class Custom_Image_Header {
-
-	/**
-	 * Callback for administration header.
-	 *
-	 * @var callback
-	 * @since unknown
-	 * @access private
-	 */
-	var $admin_header_callback;
-
-	/**
-	 * PHP4 Constructor - Register administration header callback.
-	 *
-	 * @since unknown
-	 * @param callback $admin_header_callback
-	 * @return Custom_Image_Header
-	 */
-	function Custom_Image_Header($admin_header_callback) {
-		$this->admin_header_callback = $admin_header_callback;
-	}
-
-	/**
-	 * Setup the hooks for the Custom Header admin page.
-	 *
-	 * @since unknown
-	 */
-	function init() {
-		$page = add_theme_page(__('Custom Image Header'), __('Custom Image Header'), 'edit_themes', 'custom-header', array(&$this, 'admin_page'));
-
-		add_action("admin_print_scripts-$page", array(&$this, 'js_includes'));
-		add_action("admin_print_styles-$page", array(&$this, 'css_includes'));
-		add_action("admin_head-$page", array(&$this, 'take_action'), 50);
-		add_action("admin_head-$page", array(&$this, 'js'), 50);
-		add_action("admin_head-$page", $this->admin_header_callback, 51);
-	}
-
-	/**
-	 * Get the current step.
-	 *
-	 * @since unknown
-	 *
-	 * @return int Current step
-	 */
-	function step() {
-		if ( ! isset( $_GET['step'] ) )
-			return 1;
-
-		$step = (int) $_GET['step'];
-		if ( $step < 1 || 3 < $step )
-			$step = 1;
-
-		return $step;
-	}
-
-	/**
-	 * Setup the enqueue for the JavaScript files.
-	 *
-	 * @since unknown
-	 */
-	function js_includes() {
-		$step = $this->step();
-
-		if ( 1 == $step )
-			wp_enqueue_script('farbtastic');
-		elseif ( 2 == $step )
-			wp_enqueue_script('cropper');
-	}
-
-	/**
-	 * Setup the enqueue for the CSS files
-	 *
-	 * @since 2.7
-	 */
-	function css_includes() {
-		$step = $this->step();
-
-		if ( 1 == $step ) {
-			wp_enqueue_style('farbtastic');
-		}
-	}
-
-	/**
-	 * Execute custom header modification.
-	 *
-	 * @since unknown
-	 */
-	function take_action() {
-		if ( isset( $_POST['textcolor'] ) ) {
-			check_admin_referer('custom-header');
-			if ( 'blank' == $_POST['textcolor'] ) {
-				set_theme_mod('header_textcolor', 'blank');
-			} else {
-				$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['textcolor']);
-				if ( strlen($color) == 6 || strlen($color) == 3 )
-					set_theme_mod('header_textcolor', $color);
-			}
-		}
-		if ( isset($_POST['resetheader']) ) {
-			check_admin_referer('custom-header');
-			remove_theme_mods();
-		}
-	}
-
-	/**
-	 * Execute Javascript depending on step.
-	 *
-	 * @since unknown
-	 */
-	function js() {
-		$step = $this->step();
-		if ( 1 == $step )
-			$this->js_1();
-		elseif ( 2 == $step )
-			$this->js_2();
-	}
-
-	/**
-	 * Display Javascript based on Step 1.
-	 *
-	 * @since unknown
-	 */
-	function js_1() { ?>
-<script type="text/javascript">
-	var buttons = ['#name', '#desc', '#pickcolor', '#defaultcolor'];
-	var farbtastic;
-
-	function pickColor(color) {
-		jQuery('#name').css('color', color);
-		jQuery('#desc').css('color', color);
-		jQuery('#textcolor').val(color);
-		farbtastic.setColor(color);
-	}
-
-	jQuery(document).ready(function() {
-		jQuery('#pickcolor').click(function() {
-			jQuery('#colorPickerDiv').show();
-		});
-
-		jQuery('#hidetext').click(function() {
-			toggle_text();
-		});
-
-		farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) { pickColor(color); });
-		pickColor('#<?php echo get_theme_mod('header_textcolor', HEADER_TEXTCOLOR); ?>');
-
-		<?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?>
-		toggle_text();
-		<?php } ?>
-	});
-
-	jQuery(document).mousedown(function(){
-		// Make the picker disappear, since we're using it in an independant div
-		hide_picker();
-	});
-
-	function colorDefault() {
-		pickColor('#<?php echo HEADER_TEXTCOLOR; ?>');
-	}
-
-	function hide_picker(what) {
-		var update = false;
-		jQuery('#colorPickerDiv').each(function(){
-			var id = jQuery(this).attr('id');
-			if (id == what) {
-				return;
-			}
-			var display = jQuery(this).css('display');
-			if (display == 'block') {
-				jQuery(this).fadeOut(2);
-			}
-		});
-	}
-
-	function toggle_text(force) {
-		if(jQuery('#textcolor').val() == 'blank') {
-			//Show text
-			jQuery( buttons.toString() ).show();
-			jQuery('#textcolor').val('<?php echo HEADER_TEXTCOLOR; ?>');
-			jQuery('#hidetext').val('<?php _e('Hide Text'); ?>');
-		}
-		else {
-			//Hide text
-			jQuery( buttons.toString() ).hide();
-			jQuery('#textcolor').val('blank');
-			jQuery('#hidetext').val('<?php _e('Show Text'); ?>');
-		}
-	}
-
-
-
-</script>
-<?php
-	}
-
-	/**
-	 * Display Javascript based on Step 2.
-	 *
-	 * @since unknown
-	 */
-	function js_2() { ?>
-<script type="text/javascript">
-	function onEndCrop( coords, dimensions ) {
-		jQuery( '#x1' ).val(coords.x1);
-		jQuery( '#y1' ).val(coords.y1);
-		jQuery( '#x2' ).val(coords.x2);
-		jQuery( '#y2' ).val(coords.y2);
-		jQuery( '#width' ).val(dimensions.width);
-		jQuery( '#height' ).val(dimensions.height);
-	}
-
-	// with a supplied ratio
-	jQuery(document).ready(function() {
-		var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>;
-		var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>;
-		var ratio = xinit / yinit;
-		var ximg = jQuery('#upload').width();
-		var yimg = jQuery('#upload').height();
-		if ( yimg < yinit || ximg < xinit ) {
-			if ( ximg / yimg > ratio ) {
-				yinit = yimg;
-				xinit = yinit * ratio;
-			} else {
-				xinit = ximg;
-				yinit = xinit / ratio;
-			}
-		}
-		new Cropper.Img(
-			'upload',
-			{
-				ratioDim: { x: xinit, y: yinit },
-				displayOnInit: true,
-				onEndCrop: onEndCrop
-			}
-		)
-	});
-</script>
-<?php
-	}
-
-	/**
-	 * Display first step of custom header image page.
-	 *
-	 * @since unknown
-	 */
-	function step_1() {
-		if ( $_GET['updated'] ) { ?>
-<div id="message" class="updated fade">
-<p><?php _e('Header updated.') ?></p>
-</div>
-		<?php } ?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php _e('Your Header Image'); ?></h2>
-<p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p>
-
-<div id="headimg" style="background-image: url(<?php clean_url(header_image()) ?>);">
-<h1><a onclick="return false;" href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>" id="name"><?php bloginfo('name'); ?></a></h1>
-<div id="desc"><?php bloginfo('description');?></div>
-</div>
-<?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?>
-<form method="post" action="<?php echo admin_url('themes.php?page=custom-header&amp;updated=true') ?>">
-<input type="button" value="<?php _e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" />
-<input type="button" value="<?php _e('Select a Text Color'); ?>" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" />
-<?php wp_nonce_field('custom-header') ?>
-<input type="hidden" name="textcolor" id="textcolor" value="#<?php attribute_escape(header_textcolor()) ?>" /><input name="submit" type="submit" value="<?php _e('Save Changes'); ?>" /></form>
-<?php } ?>
-
-<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"> </div>
-</div>
-<div class="wrap">
-<h2><?php _e('Upload New Header Image'); ?></h2><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?></p>
-<p><?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p>
-
-<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo attribute_escape(add_query_arg('step', 2)) ?>" style="margin: auto; width: 50%;">
-<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
-<input type="hidden" name="action" value="save" />
-<?php wp_nonce_field('custom-header') ?>
-<p class="submit">
-<input type="submit" value="<?php _e('Upload'); ?>" />
-</p>
-</form>
-
-</div>
-
-		<?php if ( get_theme_mod('header_image') || get_theme_mod('header_textcolor') ) : ?>
-<div class="wrap">
-<h2><?php _e('Reset Header Image and Color'); ?></h2>
-<p><?php _e('This will restore the original header image and color. You will not be able to retrieve any customizations.') ?></p>
-<form method="post" action="<?php echo attribute_escape(add_query_arg('step', 1)) ?>">
-<?php wp_nonce_field('custom-header'); ?>
-<input type="submit" name="resetheader" value="<?php _e('Restore Original Header'); ?>" />
-</form>
-</div>
-		<?php endif;
-
-	}
-
-	/**
-	 * Display second step of custom header image page.
-	 *
-	 * @since unknown
-	 */
-	function step_2() {
-		check_admin_referer('custom-header');
-		$overrides = array('test_form' => false);
-		$file = wp_handle_upload($_FILES['import'], $overrides);
-
-		if ( isset($file['error']) )
-		die( $file['error'] );
-
-		$url = $file['url'];
-		$type = $file['type'];
-		$file = $file['file'];
-		$filename = basename($file);
-
-		// Construct the object array
-		$object = array(
-		'post_title' => $filename,
-		'post_content' => $url,
-		'post_mime_type' => $type,
-		'guid' => $url);
-
-		// Save the data
-		$id = wp_insert_attachment($object, $file);
-
-		list($width, $height, $type, $attr) = getimagesize( $file );
-
-		if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) {
-			// Add the meta-data
-			wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-
-			set_theme_mod('header_image', clean_url($url));
-			do_action('wp_create_file_in_uploads', $file, $id); // For replication
-			return $this->finished();
-		} elseif ( $width > HEADER_IMAGE_WIDTH ) {
-			$oitar = $width / HEADER_IMAGE_WIDTH;
-			$image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-			$image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication
-
-			$url = str_replace(basename($url), basename($image), $url);
-			$width = $width / $oitar;
-			$height = $height / $oitar;
-		} else {
-			$oitar = 1;
-		}
-		?>
-
-<div class="wrap">
-
-<form method="POST" action="<?php echo attribute_escape(add_query_arg('step', 3)) ?>">
-
-<p><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
-<div id="testWrap" style="position: relative">
-<img src="<?php echo $url; ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
-</div>
-
-<p class="submit">
-<input type="hidden" name="x1" id="x1" />
-<input type="hidden" name="y1" id="y1" />
-<input type="hidden" name="x2" id="x2" />
-<input type="hidden" name="y2" id="y2" />
-<input type="hidden" name="width" id="width" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo $id; ?>" />
-<input type="hidden" name="oitar" id="oitar" value="<?php echo $oitar; ?>" />
-<?php wp_nonce_field('custom-header') ?>
-<input type="submit" value="<?php _e('Crop Header'); ?>" />
-</p>
-
-</form>
-</div>
-		<?php
-	}
-
-	/**
-	 * Display third step of custom header image page.
-	 *
-	 * @since unknown
-	 */
-	function step_3() {
-		check_admin_referer('custom-header');
-		if ( $_POST['oitar'] > 1 ) {
-			$_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
-			$_POST['y1'] = $_POST['y1'] * $_POST['oitar'];
-			$_POST['width'] = $_POST['width'] * $_POST['oitar'];
-			$_POST['height'] = $_POST['height'] * $_POST['oitar'];
-		}
-
-		$original = get_attached_file( $_POST['attachment_id'] );
-
-		$cropped = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT);
-		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $_POST['attachment_id']); // For replication
-
-		$parent = get_post($_POST['attachment_id']);
-		$parent_url = $parent->guid;
-		$url = str_replace(basename($parent_url), basename($cropped), $parent_url);
-
-		// Construct the object array
-		$object = array(
-			'ID' => $_POST['attachment_id'],
-			'post_title' => basename($cropped),
-			'post_content' => $url,
-			'post_mime_type' => 'image/jpeg',
-			'guid' => $url
-		);
-
-		// Update the attachment
-		wp_insert_attachment($object, $cropped);
-		wp_update_attachment_metadata( $_POST['attachment_id'], wp_generate_attachment_metadata( $_POST['attachment_id'], $cropped ) );
-
-		set_theme_mod('header_image', $url);
-
-		// cleanup
-		$medium = str_replace(basename($original), 'midsize-'.basename($original), $original);
-		@unlink( apply_filters( 'wp_delete_file', $medium ) );
-		@unlink( apply_filters( 'wp_delete_file', $original ) );
-
-		return $this->finished();
-	}
-
-	/**
-	 * Display last step of custom header image page.
-	 *
-	 * @since unknown
-	 */
-	function finished() {
-		?>
-<div class="wrap">
-<h2><?php _e('Header complete!'); ?></h2>
-
-<p><?php _e('Visit your site and you should see the new header now.'); ?></p>
-
-</div>
-		<?php
-	}
-
-	/**
-	 * Display the page based on the current step.
-	 *
-	 * @since unknown
-	 */
-	function admin_page() {
-		$step = $this->step();
-		if ( 1 == $step )
-			$this->step_1();
-		elseif ( 2 == $step )
-			$this->step_2();
-		elseif ( 3 == $step )
-			$this->step_3();
-	}
-
-}
-?>
diff -uNr a/mp-wp/wp-admin/edit-attachment-rows.php b/mp-wp/wp-admin/edit-attachment-rows.php
--- a/mp-wp/wp-admin/edit-attachment-rows.php 388b69c816ad5366dc8a395562ccaea40281812ee57cf4fd66c01e747242ae4e19207c98f8f5141dbea902847d2a812ce219eb015f35a3f13717cbbb06afefcb
+++ b/mp-wp/wp-admin/edit-attachment-rows.php a8f51f88df658815171d139721c03a2077c2d340e895e87eef70b0818d12de252304e1c3a43a2e5d02ba0977ef68ab835dee58e633a11442a7084a661403d02d
@@ -15,13 +15,6 @@
 <?php print_column_headers('upload'); ?>
 	</tr>
 	</thead>
-
-	<tfoot>
-	<tr>
-<?php print_column_headers('upload', false); ?>
-	</tr>
-	</tfoot>
-
 	<tbody id="the-list" class="list:post">
 <?php
 add_filter('the_title','wp_specialchars');
@@ -51,7 +44,7 @@
 
 	case 'cb':
 		?>
-		<th scope="row" class="check-column"><input type="checkbox" name="media[]" value="<?php the_ID(); ?>" /></th>
+		<td scope="row" class="check-column"><input type="checkbox" name="media[]" value="<?php the_ID(); ?>" /></td>
 		<?php
 		break;
 
@@ -82,7 +75,7 @@
 		if ( current_user_can('edit_post', $post->ID) )
 			$actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
 		if ( current_user_can('delete_post', $post->ID) )
-			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "'>" . __('Delete') . "</a>";
 		$actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . attribute_escape(sprintf(__('View "%s"'), $title)) . '" rel="permalink">' . __('View') . '</a>';
 		$action_count = count($actions);
 		$i = 0;
diff -uNr a/mp-wp/wp-admin/edit-category-form.php b/mp-wp/wp-admin/edit-category-form.php
--- a/mp-wp/wp-admin/edit-category-form.php 771c5df8d4d6ba39bfa5ff42e982a6a62b392c7fa82f745f4569942bd1e719a1032e534e15a2270d5a451011e8af630cd46d3329550c1d31e0103c2c21d28629
+++ b/mp-wp/wp-admin/edit-category-form.php 7190b40a93732a00772b807699bc2e9cd53a1cd1e69048a52e7b82e0e74f1f88917e5d7b6474c7df9e9e9bfaa5333cee0c88e0f8e34815fdc458d03ad1df76a6
@@ -41,7 +41,6 @@
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php _e('Edit Category'); ?></h2>
-<div id="ajax-response"></div>
 <form name="editcat" id="editcat" method="post" action="categories.php" class="validate">
 <input type="hidden" name="action" value="editedcat" />
 <input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
diff -uNr a/mp-wp/wp-admin/edit-comments.php b/mp-wp/wp-admin/edit-comments.php
--- a/mp-wp/wp-admin/edit-comments.php 5bcb68d3a075d461b9b1eae9921df9d6e4baec9822c47c88b39845da08b5e15f2a674851fbd2efc744f6381bff89dc9d619fff0b13773a60396f904600d9db04
+++ b/mp-wp/wp-admin/edit-comments.php 93d3197cf44dbc6057f7d85045439aa100e23ad988a332ee62935da854d9e50241b8e811394eeef665c59152f2c02f0ae934ff383963a7718c1991976a161996
@@ -9,9 +9,6 @@
 /** WordPress Administration Bootstrap */
 require_once('admin.php');
 
-wp_enqueue_script('admin-comments');
-enqueue_comment_hotkeys_js();
-
 $post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;
 
 if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spam2'] ) ) && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
@@ -24,9 +21,9 @@
 	if ( $post_id )
 		$redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
 	wp_redirect( $redirect_to );
-} elseif ( isset($_REQUEST['delete_comments']) && isset($_REQUEST['action']) && ( -1 != $_REQUEST['action'] || -1 != $_REQUEST['action2'] ) ) {
+} elseif ( isset($_REQUEST['delete_comments']) && isset($_REQUEST['action']) && -1 != $_REQUEST['action'] ) {
 	check_admin_referer('bulk-comments');
-	$doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
+	$doaction = $_REQUEST['action'];
 
 	$deleted = $approved = $unapproved = $spammed = 0;
 	foreach ( (array) $_REQUEST['delete_comments'] as $comment_id) : // Check the permissions on each
@@ -223,14 +220,14 @@
 
 <div class="tablenav">
 
-<?php if ( $page_links ) : ?>
+<?php if ( $page_links ) { ?>
 <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
 	number_format_i18n( $start + 1 ),
 	number_format_i18n( min( $page * $comments_per_page, $total ) ),
 	number_format_i18n( $total ),
 	$page_links
 ); echo $page_links_text; ?></div>
-<?php endif; ?>
+<?php } ?>
 
 <div class="alignleft actions">
 <select name="action">
@@ -291,13 +288,6 @@
 <?php print_column_headers('edit-comments'); ?>
 	</tr>
 </thead>
-
-<tfoot>
-	<tr>
-<?php print_column_headers('edit-comments', false); ?>
-	</tr>
-</tfoot>
-
 <tbody id="the-comment-list" class="list:comment">
 <?php
 	foreach ($comments as $comment)
@@ -312,36 +302,16 @@
 </tbody>
 </table>
 
+<?php if ( $page_links ) { ?>
 <div class="tablenav">
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links_text</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option>
-<?php if ( empty($comment_status) || 'approved' == $comment_status ): ?>
-<option value="unapprove"><?php _e('Unapprove'); ?></option>
-<?php endif; ?>
-<?php if ( empty($comment_status) || 'moderated' == $comment_status ): ?>
-<option value="approve"><?php _e('Approve'); ?></option>
-<?php endif; ?>
-<?php if ( 'spam' != $comment_status ): ?>
-<option value="markspam"><?php _e('Mark as Spam'); ?></option>
-<?php endif; ?>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" name="doaction2" id="doaction2" value="<?php _e('Apply'); ?>" class="button-secondary apply" />
-
-<?php if ( 'spam' == $comment_status ) { ?>
-<input type="submit" name="delete_all_spam2" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" />
-<?php } ?>
-<?php do_action('manage_comments_nav', $comment_status); ?>
-</div>
-
-<br class="clear" />
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
+	number_format_i18n( $start + 1 ),
+	number_format_i18n( min( $page * $comments_per_page, $total ) ),
+	number_format_i18n( $total ),
+	$page_links
+); echo $page_links_text; ?></div>
 </div>
+<?php } ?>
 
 </form>
 
@@ -352,37 +322,20 @@
 	<input type="hidden" name="page" value="<?php echo isset($_REQUEST['page']) ? absint( $_REQUEST['page'] ) : 1; ?>" />
 	<input type="hidden" name="p" value="<?php echo attribute_escape( $post_id ); ?>" />
 	<input type="hidden" name="comment_type" value="<?php echo attribute_escape( $comment_type ); ?>" />
-	<?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?>
 </form>
 
-<div id="ajax-response"></div>
-
 <?php } elseif ( 'moderated' == $_GET['comment_status'] ) { ?>
 <p><?php _e('No comments awaiting moderation&hellip; yet.') ?></p>
 </form>
 
 <?php } else { ?>
 <p><?php _e('No results found.') ?></p>
+
 </form>
 
 <?php } ?>
 </div>
 
-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
-	$(document).ready(function(){
-		$('#doaction, #doaction2').click(function(){
-			if ( $('select[name^="action"]').val() == 'delete' ) {
-				var m = '<?php echo js_escape(__("You are about to delete the selected comments.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
-				return showNotice.warn(m);
-			}
-		});
-	});
-})(jQuery);
-/* ]]> */
-</script>
-
 <?php
 wp_comment_reply('-1', true, 'detail');
 include('admin-footer.php'); ?>
diff -uNr a/mp-wp/wp-admin/edit-form-advanced.php b/mp-wp/wp-admin/edit-form-advanced.php
--- a/mp-wp/wp-admin/edit-form-advanced.php 08558b087cf3e86ef88e3c07596f32dd005d467318e34350e5338c5ea72a30fa069632805b4e1d1f3094483b030f9852803b3285c1d8ffc6afdfffb5c1b650c8
+++ b/mp-wp/wp-admin/edit-form-advanced.php 653814251c9614dff0669b2fb4ee6c90ed3c6c7ffb0239615c1286a6b41e4f13a6e1c86c4b947dd135ec4f425b958f98e79fd17940a4fd69d7a6dcedced0e73c
@@ -122,9 +122,7 @@
 ?>
 </span></b>
 <?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
-<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
-
-<div id="post-status-select" class="hide-if-js">
+<div id="post-status-select">
 <input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo $post->post_status; ?>" />
 <select name='post_status' id='post_status' tabindex='4'>
 <?php if ( 'publish' == $post->post_status ) : ?>
@@ -137,8 +135,6 @@
 <option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
 <option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
 </select>
- <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
- <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a>
 </div>
 
 <?php } ?>
@@ -162,9 +158,8 @@
 	$visibility_trans = __('Public');
 }
 
-?><?php echo wp_specialchars( $visibility_trans ); ?></span></b> <?php if ( $can_publish ) { ?> <a href="#visibility" class="edit-visibility hide-if-no-js"><?php _e('Edit'); ?></a>
-
-<div id="post-visibility-select" class="hide-if-js">
+?><?php echo wp_specialchars( $visibility_trans ); ?></span></b> <?php if ( $can_publish ) { ?>
+<div id="post-visibility-select">
 <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo attribute_escape($post->post_password); ?>" />
 <input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID), true); ?> />
 <input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo attribute_escape( $visibility ); ?>" />
@@ -175,11 +170,6 @@
 <input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
 <span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo attribute_escape($post->post_password); ?>" /><br /></span>
 <input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
-
-<p>
- <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
- <a href="#visibility" class="cancel-post-visibility hide-if-no-js"><?php _e('Cancel'); ?></a>
-</p>
 </div>
 <?php } ?>
 
@@ -210,8 +200,7 @@
 <div class="misc-pub-section curtime misc-pub-section-last">
 	<span id="timestamp">
 	<?php printf($stamp, $date); ?></span>
-	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
-	<div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div>
+	<div id="timestampdiv"><?php touch_time(($action == 'edit'),1,4); ?></div>
 </div><?php // /misc-pub-section ?>
 <?php endif; ?>
 
@@ -224,7 +213,7 @@
 <div id="delete-action">
 <?php
 if ( ( 'edit' == $action ) && current_user_can('delete_post', $post->ID) ) { ?>
-<a class="submitdelete deletion" href="<?php echo wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+<a class="submitdelete deletion" href="<?php echo wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID); ?>"><?php _e('Delete'); ?></a>
 <?php } ?>
 </div>
 
@@ -267,7 +256,6 @@
 ?>
 <p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
 <div id="tagchecklist"></div>
-<p id="tagcloud-link" class="hide-if-no-js"><a href='#'><?php _e( 'Choose from the most popular tags' ); ?></a></p>
 <?php
 }
 add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'side', 'core');
@@ -281,37 +269,12 @@
  */
 function post_categories_meta_box($post) {
 ?>
-<ul id="category-tabs">
-	<li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
-	<li class="hide-if-no-js"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
-</ul>
-
-<div id="categories-pop" class="ui-tabs-panel" style="display: none;">
-	<ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
-		<?php $popular_ids = wp_popular_terms_checklist('category'); ?>
-	</ul>
-</div>
-
-<div id="categories-all" class="ui-tabs-panel">
+<div id="categories-all">
 	<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
 		<?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
 	</ul>
 </div>
-
-<?php if ( current_user_can('manage_categories') ) : ?>
-<div id="category-adder" class="wp-hidden-children">
-	<h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
-	<p id="category-add" class="wp-hidden-child">
-		<label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="true"/>
-		<label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
-		<input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
-		<?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
-		<span id="category-ajax-response"></span>
-	</p>
-</div>
 <?php
-endif;
-
 }
 add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core');
 
@@ -386,7 +349,6 @@
 function post_custom_meta_box($post) {
 ?>
 <div id="postcustomstuff">
-<div id="ajax-response"></div>
 <?php
 $metadata = has_meta($post->ID);
 list_meta($metadata);
@@ -416,49 +378,9 @@
 	<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a> on this post') ?></label>
 </p>
 <?php
-	$total = $wpdb->get_var($wpdb->prepare("SELECT count(1) FROM $wpdb->comments WHERE comment_post_ID = '%d' AND ( comment_approved = '0' OR comment_approved = '1')", $post_ID));
-
-	if ( !$post_ID || $post_ID < 0 || 1 > $total )
-		return;
-
-wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
-?>
-
-<table class="widefat comments-box fixed" cellspacing="0" style="display:none;">
-<thead>
-	<tr>
-    <th scope="col" class="column-author"><?php _e('Author') ?></th>
-    <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th>
-  </tr>
-</thead>
-<tbody id="the-comment-list" class="list:comment">
-</tbody>
-</table>
-<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="images/loading.svg" alt="" /></p>
-<?php
-	$hidden = get_hidden_meta_boxes('post');
-	if ( ! in_array('commentstatusdiv', $hidden) ) { ?>
-		<script type="text/javascript">commentsBox.get(<?php echo $total; ?>, 10);</script>
-<?php
-	}
 }
 add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', 'post', 'normal', 'core');
 
-/**
- * Display post slug form fields.
- *
- * @since 2.6.0
- *
- * @param object $post
- */
-function post_slug_meta_box($post) {
-?>
-<label class="hidden" for="post_name"><?php _e('Post Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
-<?php
-}
-if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) )
-	add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'normal', 'core');
-
 $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
 if ( $post->post_author && !in_array($post->post_author, $authors) )
 	$authors[] = $post->post_author;
@@ -617,9 +539,3 @@
 </div>
 
 <?php wp_comment_reply(); ?>
-
-<?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?>
-<script type="text/javascript">
-try{document.post.title.focus();}catch(e){}
-</script>
-<?php endif; ?>
diff -uNr a/mp-wp/wp-admin/edit-form-comment.php b/mp-wp/wp-admin/edit-form-comment.php
--- a/mp-wp/wp-admin/edit-form-comment.php 385a932df06790b1c0f63315966076f74d2d2fed040814106b254c5e0d165101992d0c5e9b0becad5be6e6adf9a5c7615ebb74082e9591b2bbfa9853a8438406
+++ b/mp-wp/wp-admin/edit-form-comment.php e0d91053940c7bbcd2698e7398b83026003b4a4252bd0cf35181776c01833828655e0cf99e1a18aacf22cf570a76c3c1952f6935c6e68df5471a6923b56d259c
@@ -59,8 +59,8 @@
 $stamp = __('Submitted on: <b>%1$s</b>');
 $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
 ?>
-<span id="timestamp"><?php printf($stamp, $date); ?></span>&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
-<div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
+<span id="timestamp"><?php printf($stamp, $date); ?></span>
+<div id='timestampdiv'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
 </div>
 </div> <!-- misc actions -->
 <div class="clear"></div>
@@ -68,7 +68,15 @@
 
 <div id="major-publishing-actions">
 <div id="delete-action">
-<a class='submitdelete deletion' href='<?php echo wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete'); ?></a>
+<a
+	class='submitdelete deletion'
+	href='<?php echo wp_nonce_url(
+		"comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(),
+		'delete-comment_' . $comment->comment_ID
+	)?>'
+>
+	Delete
+</a>
 </div>
 <div id="publishing-action">
 <input type="submit" name="save" value="<?php _e('Update Comment'); ?>" tabindex="4" class="button-primary" />
@@ -140,6 +148,3 @@
 </div>
 </form>
 
-<script type="text/javascript">
-try{document.post.name.focus();}catch(e){}
-</script>
diff -uNr a/mp-wp/wp-admin/edit-link-categories.php b/mp-wp/wp-admin/edit-link-categories.php
--- a/mp-wp/wp-admin/edit-link-categories.php eeb0f56f6aeb162762816414e04ebddad0a32dd8eba218e894eb229e69312ea1e2318782a44dcbd359676d58f2b3a189d6e23bddf52779a97505395faa91f6dd
+++ b/mp-wp/wp-admin/edit-link-categories.php 448b8a27b097ca9eebdb6ed55cc37638825a239ca846c9aac418339678e5dc860d2de514c44be18d66e071cec0b70f89f750357be013daebb60aa89318ef4661
@@ -12,7 +12,7 @@
 // Handle bulk actions
 if ( isset($_GET['action']) && isset($_GET['delete']) ) {
 	check_admin_referer('bulk-link-categories');
-	$doaction = $_GET['action'] ? $_GET['action'] : $_GET['action2'];
+	$doaction = $_GET['action'];
 
 	if ( !current_user_can('manage_categories') )
 		wp_die(__('Cheatin&#8217; uh?'));
@@ -46,10 +46,6 @@
 
 $title = __('Link Categories');
 
-wp_enqueue_script('admin-categories');
-if ( current_user_can('manage_categories') )
-	wp_enqueue_script('inline-edit-tax');
-
 require_once ('admin-header.php');
 
 $messages[1] = __('Category added.');
@@ -127,13 +123,6 @@
 <?php print_column_headers('edit-link-categories'); ?>
 	</tr>
 	</thead>
-
-	<tfoot>
-	<tr>
-<?php print_column_headers('edit-link-categories', false); ?>
-	</tr>
-	</tfoot>
-
 	<tbody id="the-list" class="list:link-cat">
 <?php
 $start = ($pagenum - 1) * $catsperpage;
@@ -155,22 +144,6 @@
 	</tbody>
 </table>
 
-<div class="tablenav">
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-</div>
-
-<br class="clear" />
-</div>
 <br class="clear" />
 </form>
 
@@ -190,7 +163,6 @@
 
 <div class="form-wrap">
 <h3><?php _e('Add Category'); ?></h3>
-<div id="ajax-response"></div>
 <form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php">
 <input type="hidden" name="action" value="addcat" />
 <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-link-category'); ?>
@@ -223,21 +195,4 @@
 
 </div><!-- /col-container -->
 </div><!-- /wrap -->
-
-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
-	$(document).ready(function(){
-		$('#doaction, #doaction2').click(function(){
-			if ( $('select[name^="action"]').val() == 'delete' ) {
-				var m = '<?php echo js_escape(__("You are about to delete the selected link categories.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
-				return showNotice.warn(m);
-			}
-		});
-	});
-})(jQuery);
-/* ]]> */
-</script>
-
-<?php inline_edit_term_row('edit-link-categories'); ?>
 <?php include('admin-footer.php'); ?>
diff -uNr a/mp-wp/wp-admin/edit-link-category-form.php b/mp-wp/wp-admin/edit-link-category-form.php
--- a/mp-wp/wp-admin/edit-link-category-form.php 1bd18b31925ff819da41679ff77f2842ce3fb97f4b05050ea494ce59372b9aa6ccbcde9bad3f4a4f299965afd45cd6b2aabb1229b6ac6ead9e291fd8ddcf08af
+++ b/mp-wp/wp-admin/edit-link-category-form.php 8cd5f88f136b48239d41de653f8b5005eb34a7bab2b3ac881e436aa61a8e48a659ce0b73fbb94601e0f6cd746c3105203fc9df0faf196dc6d05adddfac088de2
@@ -55,7 +55,6 @@
 <div class="wrap">
 <?php screen_icon(); ?>
 <?php echo $heading ?>
-<div id="ajax-response"></div>
 <?php echo $form ?>
 <input type="hidden" name="action" value="<?php echo $action ?>" />
 <input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
diff -uNr a/mp-wp/wp-admin/edit-link-form.php b/mp-wp/wp-admin/edit-link-form.php
--- a/mp-wp/wp-admin/edit-link-form.php c6ca0857a2b4ef3e34586ab128bd6afd3e0ed1176406e6823249f498365d5ba8efe10f48f1495635ae6d14a2d5b4fef6957a5d7038d21813b1ee1209ac8a1c38
+++ b/mp-wp/wp-admin/edit-link-form.php fb582e251778615e026de4123f4b1086e3814c2c774169651e797e7af955cfb90bff47f8f8e96e4a71d760cd36c02085d0b771265c0d9da42d60dda8777f411a
@@ -85,7 +85,7 @@
 <div id="delete-action">
 <?php
 if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
-	<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+	<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>"><?php _e('Delete'); ?></a>
 <?php } ?>
 </div>
 
@@ -113,23 +113,7 @@
  * @param object $link
  */
 function link_categories_meta_box($link) { ?>
-<div id="category-adder" class="wp-hidden-children">
-	<h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
-	<p id="link-category-add" class="wp-hidden-child">
-		<label class="hidden" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
-		<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" aria-required="true" />
-		<input type="button" id="category-add-sumbit" class="add:categorychecklist:linkcategorydiv button" value="<?php _e( 'Add' ); ?>" />
-		<?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
-		<span id="category-ajax-response"></span>
-	</p>
-</div>
-
-<ul id="category-tabs">
-	<li class="ui-tabs-selected"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
-	<li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
-</ul>
-
-<div id="categories-all" class="ui-tabs-panel">
+<div id="categories-all">
 	<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
 		<?php
 		if ( isset($link->link_id) )
@@ -139,12 +123,6 @@
 		?>
 	</ul>
 </div>
-
-<div id="categories-pop" class="ui-tabs-panel" style="display: none;">
-	<ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
-		<?php wp_popular_terms_checklist('link_category'); ?>
-	</ul>
-</div>
 <?php
 }
 add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core');
diff -uNr a/mp-wp/wp-admin/edit-page-form.php b/mp-wp/wp-admin/edit-page-form.php
--- a/mp-wp/wp-admin/edit-page-form.php 460d8cc71819108bcd5b7c75f9b98ffa739cbd9e88c167e1bddf4327084370f6b1fc00ca497454b3c61c7118b478b11ed22ed531af867aa92b51325f1333dadf
+++ b/mp-wp/wp-admin/edit-page-form.php 6ac0c7a8618197ba57e6dbfb4407064d62cc35b8157320c08284d6dc583a7fb38fcc4d6595ad0800d83c2dd214bc5a2114c1c152b1cea5b4faf22e7f05c8d230
@@ -114,9 +114,7 @@
 ?>
 </span></b>
 <?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
-<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
-
-<div id="post-status-select" class="hide-if-js">
+<div id="post-status-select">
 <input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo $post->post_status; ?>" />
 <select name='post_status' id='post_status' tabindex='4'>
 <?php if ( 'publish' == $post->post_status ) : ?>
@@ -129,9 +127,6 @@
 <option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
 <option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
 </select>
-
- <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
- <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a>
 </div>
 
 <?php } ?>
@@ -152,9 +147,8 @@
 	$visibility_trans = __('Public');
 }
 
-?><?php echo wp_specialchars( $visibility_trans ); ?></span></b> <?php if ( $can_publish ) { ?> <a href="#visibility" class="edit-visibility hide-if-no-js"><?php _e('Edit'); ?></a>
-
-<div id="post-visibility-select" class="hide-if-js">
+?><?php echo wp_specialchars( $visibility_trans ); ?></span></b> <?php if ( $can_publish ) { ?>
+<div id="post-visibility-select">
 <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo attribute_escape($post->post_password); ?>" />
 <input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo attribute_escape( $visibility ); ?>" />
 
@@ -163,11 +157,6 @@
 <input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
 <span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo attribute_escape($post->post_password); ?>" /><br /></span>
 <input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
-
-<p>
- <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
- <a href="#visibility" class="cancel-post-visibility hide-if-no-js"><?php _e('Cancel'); ?></a>
-</p>
 </div>
 <?php } ?>
 
@@ -195,10 +184,8 @@
 ?>
 <?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?>
 <div class="misc-pub-section curtime misc-pub-section-last">
-	<span id="timestamp">
-	<?php printf($stamp, $date); ?></span>
-	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
-	<div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div>
+	<span id="timestamp"><?php printf($stamp, $date); ?></span>
+	<div id="timestampdiv"><?php touch_time(($action == 'edit'),1,4); ?></div>
 </div><?php // /misc-pub-section ?>
 <?php endif; ?>
 
@@ -211,7 +198,7 @@
 <div id="delete-action">
 <?php
 if ( ( 'edit' == $action ) && current_user_can('delete_page', $post->ID) ) { ?>
-<a class="submitdelete deletion" href="<?php echo wp_nonce_url("page.php?action=delete&amp;post=$post->ID", 'delete-page_' . $post->ID); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+<a class="submitdelete deletion" href="<?php echo wp_nonce_url("page.php?action=delete&amp;post=$post->ID", 'delete-page_' . $post->ID); ?>"><?php _e('Delete'); ?></a>
 <?php } ?>
 </div>
 
@@ -306,7 +293,6 @@
 list_meta($metadata);
 meta_form();
 ?>
-<div id="ajax-response"></div>
 </div>
 <p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
 <?php
@@ -332,20 +318,6 @@
 }
 add_meta_box('pagecommentstatusdiv', __('Discussion'), 'page_comments_status_meta_box', 'page', 'normal', 'core');
 
-/**
- * Display page slug form fields.
- *
- * @since 2.6.0
- *
- * @param object $post
- */
-function page_slug_meta_box($post){
-?>
-<label class="hidden" for="post_name"><?php _e('Page Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
-<?php
-}
-add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'normal', 'core');
-
 $authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM
 if ( $post->post_author && !in_array($post->post_author, $authors) )
 	$authors[] = $post->post_author;
@@ -490,7 +462,3 @@
 
 </form>
 </div>
-
-<script type="text/javascript">
-try{document.post.title.focus();}catch(e){}
-</script>
diff -uNr a/mp-wp/wp-admin/edit-pages.php b/mp-wp/wp-admin/edit-pages.php
--- a/mp-wp/wp-admin/edit-pages.php 3043631715d6345b415aa169554043aeeff92a92b95d9445aaa69c6af0636c1ff00cd3535b1bb04086f9d92d682b3fca847e89b466b5fb9f24cd2e6dbe606e5f
+++ b/mp-wp/wp-admin/edit-pages.php 68788dd60a72a71d72917ff53ef5a63f7ad1299bdc51f69ea3401682fe52e0d90d0abab0da899191af007f92d049f5006424c54eeafbafd57bd0634b4be7b94a
@@ -10,12 +10,12 @@
 require_once('admin.php');
 
 // Handle bulk actions
-if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) {
-	$doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2'];
+if ( isset($_GET['action']) && -1 != $_GET['action'] ) {
+	$doaction = $_GET['action'];
 
 	switch ( $doaction ) {
 		case 'delete':
-			if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) {
+			if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && isset($_GET['doaction']) ) {
 				check_admin_referer('bulk-pages');
 				$deleted = 0;
 				foreach( (array) $_GET['post'] as $post_id_del ) {
@@ -72,7 +72,6 @@
 if ( empty($title) )
 	$title = __('Edit Pages');
 $parent_file = 'edit-pages.php';
-wp_enqueue_script('inline-edit-post');
 
 $post_stati  = array(	//	array( adj, noun )
 		'publish' => array(__('Published|page'), __('Published pages'), _n_noop('Published <span class="count">(%s)</span>|page', 'Published <span class="count">(%s)</span>')),
@@ -95,11 +94,6 @@
 $query = apply_filters('manage_pages_query', $query);
 wp($query);
 
-if ( is_singular() ) {
-	wp_enqueue_script( 'admin-comments' );
-	enqueue_comment_hotkeys_js();
-}
-
 require_once('admin-header.php'); ?>
 
 <div class="wrap">
@@ -199,19 +193,18 @@
 	'current' => $pagenum
 ));
 
-if ( $page_links ) : ?>
+if ( $page_links ) { ?>
 <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
 	number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
 	number_format_i18n( min( $pagenum * $per_page, $wp_query->post_count ) ),
 	number_format_i18n( $wp_query->post_count ),
 	$page_links
 ); echo $page_links_text; ?></div>
-<?php endif; ?>
+<?php } ?>
 
 <div class="alignleft actions">
 <select name="action">
 <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="edit"><?php _e('Edit'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
@@ -229,36 +222,11 @@
 <?php print_column_headers('edit-pages'); ?>
   </tr>
   </thead>
-
-  <tfoot>
-  <tr>
-<?php print_column_headers('edit-pages', false); ?>
-  </tr>
-  </tfoot>
-
   <tbody>
   <?php page_rows($posts, $pagenum, $per_page); ?>
   </tbody>
 </table>
 
-<div class="tablenav">
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links_text</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="edit"><?php _e('Edit'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-</div>
-
-<br class="clear" />
-</div>
-
 <?php } else { ?>
 <div class="clear"></div>
 <p><?php _e('No pages found.') ?></p>
@@ -266,12 +234,18 @@
 } // end if ($posts)
 ?>
 
-</form>
-
-<?php inline_edit_row( 'page' ) ?>
-
-<div id="ajax-response"></div>
+<?php if ( $page_links ) { ?>
+<div class="tablenav">
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
+	number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
+	number_format_i18n( min( $pagenum * $per_page, $wp_query->post_count ) ),
+	number_format_i18n( $wp_query->post_count ),
+	$page_links
+); echo $page_links_text; ?></div>
+</div>
+<?php } ?>
 
+</form>
 
 <?php
 
@@ -312,20 +286,4 @@
 
 </div>
 
-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
-	$(document).ready(function(){
-		$('#doaction, #doaction2').click(function(){
-			if ( $('select[name^="action"]').val() == 'delete' ) {
-				var m = '<?php echo js_escape(__("You are about to delete the selected pages.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
-				return showNotice.warn(m);
-			}
-		});
-	});
-})(jQuery);
-columns.init('edit-pages');
-/* ]]> */
-</script>
-
 <?php include('admin-footer.php'); ?>
diff -uNr a/mp-wp/wp-admin/edit-post-rows.php b/mp-wp/wp-admin/edit-post-rows.php
--- a/mp-wp/wp-admin/edit-post-rows.php 751d64a408e07584db1439e7c7876ce1ad75f08b72ecfaecda510f4be8f6e22e834e106a7206eda4843c3bf653739adc97d677e6d9bb59a39bb82f7307144764
+++ b/mp-wp/wp-admin/edit-post-rows.php 2f93f90b13898e0f3c37130cbbcdfc3de4edad595decb80cc54127b946bf5b98ea6a121ea9f39f4fb544d856dfafdb2a1b1d70863e0bb9f003459170fda14969
@@ -14,14 +14,7 @@
 <?php print_column_headers('edit'); ?>
 	</tr>
 	</thead>
-
-	<tfoot>
-	<tr>
-<?php print_column_headers('edit', false); ?>
-	</tr>
-	</tfoot>
-
 	<tbody>
 <?php post_rows(); ?>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff -uNr a/mp-wp/wp-admin/edit-tag-form.php b/mp-wp/wp-admin/edit-tag-form.php
--- a/mp-wp/wp-admin/edit-tag-form.php ae5a3011fb4edb8b03ae447c66caa63e1229699779a90b6d3b443856b398e06ff32da29df8291f4ed0b4481b7f2e2e46f129f52ae8be1839fe1d8f59dd3352c8
+++ b/mp-wp/wp-admin/edit-tag-form.php 924f0681455125bc73e66c9cd34dc623468e4334c3b605ce1a0bd1a92d43b7e7ea65e12a1c26220e59ef3e16681696ed8d400bf4fa372077491da99dc2cf291d
@@ -17,7 +17,6 @@
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php _e('Edit Tag'); ?></h2>
-<div id="ajax-response"></div>
 <form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">
 <input type="hidden" name="action" value="editedtag" />
 <input type="hidden" name="tag_ID" value="<?php echo $tag->term_id ?>" />
diff -uNr a/mp-wp/wp-admin/edit-tags.php b/mp-wp/wp-admin/edit-tags.php
--- a/mp-wp/wp-admin/edit-tags.php 833b9f3f31940bd4a8c6b81df47b3e75faec7310aa7a956e2c0f2c77f94b10c87da4a8ed357f50b33eb06275b1849fb664fc4acf0d0538c55efb91f9c1de70af
+++ b/mp-wp/wp-admin/edit-tags.php bde0a3ffd58d17ae49185b0cd5184ed63f0256293ae6cf9bba4b34a8b5c4be3f27e5f84042fcbea919ac57729e06208feeeb5184caec59c908e9698fa9593969
@@ -13,7 +13,7 @@
 
 wp_reset_vars( array('action', 'tag') );
 
-if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) )
+if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && 'delete' == $_GET['action'] )
 	$action = 'bulk-delete';
 
 switch($action) {
@@ -115,10 +115,6 @@
 
 $can_manage = current_user_can('manage_categories');
 
-wp_enqueue_script('admin-tags');
-if ( $can_manage )
-	wp_enqueue_script('inline-edit-tax');
-
 require_once ('admin-header.php');
 
 $messages[1] = __('Tag added.');
@@ -195,13 +191,6 @@
 <?php print_column_headers('edit-tags'); ?>
 	</tr>
 	</thead>
-
-	<tfoot>
-	<tr>
-<?php print_column_headers('edit-tags', false); ?>
-	</tr>
-	</tfoot>
-
 	<tbody id="the-list" class="list:tag">
 <?php
 
@@ -212,23 +201,6 @@
 	</tbody>
 </table>
 
-<div class="tablenav">
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-</div>
-
-<br class="clear" />
-</div>
-
 <br class="clear" />
 </form>
 </div>
@@ -252,7 +224,6 @@
 
 <div class="form-wrap">
 <h3><?php _e('Add a New Tag'); ?></h3>
-<div id="ajax-response"></div>
 <form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">
 <input type="hidden" name="action" value="addtag" />
 <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-tag'); ?>
@@ -280,23 +251,6 @@
 </div><!-- /col-container -->
 </div><!-- /wrap -->
 
-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
-	$(document).ready(function(){
-		$('#doaction, #doaction2').click(function(){
-			if ( $('select[name^="action"]').val() == 'delete' ) {
-				var m = '<?php echo js_escape(__("You are about to delete the selected tags.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
-				return showNotice.warn(m);
-			}
-		});
-	});
-})(jQuery);
-/* ]]> */
-</script>
-
-<?php inline_edit_term_row('edit-tags'); ?>
-
 <?php
 break;
 }
diff -uNr a/mp-wp/wp-admin/edit.php b/mp-wp/wp-admin/edit.php
--- a/mp-wp/wp-admin/edit.php 33b630d56d8ef054599a2ef450859bbd36b1caba90dd826083b41131d07ee28533f3eeefee4ab484978b1ced2933f844fbdc388dcae47211dcbfc28896f9b89e
+++ b/mp-wp/wp-admin/edit.php 4cd34ff77cdd98e7806a4bb04d07c6cf7d6be1d85e7792d6afbbd91d134d54ac17e0a10b32c74f58e6f9dd9d3d0e26f9fb284f7038c9b2313f2d0c3d1e13c362
@@ -18,12 +18,12 @@
 }
 
 // Handle bulk actions
-if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) {
-	$doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2'];
+if ( isset($_GET['action']) && -1 != $_GET['action'] ) {
+	$doaction = $_GET['action'];
 
 	switch ( $doaction ) {
 		case 'delete':
-			if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) {
+			if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && isset($_GET['doaction']) ) {
 				check_admin_referer('bulk-posts');
 				$deleted = 0;
 				foreach( (array) $_GET['post'] as $post_id_del ) {
@@ -80,7 +80,6 @@
 if ( empty($title) )
 	$title = __('Edit Posts');
 $parent_file = 'edit.php';
-wp_enqueue_script('inline-edit-post');
 
 list($post_stati, $avail_post_stati) = wp_edit_posts_query();
 
@@ -192,7 +191,6 @@
 <div class="alignleft actions">
 <select name="action">
 <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="edit"><?php _e('Edit'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
@@ -250,9 +248,12 @@
 ); echo $page_links_text; ?></div>
 <?php } ?>
 
-<div class="view-switch">
-	<a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="../wp-includes/images/blank.svg" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
-	<a href="<?php echo clean_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="../wp-includes/images/blank.svg" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
+<div class="view-switch <?php if ($page_links) echo 'view-switch-with-border'; ?>">
+	<?php if ( 'list' == $mode ) { ?>
+		<a href="<?php echo clean_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>">show excerpts</a>
+	<?php } else { ?>
+		<a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>">hide excerpts</a>
+	<?php } ?>
 </div>
 
 <div class="clear"></div>
@@ -262,54 +263,26 @@
 
 <?php include( 'edit-post-rows.php' ); ?>
 
-<div class="tablenav">
-
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links_text</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="edit"><?php _e('Edit'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<br class="clear" />
-</div>
-<br class="clear" />
-</div>
-
 <?php } else { // have_posts() ?>
 <div class="clear"></div>
 <p><?php _e('No posts found') ?></p>
 <?php } ?>
 
-</form>
-
-<?php inline_edit_row( 'post' ); ?>
+<?php if ( $page_links ) { ?>
+<div class="tablenav">
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
+	number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
+	number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
+	number_format_i18n( $wp_query->found_posts ),
+	$page_links
+); echo $page_links_text; ?></div>
+</div>
+<?php } ?>
 
-<div id="ajax-response"></div>
+</form>
 
 <br class="clear" />
 
 </div>
 
-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
-	$(document).ready(function(){
-		$('#doaction, #doaction2').click(function(){
-			if ( $('select[name^="action"]').val() == 'delete' ) {
-				var m = '<?php echo js_escape(__("You are about to delete the selected posts.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
-				return showNotice.warn(m);
-			}
-		});
-	});
-})(jQuery);
-columns.init('edit');
-/* ]]> */
-</script>
-
 <?php include('admin-footer.php'); ?>
diff -uNr a/mp-wp/wp-admin/export.php b/mp-wp/wp-admin/export.php
--- a/mp-wp/wp-admin/export.php a5d4cac66409c5945ca8c3bf8a893ee1d18935f4cbffcb85dd30a305b5bd6a404b75b6372fd33242c7bfd752fbd6f8b6552eb522ec76fd9437bd43cfc0aefaed
+++ b/mp-wp/wp-admin/export.php false
@@ -1,62 +0,0 @@
-<?php
-/**
- * WordPress Export Administration Panel
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** Load WordPress Bootstrap */
-require_once ('admin.php');
-
-/** Load WordPress export API */
-require_once('includes/export.php');
-$title = __('Export');
-
-if ( isset( $_GET['download'] ) ) {
-	$author = isset($_GET['author']) ? $_GET['author'] : 'all';
-	export_wp( $author );
-	die();
-}
-
-require_once ('admin-header.php');
-?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
-
-<p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
-<p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
-<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p>
-<form action="" method="get">
-<h3><?php _e('Options'); ?></h3>
-
-<table class="form-table">
-<tr>
-<th><label for="author"><?php _e('Restrict Author'); ?></label></th>
-<td>
-<select name="author" id="author">
-<option value="all" selected="selected"><?php _e('All Authors'); ?></option>
-<?php
-$authors = $wpdb->get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" );
-foreach ( $authors as $id ) {
-	$o = get_userdata( $id );
-	echo "<option value='$o->ID'>$o->display_name</option>";
-}
-?>
-</select>
-</td>
-</tr>
-</table>
-<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Download Export File'); ?>" />
-<input type="hidden" name="download" value="true" />
-</p>
-</form>
-</div>
-
-<?php
-
-
-include ('admin-footer.php');
-?>
diff -uNr a/mp-wp/wp-admin/images/align-center.svg b/mp-wp/wp-admin/images/align-center.svg
--- a/mp-wp/wp-admin/images/align-center.svg 5eb028786be92b0ab628c42a5b35420a0cbf5e807717ed7bc1f17c0b1891ef666619a834a5d19d7bd6f7a86a2c5d68b89778848552a27b8c811d8168582ce298
+++ b/mp-wp/wp-admin/images/align-center.svg false
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="21px" height="15px" viewBox="0 0 21 15" enable-background="new 0 0 21 15" xml:space="preserve">  <image id="image0" width="21" height="15" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABUAAAAPCAIAAACEOBM8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAB
-7UlEQVQokY2ST2sUQRDFq2u6p2djIoQcFPbk3Yt+Bg3CrrDgxxQxDhskH0G8eo8kmyUkEhOT3cx0
-Vdfz0LrEPyv+Dg3VVPd7r7oJyJcAJCWIAQJAFgZkKBISJBvQQw2SugVgZviJmTnkpXLj4dRRReqo
-//Dq8YCtTizacVOb8KbagmOK7umbj0T3VdV7X1ZPbnA5u0p+CauYUh+qBx2Jc8IBTXa9Rc+LcMsb
-vH2F+WGmOGfmIj4cDj2p9O5m+HAnU1NlIqZPrBLQ6AbZZud0QDn29VfXdKF/8qh2tE1EOefz83Mi
-8l0IQhWRf9/u1656/uIZ8c4G5BZftnhLyMRAA94yC9WmU7c33Ysx7u7umhkReZDcYxLw+OWIQEQX
-AIJcVLG57buqGlCKHDu+XnyLkbxNJhMAtAKCw9lnYPm2ff1ub78HoFgimS2hUAAZateKBHQLoG3b
-tm0BzOdzAJRzPjk5wa8PU8p1lIbj42MAnpnL7sHBQUqJmct4qqqiv1EaRqPRjzqldHZ2dlc/5/wP
-/ZXB4tqHELquI6LpdCoiTdOUK4rOn5gZM4/H4zJ/AnB0dHQ3uariP5jNZgAYQAihZC721iVf6RdV
-7z0A75xT1dPTUxGp63qVfJ3/0h9CyDkTkbv7GYqxdSd/A4Bz7juq2xMIx6ti1QAAAABJRU5ErkJg
-gg==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/align-left.svg b/mp-wp/wp-admin/images/align-left.svg
--- a/mp-wp/wp-admin/images/align-left.svg 15308380bd59d3dc8f0aa7667787e34f47bd8ed8da2d3494785cf9fd295f5b413903d20cf077eb59d43c03b02e90982c3ea908e54174021931c5e10cd195667b
+++ b/mp-wp/wp-admin/images/align-left.svg false
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="22px" height="15px" viewBox="0 0 22 15" enable-background="new 0 0 22 15" xml:space="preserve">  <image id="image0" width="22" height="15" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABYAAAAPCAIAAABvD6g/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAB
-/UlEQVQokX1SPW8TQRSctx++s00SAUKKZGo6Kv6EkSKUhoJfSEEBimQJOn4ALT1SHDmypQiIfee7
-3feGYuFIEecVr9md2ZmdQUuS+6SZ5JZkkxPJnsxk06gyk0xMJBNVlSRJMxu2cL/9/u6VaCtorJqE
-ZI35mpPf6Kvp9OX7bzQnzjtACAgAmJmIiAhJEQn7ajrt3FaqajRODbvQ1uLF/RwhH2+3P1Y3T9pq
-N83s2xg15yAi3ntVFRFVnc1moSZ27jZUVffr1o1PokoaxaNdL/WjNOpfnB4Lqqm4DEzQAuPyspkB
-2Gw2AAJkaz6qaTgaC0Q6HnVdNznRlIxjMcLj84dPYTJJ0kSMcs4iAuDs7MzMnHMBQJLHQW/A3hNa
-R21N+p2Evg1P4fsM9+btayS3i3Fs5pwrSAAASErLfU2s1pvTZ8/NwRN72VesIZ3YyESS2NePX1pf
-RSRFF0LIOZvZ+fn51dXVbDZDCeby8vJuVIdmSPQuKhRj3nszWywW3vvB7b1TgnDOzefzYgQkVXW1
-WhX6nPMDQsrlQcv19TXJUJhKSBcXFyRjjCTvlWBmIQRV9d7P5/Ocs6qiUC6Xy8FqEXJoVHUQslwu
-Sbq/wfwrbErJe3/oI0g65wbVBRKGzq/X65xzCKHruodZymlRZGZSbBchZR8C/++SSHm4FOwPudIR
-DMrRWe8AAAAASUVORK5CYII=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/align-none.svg b/mp-wp/wp-admin/images/align-none.svg
--- a/mp-wp/wp-admin/images/align-none.svg 735972b4215caa53459687b05891967c779a79ccd773e7728ed0e29263110efd5e19f08d057f5383cb488bc8ae8b0a6971012bda40acdc5b72e7e7fddbdea9ab
+++ b/mp-wp/wp-admin/images/align-none.svg false
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="21px" height="15px" viewBox="0 0 21 15" enable-background="new 0 0 21 15" xml:space="preserve">  <image id="image0" width="21" height="15" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABUAAAAPCAIAAACEOBM8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAB
-d0lEQVQokY2RPW4UQRCFX/30DLshu7IWIlIO4Sv4ipyBQ3AGMosES/aARIDNznRXPYJZzSZtyaVK
-Wqqv3utXQjIzSaqqiAAINPQq4IbZLq+CVLB5Zk7TtG0B4LQun1HE/s4lVBwzXccPH09OkuTxeHT3
-dY5dGhACOBAMSYE9/XzIoKpqZq7wqi+vNPC4CKSJNyNgLup0EVkxkuv/v9996ur/2p9uv3zjzoAa
-KG1eFqRf7YkAyMzQvv+b5x8YM6q5N5Pi7m3jL85FVFXZT2CWAoUoou5QUId/+8U8MzdxABEBli4/
-iqOeUcTM0VCfiYPp9ewRAFQVkt3+PZ4QoyGWeKHD3u3PgmvsWwqfv9539YXTIsNQ56EUBHY1CvJy
-fwBmBqC15t4PcJGDN8Ctgc0Q7oHmANw9Ilbe3cHo6wvp2kCneOW5esFwyW+apsxct4T283t/Xqrz
-jzUPZRlF6g6Qzf92AkT/fi8m+0oWkcBsOSLaynen31j/ASF25K35/sRLAAAAAElFTkSuQmCC
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/align-right.svg b/mp-wp/wp-admin/images/align-right.svg
--- a/mp-wp/wp-admin/images/align-right.svg c8022e9a080cec5be106e51cd5cd452ea9183161944ff5db2e5788de55b2b852c55097286bebd07ffe7c62d2302a8ac3fddd56674f251fe1f31c96c0859c905f
+++ b/mp-wp/wp-admin/images/align-right.svg false
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="22px" height="15px" viewBox="0 0 22 15" enable-background="new 0 0 22 15" xml:space="preserve">  <image id="image0" width="22" height="15" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABYAAAAPCAIAAABvD6g/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAB
-3klEQVQokY2TQW4TQRBFq6qrPZPYSRQpUlYsOAILzpAskhWH5ABRfAvgCtiS5SyABdgZ93RXfRZF
-RkJgxFu0ukdT8//8qmZ3Z2Z6AQARMfO0eSaa1cLapUqeybjlqp6NSMRLk54BxNtRQL8DgPnHx3dv
-ZwVzLzsVyeSHQ9b+oK2l7s37Dwrg6emJiETEzKbilFKtlZl5PL0cynDB++eh43krhj57zSeDdWwt
-XSgAEbm6ugKgqq01VQVgZqpKRKD9pyxt6C5Lbb0cOKsrE5U5t2IzI2Xm1lpK6eHhIcTHcVRVZmbm
-m5ubBD5Pi2qlnUgzPyVk8Z3teL/g7pyFdHJ+f39PRGaWUorV3UWEyL8bnZW9n/V06DErQxnmsxOl
-YecLwjcGsN1ur6+vl8tl5GpmOefo1N3d3TPRKRUjIZSEhQklI8jw+euX1+evxhkRgNVqBcCPYGYA
-Wmt4IZ5sNps4KhGpqpktl0s6QkRba00piQgz397eisivP22tbbfbf7gIqdjEWmsNF3HUlFJE8Pj4
-+FcLzDyOY9/34cLdp+yjm2Rm6/Uax5n0zSxSiDjCOwAVkRihY8TUxwROXReRWms40lDYbDZ/XpDA
-3UPDzGLeoqTruvgoT3fsPwEQYmEHwE+XqstggPB53AAAAABJRU5ErkJggg==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/blue-grad.svg b/mp-wp/wp-admin/images/blue-grad.svg
--- a/mp-wp/wp-admin/images/blue-grad.svg 1e690237f7c4bb8e9a3ce79dff2d0581f30a08e0c6d50052421a67c548fa09b9cefcd40f03520bb6466f6cd69ad3c7fa65b0b14363c909170f71d0cc0a59d4e5
+++ b/mp-wp/wp-admin/images/blue-grad.svg false
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="31px" viewBox="0 0 5 31" enable-background="new 0 0 5 31" xml:space="preserve">  <image id="image0" width="5" height="31" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAAUAAAAfCAYAAAAvIgcYAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
-AAAK8AAACvABQqw0mAAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMC8yNC8wOCkOq/sAAAAhdEVYdFNv
-ZnR3YXJlAE1hY3JvbWVkaWEgRmlyZXdvcmtzIDQuMOomJ3UAAABFSURBVHicY7z2/vN/BjTAhC7A
-wMDAwPL/HzZBDM0MDCz/sIhiV0m8mSQI/iPadhLMxCKIxR4Glv9D2e//KHUSNtuJNRMAyolC5QTM
-SKoAAAAASUVORK5CYII=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/browse-happy.svg b/mp-wp/wp-admin/images/browse-happy.svg
--- a/mp-wp/wp-admin/images/browse-happy.svg 95bf28d321cb06447c476df3c68393222c78f8d4d8de2b2fd5e55df7d046f02750a0b57b16351f596f3f83cc311338767e3c49db55f47c4b418d0d91dc314bc3
+++ b/mp-wp/wp-admin/images/browse-happy.svg false
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="120px" height="32px" viewBox="0 0 120 32" enable-background="new 0 0 120 32" xml:space="preserve">  <image id="image0" width="120" height="32" x="0" y="0"
-    xlink:href="data:image/png;base64,
-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
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/bubble_bg-rtl.svg b/mp-wp/wp-admin/images/bubble_bg-rtl.svg
--- a/mp-wp/wp-admin/images/bubble_bg-rtl.svg 1458b828946e161e4e7292138672215763414b173ff6137e3201ebf3cabe3ba4ad961b11493c266383ab124b9e9c535b1912e99f90d7829539746b985557712f
+++ b/mp-wp/wp-admin/images/bubble_bg-rtl.svg false
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="100px" viewBox="0 0 18 100" enable-background="new 0 0 18 100" xml:space="preserve">  <image id="image0" width="18" height="100" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhEgBkANUAACZHYWmqx9VOISWDreqnkNfo8L+/v9pkPTOLsszMzKGvumqBk8TExOKGZ5Oj
-sLzGzqDJ2zRTa9fd4vLy8vLIupLB1thZL0CTt+2ynvfe1ubm5rvZ5vf390FedeTw9a66xOWRda7R
-4O+9rHeyzNXV1frp5E6avOXp7N3d3f///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACkALAAAAAASAGQAAAatwJRw
-SCwaj8ikcslsOp/QqHRKrR4PgmyWCdJulxivgFmyeJuUc5OgfTa+Tiw0Y4mKrPi8fs/v+/9/EQCD
-g0wLhIVLCogATCeChE0PiE4OkU6HjU8dmk4SEVEfgKOkpaanqKmqVSYDrq5MI6+wSxCzA0weCLNN
-G7xNFa9PAbROF7hPBQhRIavOz9DR0nwMBtbWTCTX2Eso2wZMHN9NJ9tO3txNCelN1VAT4FAaSEEA
-Ow==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/bubble_bg.svg b/mp-wp/wp-admin/images/bubble_bg.svg
--- a/mp-wp/wp-admin/images/bubble_bg.svg 2c0ebd8b382a31d83969f12bc22a5682f66cdab01351159cc78a9de5cac269d09a90757253fa15228900c94683c3ae82c89b823fe6778f1914ad775b2f508252
+++ b/mp-wp/wp-admin/images/bubble_bg.svg false
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="100px" viewBox="0 0 18 100" enable-background="new 0 0 18 100" xml:space="preserve">  <image id="image0" width="18" height="100" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhEgBkANUAACZHYWmqx9VOISWDreqnkNfo8L+/v9pkPTOLsszMzKGvumqBk8TExOKGZ5Oj
-sLzGzqDJ2zRTa9fd4vLy8vLIupLB1thZL0CTt+2ynvfe1ubm5rvZ5vf390FedeTw9a66xOWRda7R
-4O+9rHeyzNXV1frp5E6avOXp7N3d3f///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAUUACkALAAAAAASAGQAAAaowJRw
-SCwaj8ikcslsOp/QqHRKrS4FWOyBmcWCuF0MGGspjQWUZpbgxDaegu3TkoGKrPi8fs/v+/+ARACD
-gxFMhIMLh4gKi4UnjgAPTYQOTolPAB1QERJQH4GhoqOkpaanqFEDq6smTKyrI6+wELOrCB62AxtN
-rBVOqwFPAxdQCAVQIanLzM3Oz3sG0tIMTNPSJNbXKNrTHN0GkN3cTdIJTwbV6BNQGklBADs=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/button-grad-active.svg b/mp-wp/wp-admin/images/button-grad-active.svg
--- a/mp-wp/wp-admin/images/button-grad-active.svg 7329a55ffc02e2ba75e7c94f5c35908caf8c2703ec8e7f2f1a310df6c8dc332e2f31e16d1418f84842836dbb151d4335f4e07a4d42b54a4bd312cce538e2a3da
+++ b/mp-wp/wp-admin/images/button-grad-active.svg false
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="30px" viewBox="0 0 5 30" enable-background="new 0 0 5 30" xml:space="preserve">  <image id="image0" width="5" height="30" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAMAAADToCSPAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAAGNQTFRFI3mhI3adInOZKYy6KIq3IG2SJoCqHmWHIXCWJX2mI3efJX6o
-JHykJ4ayKIezKIi1H2iKJ4SwIW+UJoOuH2mMHWOFIXKXJoGsKYu5InSbIGyQH2qOJHqjHmaIHmaJ
-JHqiH2uOg3njkwAAAE9JREFUeNokwYkWQlAAANGxla1EUXgP//+VmuNeRnEXMcZt4yU+Yv07WEQh
-BlGKSaRiFomoxWXfQwi0ohKNuImveItePMRTdCIXP5HpFGAAQOsIjXQqwS4AAAAASUVORK5CYII=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/button-grad.svg b/mp-wp/wp-admin/images/button-grad.svg
--- a/mp-wp/wp-admin/images/button-grad.svg 6ded172baa6201f5368db65eab26c2b0edfd11cd5d2137fbd06e10af6b6219cc1c89d1ecef384abe9e3a81478bc9b096fde12e841b589afa0da610c74eea8c3c
+++ b/mp-wp/wp-admin/images/button-grad.svg false
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="30px" viewBox="0 0 5 30" enable-background="new 0 0 5 30" xml:space="preserve">  <image id="image0" width="5" height="30" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAYAAADkftS9AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
-AAALEgAACxIB0t1+/AAAACF0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgNC4w6iYn
-dQAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMS8xNy8wONpsdXEAAABGSURBVHicY9Ts2fWfAQ2wMPzH
-EGNg+f//H6Ygwz9sgthU/sdmJlbtlFpEgpOwWoTszv+Dz0lUtOg/ukoSfATT+5+gSkxBAOqCS3dT
-eDKPAAAAAElFTkSuQmCC
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/comment-grey-bubble.svg b/mp-wp/wp-admin/images/comment-grey-bubble.svg
--- a/mp-wp/wp-admin/images/comment-grey-bubble.svg f01d4e9427128b2f04d180a95f5d46417270bb9976c7ee89037f1498d3f4e8c2ce965e88ce855c1e60dc19e5b8f7ffa5cd897abb3eb25418cf67cc39d245d500
+++ b/mp-wp/wp-admin/images/comment-grey-bubble.svg false
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" enable-background="new 0 0 12 12" xml:space="preserve">  <image id="image0" width="12" height="12" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAMAAABhq6zVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAAAZQTFRFRkZGcnJy4d1N7AAAAAF0Uk5TAEDm2GYAAAAhSURBVHjaYmBg
-hAMGJDaQR10Oij1ggGCBOQxIHAgFEGAAKMYAb8OafsEAAAAASUVORK5CYII=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/date-button.svg b/mp-wp/wp-admin/images/date-button.svg
--- a/mp-wp/wp-admin/images/date-button.svg b415bf0541005728b3db692740ae81218ba4af011e68602c4fae3477d8c2b892a1ccc2404340d1f588dff713ffab86c5dff5195b03d51b5d110ce74a06ebf6fc
+++ b/mp-wp/wp-admin/images/date-button.svg false
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="13px" height="13px" viewBox="0 0 13 13" enable-background="new 0 0 13 13" xml:space="preserve">  <image id="image0" width="13" height="13" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhDQANAKIHAL7Dx5icn2RkZK+vr83NzZaanf///////yH5BAEAAAcALAAAAAANAA0AAAM0
-eCqg26dIISuVgRChOyeS9nla2J2diZ6S4b6w0RrD4NbvTL+2q/c7X+GGq/V0sVxlySwkAAA7
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/ed-bg.svg b/mp-wp/wp-admin/images/ed-bg.svg
--- a/mp-wp/wp-admin/images/ed-bg.svg 43e8bd8b02cba89a8a7312981120fb123a744c147fcb388931b42b414245a29d1be8926140b498169cbc6693ccc8e3d6e90f6aa95972e5e83b8e47ba68d2e717
+++ b/mp-wp/wp-admin/images/ed-bg.svg false
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px" height="37px" viewBox="0 0 20 37" enable-background="new 0 0 20 37" xml:space="preserve">  <image id="image0" width="20" height="37" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhFAAlALMAAOnp6ejo6Ofn5+bm5uXl5eTk5OPj4+Li4uHh4eDg4N/f3////wAAAAAAAAAA
-AAAAACH5BAUUAAsALAAAAAAUACUAAARrEMhJaw046827/+AmjGRpnmiqrmw7DnAsz3Rt3/hM7Hzv
-/8CgcOgrGI/IpHLJbDqThqh0Sq1ar9isdhs9eL/gsHhMLpvPaC9izW673/C4fE6vrxP4vH7P7/v/
-gIGCg38KhoeIiYqLjI2OiREAOw==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/fade-butt.svg b/mp-wp/wp-admin/images/fade-butt.svg
--- a/mp-wp/wp-admin/images/fade-butt.svg 47480c18c0d6f5e496943c4ad0d64daff7caea30eb49fcf203d5710c80212e498a046dafd51f1d342cb18e15b38c56b60122c1a9a8b45f67501959f6afeff926
+++ b/mp-wp/wp-admin/images/fade-butt.svg false
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px" height="40px" viewBox="0 0 20 40" enable-background="new 0 0 20 40" xml:space="preserve">  <image id="image0" width="20" height="40" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABQAAAAoCAMAAADJ7yrpAAAABGdBTUEAAK/INwWK6QAAABl0RVh0
-U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADqUExURe3s7PX19e7t7fz8/Orp6fDv7/Py
-8vf39/r6+uzr6/Ly8vj4+PTz9PHw8PHw8fT08/38/Orq6unp6fn4+fb19fHx8Pf29+zs7PT09O/v
-7/f39uzr6vLy8fn4+Pn6+vTz8+vr6/X19urp6uzq6u7u7u/t7fr6+fz9/Orp6Ovq6urq6ero6O/u
-7/j4+fj5+Pf29u7u7e/v7vr5+evq6+vq6ezq6/Px8vPy8fz7+/r5+vDx8Pn5+u/u7vDv7vb29uvp
-6vDu7/n5+Ovp6fDw8fz8/fDu7u/t7u7t7vn5+fX29f39/PHx8fv7++no6P8MrTIAAAGtSURBVHja
-YhBwEVAXYBZgBiJ1ZiAQ8FJnBgggBh8kYAGlAQKIgcNDTY4DiDjk1DiMOOSA2NoSIIAYuGV1uYVl
-ZbmFHYX1uLn1hGWFdbkBAohBil1fSopdSkyKnV1fTIwdCMTEAAKIgREIRBRFwKSnCCOQZccIEEAM
-8vzyPPwSPECSR0KCn0eCH0gABBADF5sMGxcXGxuXGRubDJApw2bOBRBADHyifKLOfHy8vHy83lZ8
-ory8vKKiAAHEoKPjwGpoKMkqacsqKckKApKuAAHE4MZkwMSkaqDizsSkosJkA2SrMgEEEAODOIO4
-OAMEiENJgABi4FTglDZVVuDklJZWllYwVubk5DQGCCAGFidBQU17QS1BE00tE0ElJU0tQSWAAGIQ
-YhESEmJhYdHQBmIgS4NFWxsggBh8sQCAAMIqCBBAWAUBAgirIEAAYRUECCCsggABhFUQIICwCgIE
-EFZBgADCKggQQFgFAQIIqyBAAGEVBAggrIIAAYRVECCAsAoCBBBWQYAAwioIEEBYBQECCKsgQABh
-FQQIIKyCAAGEVRAggLAKAgQQVkGAAAMAS+S0diV/RlUAAAAASUVORK5CYII=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/fav-arrow-rtl.svg b/mp-wp/wp-admin/images/fav-arrow-rtl.svg
--- a/mp-wp/wp-admin/images/fav-arrow-rtl.svg 3263e01dcc3f5a9c859de6328923d61aaf120658b5e6a5770dd68ffedac7651d82d94038678c91e359574944c1752fdf42333492775d9f6675e270511430cfb3
+++ b/mp-wp/wp-admin/images/fav-arrow-rtl.svg false
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="17px" height="32px" viewBox="0 0 17 32" enable-background="new 0 0 17 32" xml:space="preserve">  <image id="image0" width="17" height="32" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhEQAgAPUnAFJSUlNTU1ZWVldXV1hYWFlZWVpaWlxcXF5eXmBgYGJiYmRkZGZmZmhoaGlp
-aWpqamtra2xsbG5ubnBwcHJycnR0dHZ2dnd3d3t7e35+fn9/f4eHh5KSkpmZmampqbOzs7a2tsHB
-wcLCwsnJyczMzNDQ0NHR0QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C0lDQ1JHQkcxMDEySAAADEhMaW5v
-AhAAAG1udHJSR0IgWFlaIAfOAAIACQAGADEAAGFjc3BNU0ZUAAAAAElFQyBzUkdCAAAAAAAAAAAA
-AAABAAD21gAh+QQFAAAnACwAAAAAEQAgAAAGa8CTcEgsnjDG5BCpTDKbxSd0OY1WidJqdnq5Di1e
-YSV8opAnpxFpvQ4pJQSOaT7vKCMOgogOaj5OAxpzJRtNDScPAB8mHlAMQgYPI1tEC0IRARlTCkMQ
-VQlkCGQHZAZkBWQDZAKrrWGsr6tBADs=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/fav-arrow.svg b/mp-wp/wp-admin/images/fav-arrow.svg
--- a/mp-wp/wp-admin/images/fav-arrow.svg c73ace37b7042e790d1ec676adc9f17ba6628bedac5e85172af2b3981cf5ce97b45242f8d23822f4ddfff2516fce4ffebd1c089fa22f125d64f20c0fee83eb69
+++ b/mp-wp/wp-admin/images/fav-arrow.svg false
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="17px" height="32px" viewBox="0 0 17 32" enable-background="new 0 0 17 32" xml:space="preserve">  <image id="image0" width="17" height="32" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhEQAgAPUnAFJSUlNTU1ZWVldXV1hYWFlZWVpaWlxcXF5eXmBgYGJiYmRkZGZmZmhoaGlp
-aWpqamtra2xsbG5ubnBwcHJycnR0dHZ2dnd3d3t7e35+fn9/f4eHh5KSkpmZmampqbOzs7a2tsHB
-wcLCwsnJyczMzNDQ0NHR0QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAUAACcALAAAAAARACAAAAZrQMxp
-SCwaT8KjcphcHpvOIjTKpBqnVGz0Yi1ausQKeEgZnyZmyTJEardHp8iyY6rXOYSHE2QXERwNThsl
-dRoDJwxRHiYfAHoLURgjDwZDClQZAXInCVYQRAhmB2aVYwVmh2MCZquqrK+uY0EAOw==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/fav-top.svg b/mp-wp/wp-admin/images/fav-top.svg
--- a/mp-wp/wp-admin/images/fav-top.svg ca31c35f470bcd4b2df76e90001c4c10b7d05023cb1729bd557556d0847818d881057ed651b98c8092bd7e18355cfb51baa4eb2467b9396f309b7c55d5da4143
+++ b/mp-wp/wp-admin/images/fav-top.svg false
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="3px" height="12px" viewBox="0 0 3 12" enable-background="new 0 0 3 12" xml:space="preserve">  <image id="image0" width="3" height="12" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAAMAAAAMBAMAAABVUBpZAAAAJFBMVEWRkZGQkJCOjo6NjY2Li4uJ
-iYmGhoaEhISBgYF/f398fHx5eXn/qUblAAAAN0lEQVR4XgWAoREAEBRA3whs4EzgzgKCARRdkrVf
-RVHVZEm3nAPQCmvwjhjIiVqQxuisydm8+wFiHAiDEYBbTQAAAABJRU5ErkJggg==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/fav.svg b/mp-wp/wp-admin/images/fav.svg
--- a/mp-wp/wp-admin/images/fav.svg 2e185191867593b63d5648f8785d2b976a34ba11a717066f37ac94855a9d0f776f3be2f75e4a1d4019681f497bbcc874b4b8ec61a47d0e97614376f75073ceda
+++ b/mp-wp/wp-admin/images/fav.svg false
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="3px" height="32px" viewBox="0 0 3 32" enable-background="new 0 0 3 32" xml:space="preserve">  <image id="image0" width="3" height="32" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAAMAAAAgCAMAAADgzjIVAAAARVBMVEWRkZFjY2OPj4+NjY2Li4uI
-iIiQkJCEhISBgYF+fn59fX2GhoZ3d3d0dHRycnJvb29tbW1qampoaGhmZmZlZWVkZGR5eXl/uoGc
-AAAATElEQVR4XnXDRwoEMRAAsWrnnO3/P3XvCyMQX5xzKKXQWmOMwVpLzhnvPSEEYoyklHjvUUqh
-1kprjd47YwzmnKy12HtzzuHei4j8/wGXmgMEq6X/pgAAAABJRU5ErkJggg==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/generic.svg b/mp-wp/wp-admin/images/generic.svg
--- a/mp-wp/wp-admin/images/generic.svg 65fe3d8d2ce01377b9d668e14327b3c121550726621874bbae9bd17ce015c6849b03d707555433ad32294c8f8f23fcb3634412759b6021d8188cfdbba27ead40
+++ b/mp-wp/wp-admin/images/generic.svg false
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">  <image id="image0" width="16" height="16" x="0" y="0"
-    xlink:href="data:image/png;base64,
-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
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/gray-grad.svg b/mp-wp/wp-admin/images/gray-grad.svg
--- a/mp-wp/wp-admin/images/gray-grad.svg e5d1d40bc194ddaa9ee72b61beb8f6f8acabe5023ec2364aa7301c5d275329681a41519f79d73af3785a60cc6ac08fcbeb3e04a604eb9c87273a32638d86da82
+++ b/mp-wp/wp-admin/images/gray-grad.svg false
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="31px" viewBox="0 0 5 31" enable-background="new 0 0 5 31" xml:space="preserve">  <image id="image0" width="5" height="31" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAAUAAAAfCAIAAACgQJBPAAAAA3NCSVQICAjb4U/gAAAACXBIWXMA
-AAsSAAALEgHS3X78AAAAIXRFWHRTb2Z0d2FyZQBNYWNyb21lZGlhIEZpcmV3b3JrcyA0LjDqJid1
-AAAAFnRFWHRDcmVhdGlvbiBUaW1lADEwLzI0LzA4KQ6r+wAAAClJREFUeJxjfPv2LQMSYPn//z8y
-n4kBFaDzqa0eXZ5U9QMtT6l5tFYPADsXLPcJwrwLAAAAAElFTkSuQmCC
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/icons32-vs.svg b/mp-wp/wp-admin/images/icons32-vs.svg
--- a/mp-wp/wp-admin/images/icons32-vs.svg 7316c08035b11d5d6993bfdf508a2ac62aab555b9bb43b4ee31ed4df17546383681210bb6f7034db2c6be1a071db21fe4014ef54d345db42527810f311d1027f
+++ b/mp-wp/wp-admin/images/icons32-vs.svg false
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="650px" height="45px" viewBox="0 0 650 45" enable-background="new 0 0 650 45" xml:space="preserve">  <image id="image0" width="650" height="45" x="0" y="0"
-    xlink:href="data:image/png;base64,
-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
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/icons32.svg b/mp-wp/wp-admin/images/icons32.svg
--- a/mp-wp/wp-admin/images/icons32.svg b4938f0262a04c309e1e1f2cf0aa78c8e1fa89049655f44e6a7779a681d711f52d70630005aae782ae5ff1ff7b2838d19b121fbed03d47ba095647d1b476cf1a
+++ b/mp-wp/wp-admin/images/icons32.svg false
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="649px" height="45px" viewBox="0 0 649 45" enable-background="new 0 0 649 45" xml:space="preserve">  <image id="image0" width="649" height="45" x="0" y="0"
-    xlink:href="data:image/png;base64,
-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
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/list-vs.svg b/mp-wp/wp-admin/images/list-vs.svg
--- a/mp-wp/wp-admin/images/list-vs.svg b1f26a2a5f3fdd5ef0eee8b5af330ccd6ab739f19169dd4842ac15cf5ccd768ab1d10593a5ee0e1597f371468a19c1b2cf99715d33605a71bb3dcec096995bec
+++ b/mp-wp/wp-admin/images/list-vs.svg false
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="80px" height="20px" viewBox="0 0 80 20" enable-background="new 0 0 80 20" xml:space="preserve">  <image id="image0" width="80" height="20" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAFAAAAAUCAYAAAAa2LrXAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
-AAALEgAACxIB0t1+/AAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMi8wMy8wOFmG0QsAAAAhdEVYdFNv
-ZnR3YXJlAE1hY3JvbWVkaWEgRmlyZXdvcmtzIDQuMOomJ3UAAAPSSURBVHic3ZjfaxxVFMc/996J
-bHB1AxYfClWijT+IEJeQlgpLBCsm+lDwIYLVGtr0pSDY4oNQqEsD5rH+AY1UHwSrRfSlRexDKahR
-awgUNFXBHyFhCdKlxGR/zMz1YTKT2dnZvTvuRIJfuMzsnTmfe87Ze+7evWit+b814B3gGqA321tA
-BpBp88Te4kfTQlkTpCDt2BcB0uTdW3wJAQFPCBFco01KiRCChWp1z2Ams4yUAuCbtbWHCrncr0rK
-j+/cvm2nyWNg+tKiTkkD05cW0+YNQ2IeoJeWlnSpVNLlclmXSiW9srKin92161baPCuNmbIT5TgO
-2WyWXC6HbdvYto2lVOo8maLP2yK/xJLKdV201gghvGAtC0spnTavaQbe+PMvAIb33Md7128awUcL
-T7R9bmKY7KMB/764AMCDjw7x4blzLe0+m53l7t5eAMrlMtlsNljTwmrHAHj55MmmvjCvKYHrNSe4
-NwXXibplRAOuVdaD+7jgAA6fOsWhY8fo6+vj+OnTVCoVMplMbAJbMdopzGtKYOHh+xMD2+nKj8uJ
-3h97fHfDZykbV5mBoQNGxszMDP39/QAUi8WA47ewbs5dNfLeODHVkmcBON5eB4BPF/4A4MWhB5g8
-f8UIvzA1BnibI19h3lq1bmSE5W7a+gQpJY5dBUAIyfz1ywDkC+O8Pv5CLMNxXSZHR3Ech1dfOcxd
-PQoldRB0mFfd+Nvo08Sh53j+YIFKtcbgyNMNPC+BW1XLWtXedAJmj44Z4Y7rXUM5i+V1qihPCIFT
-88pWSEV13QvYqW/w7uefxDJc16VWq1GreV9ej6VQ2CilWvLaydWaHgFYktw9vQ08C8B2t6KfyHtT
-te7oWFgniuN1qui4Ukrs6laQTx4oeO9t3GnLUUBvT+ARbt0OZmAcr3PpBp4FUHfd4PH5r24BMPXU
-I+TPXDDi5s9ONvWFeSZGnH1YUkrqla2A5659CcD+0YM8s/sxo39Xl39qYEV5JkbYPs63phL25Tjw
-/duTRgdb2foyMeLsw5JSBiXXYFdb54vffjD7F7IN1sBQn4kRN3aY1/QjcmTfANG+pArbfvDtz4ls
-/fF9KaWCRR8gPzLsjRHq61RCiCbe/Hc3EjH88X1e0zbGD/jIvgH2n33fCJw781oiB5Iquu3wA86P
-DDO+17ylufzL1w2sKK9b39r+F97u5HSidgGHk9Mpa9sTGC2hbtUtLxpwuISSyj+iSpX3r63/I6ku
-TlCi8tfANHk7PoFpllzcDOyWJ3b6ifTg7JtYSk2ET4j9a/S+XQNwtb64urqaKu8fhPB3IhEofEIA
-AAAASUVORK5CYII=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/list.svg b/mp-wp/wp-admin/images/list.svg
--- a/mp-wp/wp-admin/images/list.svg 2cb983a88480b3bdb398ba77bc8e003b5a583e3c81718758698fe942d289b47cc230b119de9c549a45abaa6eb2f6105aacf869116d39718db0cdbf690fc97829
+++ b/mp-wp/wp-admin/images/list.svg false
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="80px" height="20px" viewBox="0 0 80 20" enable-background="new 0 0 80 20" xml:space="preserve">  <image id="image0" width="80" height="20" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAFAAAAAUCAYAAAAa2LrXAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAA/JJREFUeNrMWEtLJDEQzoztWxFU9qZeFDyI+BwfCHvx5k38Ac646+wu
-qKCwggPeFFxQRGEZ2FUPgn9A8ORlbzIqetCjBz0uDgji+7GbL5gmne6eaZMIFtRUdzr1TeVLpZLu
-0Pz8/EdCyA+qEaIuKarfqf6hagxvY2PDKJ7p+BjewsJC+vT09J+OwB84dDKM4rW2tpJIJJK+uLjQ
-woM/cOilUTzEZ9H78vv7e3J4eMioxZ+EQiHbBpGSkhL0L3/xd+D5iR8+2ktLS228p6en8oeHB7K9
-vc36Pz8/vzq+pqYmhsPxHh8fGR6EY70mvpaWFhvPws/t7S05Pj7OGIQYvNze2NjoaAPe0dGR8vrA
-gGU8upyz+vkNur6+3nGPCd7a2lKOr6Ghwb5mBFqWxVgVSeEBiW383m/WuOTk5ATODj9/ecDRaFQ5
-PviLgozWEdHfJhBLzivDxCXd3NxMDg4OPK0owNMhEP5ywOvr654ZJsYXi8XI6uqqy05MTDh8sIR1
-RPS3+IyjIAaR9vZ2TysTEA6HjRI4PDzsu0zFtng87rIyYbR+aREo+lteAesK8ORlqEMgAtaJUSYM
-hOvgieXBJnB/f18ZUM5e4PX09BibEAS8srLiqH9e2YcSJGY+f4alLMvg4GDGjSfbxuRawvRcozxA
-+Q+8si/bxpMNf2RkRDk+7OKigGQ5A18TnzhJdgbu7u5mnF1co97t7e2RtrY21h/33GZagiZKQjKZ
-zBrf6OgoWV5eZmQvLS2xe9ihoaE3i8/OwM7OzkAOHR0dzPL+Xn7A4wdVFent7XXc5+XluXZSPxkf
-H2eW94e9vr529MnNzSV4a1IVMRbLb8npiOlzIAjEoFUlPz/fRaCOiP42galUKvDOI9cNnpVvRSAI
-WFxcVI5vbGzs7Qns6up6txkIAqempoy8OXACdOJzEYhdZWdnx3MnEttQ79DPy8q7lE5ZkA/hWMJz
-c3NZ4wPJs7OzLjs5OenaRHQ2EtHXJrC7uzuQM+8nW5mAvr4+YxmNGZ+eng7Ul/cTLc6HMgEzMzNG
-YgsjuLOzMzZoVYU/T2vTeGVlZezoxLNGReEPHBy/YFHvdfDgDxw2GdXV1enNzc0KnS8UGCxwTk5O
-iEk8XPf396cTiUTF5eWlMh6+Lw4MDKTX1taM41m0QMdqa2t/0QF/uLu7Y59+cHKHhYIIvEuipmFg
-qEco6lB+Tdv/0lr0GeCFhYXRurq63xyPK7BgZTwRhyvwaCZ+Al5VVdVXeiD+eXNzU4nzHPTq6srG
-w4cCjofs4Bg0DlJcXEyKiopwfU6ffwNeTU1NnO7KSYpRCRwoMDFmP7yCggKGA7wXPafPvgDvvwAD
-ACN+Yx904Ae4AAAAAElFTkSuQmCC
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/loading.svg b/mp-wp/wp-admin/images/loading.svg
--- a/mp-wp/wp-admin/images/loading.svg 6e85a48bc2baac5bb31c02fa767a5fca1ae25fe3d581db5f057863e1a95f2b7bd827fb00826a4b19f02a53e6b3b9576718323725b457a9657328516bad2c5e7a
+++ b/mp-wp/wp-admin/images/loading.svg false
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16 16 16 16 16 16 16 16 16 16 16 16px" height="16 16 16 16 16 16 16 16 16 16 16 16px" viewBox="0 0 16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16 16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16" enable-background="new 0 0 16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16 16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16" xml:space="preserve">  <image id="image0" width="16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16" height="16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16
-16" x="0" y="0"
-    xlink:href="data:image/png;base64,
-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
-ISADghsLBDEhIwRfGyMWGA8NXBEAOw==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/logo-login.svg b/mp-wp/wp-admin/images/logo-login.svg
--- a/mp-wp/wp-admin/images/logo-login.svg 4a023d9d343df7069c009460131be98f172f6cbe881bbf2e5aefea8a6fd8b148d2c51e62b20221b8b8951952fe489517250ae2c903690c8f21f3210ab3eb3b7a
+++ b/mp-wp/wp-admin/images/logo-login.svg false
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="310px" height="70px" viewBox="0 0 310 70" enable-background="new 0 0 310 70" xml:space="preserve">  <image id="image0" width="310" height="70" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhNgFGAPeJAEZGRiF1m/r6+vz8/Pv7+3R0dPn5+f39/Z+fn3Nzc11dXe7u7lFRUYqKiqGh
-oczMzFJSUqKiomlpaePj49fX139/f1iYtLa2to23ytDQ0GhoaJaWlpWVla2trcTZ4ri4uMHBwVxc
-XM3NzaCgoImJidDg50uPro+5zKqqqtnZ2S59oevx8/Hx8fLy8qurq9vb26jH1jyGp2aguX5+fuTk
-5Obm5re3t464y6nJ14Kxxu/v73SowD2HqLXQ3OXl5VeWsy99oe3y9d/q75zB0nOnvy5+oViXtMPY
-4UqOrc7OzmdnZ4Gvxdra2t7o7cPDw8TExPDw8Jq/0HKnvqrK2IuLi9Tk69Li6c/Pz2WfuavK2J3C
-0oCAgKysrHV1dS9+oeLt8fD198Xa49jY2JeXl7jT34CvxNPj66jI1t/p7tHh6I23y2WeuIGwxsbb
-5e7z9cXa5DyFp+Dr8FiWs8PY4j2Gp1mYtMLCwo64zD2Fp1iXs7fS3oCvxWafupvA0IGwxZvA0e/0
-9o65zMPZ4tPj6sbb5O3z9XOnvsXb5O709vn5+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAIkALAAAAAA2AUYA
-AAj/ABMJHEiwoMGDCBMqXMiwocOHECNKnEixosWLGDNinPCgo8cHCzSKHEmypMmTKFNqnHCBhAYA
-MGPKBJCAw4WQKnPq3Mmzp8+KEziEkCmhQISjSCMUUCBTAwqcP6NKnUq1qsMHCWIW6JDhwIEBBMKK
-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
-MSqaMk9JM71AnMR60Su2gsRK/MRQHMUDERAAOw==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/logo.svg b/mp-wp/wp-admin/images/logo.svg
--- a/mp-wp/wp-admin/images/logo.svg b661940f08e5cfa0485ed358aaded13297045594e732fdda71c7bc0d91e7722e3a9c63925d292e53a5b489b8c1e39abd14082a610ee82949385f23b040ed30b3
+++ b/mp-wp/wp-admin/images/logo.svg false
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="65px" height="66px" viewBox="0 0 65 66" enable-background="new 0 0 65 66" xml:space="preserve">  <image id="image0" width="65" height="66" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhQQBCAMQAAEZGRszMzGZmZqKiov///4CAgOjo6Lm5uVJSUpmZmdzc3HR0dPPz88XFxV1d
-XYyMjK6urv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAUU
-ABEALAAAAABBAEIAAAX/YCSOZGmSyjEUS+sWw6EQZ23feMQcBQL8wGAQUTgYcsikKFAAEgeBGWE6
-VQRWDmChQVN6SYcswJGQUs/oKkTsOHS/yMDit+Cmq4Hofcr8OQJwOAwJdAFoBgcPc0I/Ag8QZlMG
-iw8MgScKAgAIdpIQmoyhfgMGZwFZDgqXYD4FDFQGD6KzQgWGUwyyAAerEQc/EFS5tMRCD6VTBz4J
-b16/CLcEDT7F1T8IwVU+D81Iz1LD1uI/rtoAD86b4KDj4wLICj68SPEA6+3tDjFU9YCCWW4IMGCH
-rxq3NA02WbpB6ODAguIK7CFASKKNAGNeEWgC0RqyPZoa2NB0C0JHaw4m/1bJeOKXxCksXCxIMGAA
-ISALaq6Q+UInR5wqp8gacCLLR5XsogUlgHHIUgYIECwc8evgngANBuhqFEPpGQYBVBD8EQnNrQEA
-IJSYUxbNWEYBD9GymuaggTFv7i6oohGNSVov07wNcvTMgoBN/EUgFPBB3DN3ifU981fU3jstpiRE
-J0LTKwYALgsm9hgWsU6GASBDkDKC3mQ/Ck+pLEoASFopR2eTpSrhAKHA7kSmJZsA7VClCdCBrRbt
-LTG27wwOkk0ureimf6xENwdXkLbGieUeTfxMQrJTANh2kLvpD2Zphs8Cf5xRdYpAAnYPPTvIeLfE
-wGfdLHSx8xsB+12GVv8QXvWH222ziCYffM4BcOCCQNCVHS0NhhchFRjyR0CFFwqBAITz3aEALaKJ
-sdyIAGBUohCogfjgHi4y8tKKQSgYo4VThEiOirQImMZNoRyI5IsVviTkD5NRkaMQM3TIYyh2TEnh
-j5fVt8sdS/o3hVR3TAnEK1cCcWATULUXimhnpBkEMwklhx8j0YX5JYIA8CmJKMWZaQ8BsmAXZyjZ
-mHmLevjdQo0Q91GhZ27UBMpIKXJqR8BdEv2SzU9BGMoPI3QCEekUYebJyGWeugbAS7+EAt6UM2z1
-36jUjWkfcKpEkMVnohgpqVNQfVemsecJsdqJIjAGUyi3rpQhAbECISz/qkDkthUQ0W3WxYqXuSdE
-hy5yASpeaVwJ36P5ASfSCJogI6iG2G4iEJbHAsBFstl61xpV52gWyonp/sBNtUHQeydwQgSEFlEl
-GDXFIjQea+7AURKw4kvsoguVVCZUJW0tYJ4Imih2tiENI2dZWEMWLTOSsQIHzxLYGQmUsi0A8N0F
-8gkJYUdxu+luREvGGrEr9C43NAHfQ6HucfIspwrsBDJo7XVDsQHVQ9gdCIciKhVbISAFRggcgcOK
-Zptj6h3nhlIcNW1r7MO7OXxTBTvRTk3LgeZdcw/ESRBSNwM/lRW2KNHKsoBGD3HmhSx1G7cMGnGL
-EglogCuQheRfGB6XhgEF/Od3gJCZEcA2vcSaQF8BfLT4LASnsSDhq9TzB9ziVL73Jnj3ogNHBRSm
-wAALCLpJTl7FQsdUwo9wisHgaZxHHtU7P0bw0ZcQRiMQFDcRIosgMAD03bdEsQAJHNAhUwckwI4A
-86SPhAEQDH1NCx2rN0Cv9oPDFRLQAjEgoAUPgAL6LhECADs=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/marker.svg b/mp-wp/wp-admin/images/marker.svg
--- a/mp-wp/wp-admin/images/marker.svg d1adb508c46e0d01aee16f57c371fa8711845d657c715675321745966c455441cc8ac8709cd3e4954d1843e26d202b4f3fb6e3350bd67da25c5df811ee6d5bcc
+++ b/mp-wp/wp-admin/images/marker.svg false
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="17px" height="17px" viewBox="0 0 17 17" enable-background="new 0 0 17 17" xml:space="preserve">  <image id="image0" width="17" height="17" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAYAAAA7bUf6AAAAK3RFWHRDcmVhdGlvbiBUaW1lAHZy
-IDE0IGp1bCAyMDA2IDEzOjMxOjIzICswMTAwHvJDZwAAAAd0SU1FB9YHDgsgJYiZ4bUAAAAJcEhZ
-cwAALiIAAC4iAari3ZIAAAAEZ0FNQQAAsY8L/GEFAAAB5ElEQVR42q2Tz0sqURTH72Qq4mASSAoS
-IfSDdCEI8qJFLXSjLYSQNoGLINrI8/0ZD9q0KnDlKkIMebmP9xZRCEEiLQLBiMiNJDYq/Zg573vp
-CkM6CdGBD3Pn3OvXe77nDGPfENKwJBHx/CxYAtNAAVfgXJKk7khVCCyCP6ALVKAJXkEdbINxw5tg
-M4HHPphSFEUql8usXq8zWZZZKBRiPp+PH3sBx2Br4FbiBg+aplGxWKRgMPiMH1+YTKZDq9V64na7
-G+l0mprNJo7RG/g94IEoQSsUCuRyue6QToIJYAJWMA/Bo2QySZ1Ohws9gZBeZI570Gq1yO/395BK
-GJg+ZbFYznK5HAmf9vQiKW5iqVQim832Fyn5E+83Y7EYieAdY2Nig7dRqtVqrNfr3YiWGsVltVrt
-r2f0IrwEZrfbGeqWhQ9GMeFwOPprRS9SAWo4HGZOp/MH1l4DAS6+HolE+u9Xek9kcK+qKqVSKUL/
-s0hPDhFY83g8j5VKhcQg7nxs80/w0mg0KB6Pa2az+RTpDbDA3sd/lwvk8/l+Z7iS/FHEAor8H9rt
-NmWzWYpGo+T1eikQCFAmkyFxAy7AJ255aMHYcIID8d1oNBi8hGuwwkYFDq0CPlG3YsTb4B/4BRwj
-Bb4S/wGzT16tu5THiAAAAABJRU5ErkJggg==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/mask.svg b/mp-wp/wp-admin/images/mask.svg
--- a/mp-wp/wp-admin/images/mask.svg fdfac238ffdb778d9c799de6672d984dfd8d2373eb4da3cbb091eb3a67b4c499fa99fa39e56ab8f24f33104bff757e937430a8e5a6ef5a91f65e8ed74ae45a85
+++ b/mp-wp/wp-admin/images/mask.svg false
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="101px" height="101px" viewBox="0 0 101 101" enable-background="new 0 0 101 101" xml:space="preserve">  <image id="image0" width="101" height="101" x="0" y="0"
-    xlink:href="data:image/png;base64,
-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
-z0t9/gHKOXPlZc81WwAAAABJRU5ErkJggg==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/media-button-image.svg b/mp-wp/wp-admin/images/media-button-image.svg
--- a/mp-wp/wp-admin/images/media-button-image.svg 3f97e34e7bb4c4e1f569009366f19a313e09fb65663030e43c7482b884dfac2a27a17fea35f5bb0896dc5abb62887f88c9973631ab903c8e27e553f7ec88424c
+++ b/mp-wp/wp-admin/images/media-button-image.svg false
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="14px" height="12px" viewBox="0 0 14 12" enable-background="new 0 0 14 12" xml:space="preserve">  <image id="image0" width="14" height="12" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhDgAMAIAAAP///5mZmSH5BAAAAAAALAAAAAAOAAwAAAIcjI8Jy73mIoAz0WvD09Xu7VWg
-InYkJTFoamZIAQA7
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/media-button-music.svg b/mp-wp/wp-admin/images/media-button-music.svg
--- a/mp-wp/wp-admin/images/media-button-music.svg 3c812c2543a44e952612e87aa64bf506397f1e1104145a7b09a8c5d58ec9290af8a0eba6f121e054661bae73b72427f4a2f31a1daaa729094575a24242e782fb
+++ b/mp-wp/wp-admin/images/media-button-music.svg false
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" enable-background="new 0 0 12 12" xml:space="preserve">  <image id="image0" width="12" height="12" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhDAAMAMQQANrh56mrrLe7vsLHysvQ1OTt85+foObv9czR1cHFybi8v52entPa37CytLS3
-uZmZmf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEA
-ABAALAAAAAAMAAwAAAU5ICRCB4AMSmA8I/S88NvG8UzL4xMICQEUrFxLFCQOXTMRw7FwPJbNYCM2
-hYmqjwa2oWQ6GNDvERICADs=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/media-button-other.svg b/mp-wp/wp-admin/images/media-button-other.svg
--- a/mp-wp/wp-admin/images/media-button-other.svg a798206802cbecfbe7bc07a5a0dddbf329a38a05230d8eecddde20dfced85f0e07c70bc0e584b8539e3d39d8c2a690dd7021f4c3c9a56a6ec75c328cbe131e76
+++ b/mp-wp/wp-admin/images/media-button-other.svg false
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="13px" height="12px" viewBox="0 0 13 12" enable-background="new 0 0 13 12" xml:space="preserve">  <image id="image0" width="13" height="12" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhDQAMALMKALK1t+Do7tHX3Le7vsLGyqOkpdbd4uXu9Nvi6J6fn////5mZmQAAAAAAAAAA
-AAAAACH5BAEAAAoALAAAAAANAAwAAAQ6UEkZQJjYjEMWOYOBHUuSlOeBIcXiugUiCedrl4KC1Hci
-6zybT0G7CXO6li02QjlVEw3HAxJhKJZrBAA7
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/media-button-video.svg b/mp-wp/wp-admin/images/media-button-video.svg
--- a/mp-wp/wp-admin/images/media-button-video.svg 2c9fa86b0c60099d0c114b7e436ca4a48f56835396af70bf5a7255d958e2c2f30bcff04bd02b210bdf2bea058b157c505949518cfe47a7ad4180d3fc4a7d6112
+++ b/mp-wp/wp-admin/images/media-button-video.svg false
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="13px" height="12px" viewBox="0 0 13 12" enable-background="new 0 0 13 12" xml:space="preserve">  <image id="image0" width="13" height="12" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhDQAMAIAAAP///5mZmSH5BAAAAAAALAAAAAANAAwAAAIbjI8Iy2D7GgxTVkdtjHLnniXi
-SG7QiaHhVB4FADs=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-arrows.svg b/mp-wp/wp-admin/images/menu-arrows.svg
--- a/mp-wp/wp-admin/images/menu-arrows.svg 47ba465fab1555b7acfe7c73426b53fb85ed639d314ed6dfb5754d9f9c215d0aa7469604f0060b60a267ae0a3e39b1df441b4954592921d21a49234c91ef3198
+++ b/mp-wp/wp-admin/images/menu-arrows.svg false
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="200px" height="50px" viewBox="0 0 200 50" enable-background="new 0 0 200 50" xml:space="preserve">  <image id="image0" width="200" height="50" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhyAAyALMAAJmZmfHx8ebm5tfX18TExLm5ufb29tzc3KWlpb6+vv///wAAAAAAAAAAAAAA
-AAAAACH5BAUUAAoALAAAAADIADIAAAT3UCkThA1G6s27/2AojmRpnmiqaoblWtkqz3Rt3/j07nHu
-/8CgcFOxEAiDxGXIbDqfIBehMEC8oNisFmcEHACDnXhMLpvP6LR6zW673+xp9bqt2++houCYXOL/
-gHUtZD2BhodDgzyIjI0/FC4YjpOUlZaXmJmam5ydnp+goaKjpKWmp6ipqqusra6vsLGys7S1tre4
-ubq7vL2+v8DBwsPExcbHyMnKy8zNzs/Q0dLT1CqQF4XVm4ov2dqX3IvfmUUJA0eR45kvCAMFBHDx
-8vP09fb3ZANeAPAC6pjs3PXz989SuXMDAxS0FK7bQoZjvD1sdE2AJAURAAA7
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-bits-rtl.svg b/mp-wp/wp-admin/images/menu-bits-rtl.svg
--- a/mp-wp/wp-admin/images/menu-bits-rtl.svg 732326351195a762ff6b8f7d0fb8678ef6ccbefa5b32281182bcf9593f00948a02eba81325dc3ccfcb3ba03506541df6de57e85552c59d2517f0bc3929e17fff
+++ b/mp-wp/wp-admin/images/menu-bits-rtl.svg false
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="60px" height="380px" viewBox="0 0 60 380" enable-background="new 0 0 60 380" xml:space="preserve">  <image id="image0" width="60" height="380" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhPAB8AdU3AICAgIqKinx8fG1tbZiYmIiIiPf39+Dg4FtbW+Pj43Jycnd3d////35+foOD
-g25ubnl5eXZ2dnBwcHFxcW9vb4WFhYaGhoKCgnR0dISEhHp6eomJiX9/f3Nzc8zMzPn5+dTU1O/v
-7+fn56Ghoevr6+rq6uXl5YeHh+Tk5PX19ZGRkfj4+Ozs7Pz8/PLy8uLi4vHx8fT09OHh4fv7++3t
-7fPz8+np6QdJdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAADcALAAAAAA8AHwBAAb/QIBw
-SCwaj8ikshhoOp/QqHRKrVqv2Kx2w+16v+CweEz+Fs7otHrNbrvf8Lh8TrfY7/i8fs/v+/MVgYKD
-hIWGh4iJhBmMjY6PkJGSk5SPDpeYmZqbnJ2en5oXoqOkpaanqKmqpUutrq9KHLKztLW2t7i5urUN
-vb6/wMHCw8TFwALIycrLzM3Oz9DR0tPU1RrX2Nna29zd3t/aEOLj5OXm5+jp6uUL7e7v8PHy8/T1
-8BH4+fr7/P3+/wD3YRhIsKDBgwgTKlxosIPDhxAjSpxIsaLFiAoyatzIsaPHjyBDcpxAsqTJkyhT
-qlzJ8qSElzBjypxJs6bNmzIp6NzJs6fP/59Agwrt+aCo0aNIkypdyrQp0gFQo0qdSrWq1atYs2rd
-yrUrrK9gW90YS7as2bNo06pdy7at27dw48qdS7eu3bt48+rdy7ev37+AAwseTLiw4cOIEytezLix
-48eQI0ueTLmy5cuYM2vezLmz58+gQ4seTbq06dOoU6tezbq169ewY8ueTbu27du4c+vezbutgQOb
-fwcHrll4ceKZjSdHjll5c+aXnUeHbll6deqVrWfHTll7d+6TvYcHL1l8efKRzQs2AMKD+/ceQJhV
-vx6E/fvy56MfLAK+hxBn0TdYe+5hJ6BgIbxnAFoHCnaAB9w1GBh7DKQl4YRqXaiYholxiP+Yh4eB
-aJiIhZFImImDobjefo+pOCGLjrkImIx/0eiXjX3hyJeOe/Gol495AYmXkHcRaZeRdSFJl5JzMSmX
-k3FBCZeUb1HplpW+wdgYlmxxuZaXGWrJGJgWirkYmQyauaGaHbL5oZshwjminCXSeaKdKeK54nC9
-9ennn4AGKuighA5GAAKbHZooopop2iijmTkaKaSYSVoppZdZmimmlmnaKaeVeRoqqJSJWiqpk5ma
-KqqSqdoqq5G5GiuskMlaK62AEaDrrryaZStgC/DK6wK+4gqYCsISEMBZvwKmQLJoNQvYCbwKEK2x
-ge2qQlrSAgaArgpwi222J6jV7WLnKpb/bmLrItbuYe8aFm9h8xJWr6Hjopuvuvuy26+7/8IbsLwD
-01uwvQfju+jCjzI8qcOXQrypxJ9SPKrFp2K8qsavcjyrx7eC/Ni9gpGcbcIlo3xyoSy37LJaI3AW
-82Yza5YAZzdvlrPNOPess888/yx00ERj9oEImbVAAgoAXgaDDCx88IFlKaBQQgpST00ZCSK4kLXU
-loVwAA1fXzZDCSaEADZmK5hgQwyb1fAC0JntXDfdmNmdN96X6d0335b5HTjglQleOOGUGZ444pMp
-3jjjkjkeOeSRSV455ZBZnjnmj2neOeeOeR466I2JXjrpjJmeOuqLqd4664q5HjvsicleMTvtiNme
-O+6H6d4774b5HjzwhQlfPPGEGZ/8y8w37/zzZjEg/fTUV2/99dhnr331QQAAOw==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-bits.svg b/mp-wp/wp-admin/images/menu-bits.svg
--- a/mp-wp/wp-admin/images/menu-bits.svg ebd1b41ab7899e8dc67da7cd442db5dea572403a68f3d27a1ec872db842cf2968009d4e40d5a07915281d40ffdb211882de94367cdb331802e6f9891039a1aae
+++ b/mp-wp/wp-admin/images/menu-bits.svg false
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="60px" height="380px" viewBox="0 0 60 380" enable-background="new 0 0 60 380" xml:space="preserve">  <image id="image0" width="60" height="380" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhPAB8AdU1AICAgHx8fIqKim1tbZiYmIiIiPf39+Dg4OPj43Jycnd3d////3FxcXZ2dm9v
-b3BwcHR0dG5ubnl5eYaGhn9/f4mJiXNzc35+foODg4WFhXp6eoSEhIKCgszMzPn5+dTU1O/v7+fn
-5/X19ZGRkeTk5Ovr6+rq6oeHh+Xl5ezs7OHh4enp6fv7+/j4+OLi4vPz8/Hx8fz8/PT09PLy8u3t
-7f///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAADUALAAAAAA8AHwBAAb/QIBw
-SCwaj8iksihoOp/QqHRKrVqv2Ky2wu16v+CweEz+Fs7otHrNbrvf8Lh8Tp/Y7/i8fs/v+/MZgYKD
-hIWGh4iJhBuMjY6PkJGSk5SPGJeYmZqbnJ2en5ocoqOkpaanqKmqpUutrq9KFLKztLW2t7i5urUX
-vb6/wMHCw8TFwAHIycrLzM3Oz9DR0tPU1RrX2Nna29zd3t/aEuLj5OXm5+jp6uUK7e7v8PHy8/T1
-8A34+fr7/P3+/wD3QRhIsKDBgwgTKlxo0ILDhxAjSpxIsaLFiAkyatzIsaPHjyBDcmRAsqTJkyhT
-qlzJ8uSDlzBjypxJs6bNmzId6NzJs6fP/59AgwrtGaGo0aNIkypdyrQp0gFQo0qdSrWq1atYs2rd
-yrUrrK9gW9UYS7as2bNo06pdy7at27dw48qdS7eu3bt48+rdy7ev37+AAwseTLiw4cOIEytezLix
-48eQI0ueTLmy5cuYM2vezLmz58+gQ4seTbq06dOoU6tezbq169ewY8ueTbu27du4c+ve7fiAgc2+
-gf/WHJz48MzFkR/HnJz58svNoT+3HJ369MrVsV+nnJ379sndwX+XHJ78+Mjl0T//0KG9+w4fzgeu
-/qG+/fiNq4N43yFE7+sHuPfBY9kZ4B4IBG4X4AGQdbcAfgmqJV9h6TU44X/CZWichspx6P+ch9KB
-aJ2I2pHonYnioWieiuqxaKGLEW4oY4czflhjiDeOmGOJO57YY4o/rhhki0O+WCRvSCap5JJMNunk
-k4ABQMBmUlI5pWZVYnllZllyuSVmXYL55WVhkjmmZWWieWZlabK5JmVtwvnmZHHSOadkdeJ5Z2R5
-8rknZH0C+udjZRJg6KGIMlamAogiqoCiZwrQKAEjNNbmpAlYumYAiJ7gWJwjHEromwkYCsCoap0w
-6GCBoqqllbC+KquXsdI6q5i14nqrmbnyuquavQL7q5vBEjusnMUie6ydyTK7rJ7NQvusn9FSO62g
-1WJ7LZTcdustApyBu5m4mpGbmbmYoXvHmbqWsVuZu5TBO5m8ktEbmb2Q4fuYvo7x21gIHmwGAgkl
-xJCZBx6koAIMmCHsgQgmkCCCZQ4jPEMIJVRWMQ0HIKixByCgYAILl8mwAgotZObCC+OG63LLMJf7
-sswxnzuzzTWne7POOa+7s889t/uz0EG/O7TRRcd7tNJJz7u0003X+7TUUd87tdVV53u11lnvu7XX
-Xff7tdhhN+YvY2cvlrZiayfWNmJvHxa3YXMXVre3eOet996TLeD334AHLvjghBdueOBBAAA7
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-dark-rtl.svg b/mp-wp/wp-admin/images/menu-dark-rtl.svg
--- a/mp-wp/wp-admin/images/menu-dark-rtl.svg a65d3d6eafe62904a2370315b3e8e55b40452c5aaf61d21a05b379228f662e1c1bedee6c885f328292ec31e5aefee253f6c91594f33d1c8ecd0028eaa2696661
+++ b/mp-wp/wp-admin/images/menu-dark-rtl.svg false
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="8px" height="100px" viewBox="0 0 8 100" enable-background="new 0 0 8 100" xml:space="preserve">  <image id="image0" width="8" height="100" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhCABkAPcWAKqqqvn5+fz8/OHh4bS0tM3NzcbGxubm5s/Pz9bW1vHx8cvLy9nZ2e7u7rm5
-ub+/v7q6uv7+/tra2ry8vPf39+/v7wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABYALAAAAAAIAGQA
-AAiTAC0IHGgBAMGBBg8WVLhQYcKDDwcKiGhhAIECAxtMMHAggAUKCyBICEAyAgIHDEiSFFjhAceV
-Ay0WUHBQQAKKAnE2hMhQp8+eQB0G5Sm0KNGjBH8aTTqU6VKETaE+zRmV6tSdTpFK1WqVK9atWcOC
-HdtVbFmyX8+qTctWqVe3ZttWlXsVLlq7a/HSfTtXr9++fQMCADs=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-dark.svg b/mp-wp/wp-admin/images/menu-dark.svg
--- a/mp-wp/wp-admin/images/menu-dark.svg cb973ce13105f5c481863367eacdc5c5dd896b3b456733b0da462b7f2038992190d4bfc56fc4e79aff3f794ffaedeb09954671e742a7ebebbd0f2990f497df01
+++ b/mp-wp/wp-admin/images/menu-dark.svg false
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="8px" height="100px" viewBox="0 0 8 100" enable-background="new 0 0 8 100" xml:space="preserve">  <image id="image0" width="8" height="100" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhCABkAMQWAKqqqvn5+fz8/OHh4bS0tM3NzcbGxubm5s/Pz9bW1vHx8cvLy9nZ2e7u7rm5
-ub+/v7q6uv7+/tra2ry8vPf39+/v7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEA
-ABYALAAAAAAIAGQAAAVyIGCNpCWW44mqJUu6qYBaBTGgwWFMDRn8EsiCYvn9GA5E5Kd7VEaK2u2V
-kLVmJiwsO9t6teBueDW+is9ktDnNXrtfZbha3qa/U3H8XF/n37l9gH9fe4J2h36IhomMi46EgZCD
-eY+UkoqXjZmVhZuelpQhADs=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-vs.svg b/mp-wp/wp-admin/images/menu-vs.svg
--- a/mp-wp/wp-admin/images/menu-vs.svg 8e1bda905ddff051ec9ad763085f5b6dd264072f9d139f095c50a2ed9e6afdc015d490c754c502938c27e21410c8135faa15a5be25fe14f4575f9ab05b0fc6d7
+++ b/mp-wp/wp-admin/images/menu-vs.svg false
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="330px" height="64px" viewBox="0 0 330 64" enable-background="new 0 0 330 64" xml:space="preserve">  <image id="image0" width="330" height="64" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAUoAAABACAYAAAB8xT7XAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
-AAAK8AAACvABQqw0mAAAACF0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgNC4w6iYn
-dQAAIABJREFUeJztvXd4VEUb//09u5u2qRASlpBA6EWpQQQb8ICigjQRBEEiIooKSvSxPCoCFgQU
-EaRZUEECofceepFAIHRCC+nZlO2nnznz+2OTQCAQ3F3e33u97/lc17myOWXuM6d8zz0z98wwlFJo
-aGhoaNwd3f/tE9DQ0ND4fzuaUGpoaGjUgCaUGhoaGjWgCaWGhoZGDWhCqaGhoVEDmlBqaGho1IAm
-lBoaGho1YKhphzfeeOMrnU43BAAopXcsqqpW+V3xv6qqUBRl5Zo1a77w5MTSf0l/DsBwQkhnQggI
-IVAUpXKRZRmKokCSJMiynCbLcvJrP7+2zRNbNbFuycKndx45taagoIDp0CJ+REKbJgkgZCjnZJcP
-nTBp8oOweTvy0XltZVEeJvJiL5ETwwRWSONZPrnVuB+9yvMvv/zyHIDhADoDgKqq1V7r25Y0SZKS
-58+f75PrvXPFvMkAhhGFgCgKFLn8/koyJFGCLEmQBAmSKC5///tFk72xtedEwyEAxskK7S4rFKJM
-IUoUgkgXjO5X8LYv8nO/HD9+fMCRI0eSjxw5EtSkSROpdevWQ0eMGLEeABiG8QMQMW/evHWCIJCk
-pKRu/zb9N954Y6pOpxsNIOxfHupQVXXxr7/+Ounf2rxffnnzl64AHieE5MuyfHjCXxNyHpStW5Hn
-vZ4kisowQZDCeF5ycJy0vMUPm2bVeGB14nfrMnbs2EwA1JNl4MCBmTWlX91yYtGJ5079eeqKs8jJ
-0vug8KqZ/e3d369Mf3n6C57Yu9ey8ve5T784aKCjZYsWamRkJG3YII79cVJSoSiKdO7Hb2cCCPC1
-zdsX4cCcoc69864IeeftRBIIpZSyhVnsie8nXNn63ov9vEl70aJFS81m831d5wrOnj3LJiYmLvdV
-/rYvm5N5P3a/fXOEV9c79XiDIbvSGuwtsU+hNv5XamEX0SLrPHrkzGf0pxV16f8T97JiSUtLGzBq
-1Cjliy++oAkJCbR9+/ZlHTt2LKaUAu6SXuTUqVNLx4wZQydMmHDQExtjx47N4zhOvZ9reyv5+fnq
-2LFj8x5k/heMWfChs8xZnHM+5/yUgVNe/fi5jxv5Ku2jo5G071Uc3/4yMtcNwvFlfZFEKQX/02tJ
-7Kbv81XhIqHWDKpc3EEufPlq7tbBXT4GoLtXmjV6lJRSzJpVs+BWx/79+z06jhAyvHnv5jEhdUOM
-lAKqeq99Af/wOsaOfZ+I2bwoZSTDMDsopZJHhm/j9wVzJv65LGVKWVlZ8LfTpjE8z2Pyl18G/fTn
-qsDGHR5HfnYuA/fXusQX9qqD2ze7raTovg7p/FKc7LLJWat+yGbLykhMjyHRTQe/E3N90oSRADZ6
-YaJzdHS0seKfN9OBQpf79+KHSlFSUgKe50EpRadOnWCxWGA0Go2SJHX0LmfAzhXzEgH0JAoxnTq4
-DSpRQYgCohAoMnH/lhTUa9QUrTt1BceyABAKQPTEHiF0XMeWb3cPDYuBxeoCISp4XoRL4OHiVHw2
-v46Q9GMkOEEFx1OwgrpgzQyHz73M48ePD5gzZ87q+vXr61evXo0+ffrMnTlz5gQAYBhGByBk/vz5
-s9PS0iIdDsfZ3377rf9PP/3kiamwoKAg5l47nD17FllZWYiPj0fbtm0hSRIsFkvFc/3AkCSpfkjt
-kKiQ2iFRL/33pWkL/7fwi3GPjcOCIwuyvEn38GgmKaLFEx906ploYiWqKy0pVdPW/Gb6tivj92b/
-YYNrPz3ExBhEHQQnVEHQmVq3jrl07MwQAHMBcHdL976EcvDrEz066T179nh0nKIonUNNoUZCAI4D
-ZBkoOnil2n1NTzaDyMoIDAg1KpLSDkAwAK+F8td5syd+M/PHGcYgo/6XX39jgoODERoaiuUrVjCv
-DB/GvDLyVQzu9ngkgDCGYUppuSvgazgHN8zYvl+05LDKx3+ftuXYiUv7JF42d8kpntFr5tKmvN3V
-1pv0CSFV/l+U4P5bUlKC0tIyNG7cGAEBARAEAYcPH0Z+fj4MBgNE0SOtqgJV1Z69h4+PtZjzDbXr
-1r/rfpv+WIhm7TqBd7IAEOCpPUGi3SPDG8HC2iGXi7HV5USZ3Y5H24xC45ib51BsteKL+T+MYxhm
-IqXU68zu3bt3zt9//91n9OjRW+bNm/d2XFycfv369Xi9d9e0j77/fuLMmTMrRXLBggVzjx8/PsJo
-NC79888/3wPg8NY+AFy6dAktW7bEyZMn0bFjR6SnpyMvLw/9+/fH2rVrYbPZ0KZNGwiC4Atz94Tj
-uNqndp2SOjzdwb9ll5YxiZMSp8+aOOvTl1u/nLriwgqPxZIXMezRF94y6SSqE5xOiBLRRbbpHnP+
-7LUhpTYuNDLAoIPdChAFlCigAqdzOLgQuHXDc6FUVRWcBFwqK62yvmVknRpP+vaX8H6RJLfOyTJQ
-cc+iHmt2FxuAIqmQBAKe5wEg0COjt7Bwzg8Tp0z7fkatiHD9goULmeDgYJhMJtSqVQv169fHuvUb
-MHBAf6SkHqg1qM/zE9Zu2foJwzDCgxBLl83Vq3YAF3Jx/dLso/9c2Ld6e9q2pOE9mwiCqJfzj6q2
-Uvtdb+79oCgKXC4XOI6D0WhESEgIAKCwsBAtWrRAjhCAK2agWXgg2rdvjx07dqBVq1ZeCeXOFfO6
-A2hDFNLicsbRCIHjDJbignKPUoWqEqiKilrRJsQ2aQ5JFMFxHDjWq6yCF923h1LqFkmLDvk5obCb
-G+H62SIclDMhijLMzkzccJyE3aouB+APDz3YW/nll19GPfXUU2E//PDD+BYtWmDrls1YMr0P6l67
-0OCRV9p/zTDMJABBCxcunHvixIlXg4ODl8ydO3c8ABel9B5lqvunZcuWAICOHd2FgYSEBOTkuKsG
-CSGIjIz0hZka+WbQN0l1GtT5jyRLhov/XET8Q/Fo2allnXFfjZvy7bvf4tmYZ1O3F2z3SCxdAsIM
-hkCdw2YDISqISiBIss7BIcRc5tS1EPMApxXU5oBqN0N1WWC38wDgd69070so7SJQL6SqMNrv49FR
-71Vmvge3CqWiuNeV/VO9RxnZpRkUBSAKKr6EXrXkfzN1cvJX33437PnnniX/++xzRq/Xw2QyIef0
-acyYMQPfrF+Pxo0bY3fqHrz1xhtYu2XrhEH9+jVau3HjcAAub2xXh9PqDBML03WBtQNiHu7YtEm9
-kKAmCiu82G5o66isvetc5mJrhjfpy7IMu92Op556CqtWrUJcXBz8/f1hsVgQEBCAKYdv7vv3f4ww
-m82IjY31SiipqrbpPXx85I1LpwPiW7bz45x2xhhyZ0nvxN6dqBvXEALLgmft4F2sxzYBgOVVOGkq
-rE4OBXnBsJdFokvCWJjqxlfuU1JSgmnTpu3Zu+jQGABO+KB0AgAvv/zyqDlz5qxu27atfvv27Xi1
-56NpdW9cbNCwWwMTkWnixv7t/HOefiPqxIkTI41G45I5c+b4VCT1ej0qPvgmkwlBQUEAAKPRiIED
-B2LTpk04dOgQJk+e7Atzlfz82s9BhJCPFUUZJstymqIoeXUb1x024P0BMaf2nNLJigynzYmmbZqi
-RYcWMe9Pfz/pq7e+UgF4JJQOHpALM8HaWNidHJxWOzirGXYeyCtxHrUc3G+qbYoMJqVWSDk5KLh8
-jc22uC7A3a5yV+5LKK0CsOPqtSrrezdtgmyWQ7EggKEUOkoBqkJHKeoEBSE2LMxjj7LiJVSUm0IZ
-3ql6j7JiH4WgwqP0mIkTJ86dPXv2sAH9+5FP//eZPjAwENHR0agVHoJ8HQBKQVUZ/oZAREVGYOGi
-+cybY98iazdufKF///4LAIz06gSqIaJR3XCnUg+RHbsG+J+aMd7P3++lJ17pFmkMM/qlTF2ee91s
-3elN+hUfpaYtWyIhIQHp6ekICwuDIAhgWRbNwoMx+Zd0TB6bAIfDAVmW4XA4Ko/zBFmSAdwscbgr
-zO/UA0kSIQgcBNYFmbOB99KjdPEqSu17YHEQFBY8hW5dR1cRSUIIOI6Dmb32n0GvPnudSLocgxx0
-rm/fvhAEYcvu3bvne2q7f//+62022+Cffvpptb+/vz6twJlQz9jqnHVXlql9r4YmSfEbd2bbyqDA
-Rm2X+lokK/JWHSkpKRAEAc8++yzi4+N9Za4SWZaHd+7f+e3HX3o8Ki8zL9ZqtirNOzUPCTAG6BJ6
-JyB1eSqsVquSdSGLRDeIFgKNgVGiIN69HqYG7Dz2nj28t35w7chgu4NDsdmG/GuFbKELFzKL7Osa
-bDzYPb5jc9QOCwzOycxh009kWc/buV2oodRwX0KZbQMOZNuqrG9ZB9iSb8WGfnfmaeaBKyBqmMce
-pSiKkCRAktxF63tBJAJFplApvK5bWbBgwevDBw/k3/vvJ0FBQUEwRUcgPMQPOiqjw1Nd0eGp9QAA
-VeZhYIBQYwC+mvqFHrLMb9++/SV4KZS3hwDJBhgNprbR0Z0G4PyaRSD++oDur/eKs+cUu5Z/+Xfu
-lZziP684uCPe2BRFEX5+flBVil27dlWKZVBQEFJTU5HUowe+XOQWyTVr1qB+fff9lmXZY5tS+YeQ
-KASUEndRW70zPVngIAku8KwDImcHz3r3IXRxKojibhxknbVgqtu0ynaHwwGbzYbvPv8ZcXFxANAA
-QIOysjL07dsXADwWSgAYNWrUervdPvjEiROro6Oj559tPy6xPbcV6dv2IuG5mKB+vMpf3Hew5GeA
-96VIAu4qlupo2LAhVq1aBYZhEBISAkVRPHZwqkOSJLOtxKYAQGyLWKPkJ8Fut6u1dGEQOQ7G2kZx
-05+bCq/nXT/JcuxVAzHIdsV+yVN7dg7Ljxw936dhs8YICA4Kzs0tZTOvlFjzOOyaeuzyvlqSPPrw
-rvSRVJQfLXTy5y6xYupOXtqKe9RPAvcplHeDucs2PXGv9/SCC4KQdu1MSaw+NNKo8DLAMNDpGKhE
-hUqq2qSEgi12IPviNc7KWq8B8PgBE0WxbpPI4NMRERGN6tQJRLCeAYgA9S7ZoIRHoD8DfX52gSiK
-r3pqFwDEg3OHykT/tV+zZ6LDo5uEuPLP60ovnEBM+944s+oXuuv331yXMnMd+5akWkVOOJHv4HZm
-8eIRAMVe2a0QLUIQEBCAAwcOYNrM7/HxB0kQRRHLli2DzWaDv78/GjdujKZNm6KkpOSuL9592eTL
-bcoKqEqgEgVUvTM9SeSgKgJEjoMisRA474TSwar7rmdL3Y3+OojincKsqioEQcDo916BIMogAi3Q
-S37nRFFUHA7H4WqS/NdMmDBh/aQNeXNEURwTWzfIr7TR2wjYpCJt4350HhAbpJPI8FU8IzEM8zml
-1GeKJd9SArhw4QKys7MRFxeHdm3bolGjRnDY7QgLD4ciy1C8+AjezscrP9782XOf/R3TJPrNll2a
-h8XUqYOcnByds8RCinOKlTWz1+ReKbySfMxybAkAO9xFYI/z/fkxuv+1xszow6cKRyoyHi3jca5A
-RGqfd5OuL+zf/9OgoKB+LpeLsVgsuroOR7sWPN+utyA0cjqdywDctRqrRqG8l9jp7iKUunJl8dSj
-FAQh+dAfm7o0eerJGD+/EGNgRBD8gwMguUQIdh6qTCorFBgA+VeucZv//rWg0Fm4E4A3bqUQZNCT
-+vXrI9CPBeF4UAL8Pn029m3choCgQDwzuB+GvPW6O3+KCEZVAEkm8CJEqLoQIIs5P6ZBr5EBRxdO
-w+FNm+3LUk99pAfO6oHS8jxycNeJevxUMwwTOmbMmNOHDh1q4HK5Ais8clEUYLVaERkZeUcFP8/z
-uHLliovjuHOe2hU4HqoqQZZFqKoIQkSo5M66dFkUQIhUWcyvEFhPcbLqgmUbHYanOgY94XLd+ZhQ
-SiFJEvSccc+hHTu+A1AE9zWW4IMGHQD4bG32LEEQxiQOahHa2AAcyqIofvwthG0Hjq7aj65DGpoU
-EYnL2PbwmVhSClmSUFBUhBiTCcdPnMBbb72FefPmIaZePRQVF6NZkya4cu0aoiIjfSqUAGB1Wlcu
-mvJ78IgPXx7RvlvbsJiY+igxF+uLcorZnKKcY8dKji0BkOdtdMHmzZtbAug/cPaG51iWZSwWS4nL
-5TKJoji8bt26JCIiomN0dHSIJElo0qQJKKUQRREZGRlj9+zZo4M3QlkhdmMTEu7YplNVcNKdYljh
-UXoqlGMWjNk2bci0pKKUFSMpoe0kScLI2V83Z8t4nDt8uOzk3h1l5T1yIMsynILzmpkz78ywZ6wB
-4HGNP6VUnjept39RyWKEBrdEhF9zAMDBbbvw0XtJSE9Px+ljJyqFsgJJEIEaXPd7UV0IUN1aoU0u
-p38xPiKhV4DdKbA6IEMPnD7hoxhRAPht8eKD2dk57Rb/tQRWSxkWLlx4TZZliERtMmPGjGs6nY5U
-9ICq6B1FCIEgCOecTucWT+3yLA9VESCLPFRFBJEFqMT/jv1kSQJVFcjl3p/kZUjSzx9ZVg5ICtOn
-7HDqGwWxXW/fbjAYEBUVBUEQhEcfffR9QRAgCAJEUYQoilvgZdH7k1XXZwmCMGbsy61DGzLA4RsU
-gXoVG45mCBl5YfJ/TpOcIDE3qv3IhiYiIvEPH4klKe9hFV2nDhRFQVh5ZENYSAiys7PRsmVLKIqC
-Rg0bwmaz+bTozTCMX2Jiouqv+A/9+5cV+YqioGOP9mHhERGoFR1ugIJwAHZfhGAB6J+QkPB+vXr1
-TLdvOHLkiJKZmWkIDQ2FLMuoCFBxOp1gGCasuLi4L4AP7pbwfXuUv6SnV1k/NiEBelUFK915USs8
-TU+FEgA+XfnpJoZhdgAITuqW9I+/P8A5OfXM4X3WLZe3JBWyhRdx8yuvwu1lsd4Em+/ez0xu0b1D
-TInjOA6eWoEQvwT0fWwiQsNDK/eJiKx1x3Gy6J123S0EKDAs7KVOPR6OO5sCqwEo86VIAsD+gwfb
-ZWXdQEF+HoL8/fPXrl3bB0Bgj6efydi7e/eLcHuv1aEC8LgczLMcSIVQqjL0Bh1rKysNdj+77p4Q
-oBSF2Xn06oXLyu61W5WNyWtLBKLug5ee3fpZjuUMw6weN672FgBP37qtwsNYunTp8+V1lACAsrIy
-NG3aFPBCKD9cfnmWIAhjXh7cNjQWwNZMwKhXcaVUQfqZc3LagjG9jwK5TfLaTVAljOw4pqFJkZD4
-ywbfiGVU3bqVrd7NmjXD8BEjkLJqFcrKyhATE1O5vp+7LtYnMAyjBxAWGRm5/PTp05GKU8HsT35e
-9uakMa+0e+LhsJjGMUZGYZrDXTD0Go7jnq1OJAVBQEREhCElJQUmkwkMw1QKpd1uR0lJCfLz8++Z
-tld1lLq7fHl8IZQAUC560jtd3oHDAZw7dMh6tSBzVyFbeA5APqXU84qyajBbMGz4wPcNZqsdvFwX
-f6xZja4tExESEQ4ASE9PR5ueXeBy9xABISoYhvGqBRhwhwDpnOd0toIiwrl48/jB3ZoorPDiI0Of
-iLSf2+9yWhwn4KMwlVvhWe501rVr7WwWC7p373bx/PnzLAC4XC4AKKSUelX/eVe7LtZd9JYEUEoQ
-FBxoCzQG2FVV1VF686UxBAYo9Zs2LhZlOS9dViYDKIQ7ZMcrKKXy6NGjT964caNjfHx8pCiKUBQF
-qqpClmX07t17a7kXWd6wKEGSJK/qKFmWHfPMCx1Co1WKFWcYhPsRnC5SsHblX05bUdZ2ADcAFI/O
-Ov3p4nUMUUQkPjKugYkISJy7rr0TwLfe2C8xmyt/b9y4EYIgYGD//qgfG4vOjzxSuc1ms1V3+L+G
-YRgGQPDUqVPX7tmzpzml9LJ/mP8wLofTz/54rvTk848PCQkPNlgF6wGfGARgtVorfzscjkoxtNls
-KCkpgdlsRm5uLvz8blbzSJIElmVhvuX6VIdXdZRxYWFI/ucKdKoKhqrQqRQMVfFwgzq4KHovlBXw
-PO9wlDjUU/t3Ws+VnlsHwOprkQSAvBJczLh0sRkrgrmakwPeFYkb2bkILRfKhIQE+EeEwWx2V0cy
-DAOpfPAGb3CUOdLsZltsfKcm0e1zzDNUleo7D+wWdVsIkHexMdWwemXKk3D3dAl+rk+fTR0SOuWe
-yshAZuYloIa4Mm+oCBwPiQjPOrJtV6PKIHOiQiXEPbgKUbFk+hxx4ZQZWQJRjwPIoZTafXUOLMtu
-GT9+vGHatGmJERERkZIkVQ4IwnEcsrOz/4eqHrVXnqzT6USsjuJAFgOjnuBaiYKVyb877UU3dt7Y
-OvMTAJYKr5FhmM8XrgZUkSZ2GFU3+uzqksHwQig5jqsSEVKvXj38uXgxKFDZ6+pWdHq9p6ZuJXDq
-1KnvpqamPhUbG3tg2bJlgwA4KKUywzCn7KvsxyRFir8sXd4E79oVKikpcb+X+fn5FR97AO4GS5Zl
-UVrq7pJrNFb22AWlFDqdDmVlZfdM+76Fsro6yqYmE4A7PF1cFG+ehC8QBGH50fXrG+YVZ68t4osu
-4wGIBgBkm7H8m1lzWpe4SEN7sV7Rlxq56TuT7HqikvT9hyFLMhRZwV8z5rnr7RQCVSFwEbIPXrxI
-9lJ78v6/9nbpOvTxmEGfDWkq8ZJ6Lf3K7SFAPg9mp5Q6ATgZhlGPHT/eprIYHhCQCy8aiWqivCsi
-WnZol6EoyhleEPwUWbnj7eTGf2RJl5UUABb4+J6npKQc7NGjh/6NN97Qy7Lc/Nb6SI7jTsJdYrlb
-1cO/xul0/rZi96W327ZsEVDgUJG8ZJHTYb6xM3fHjx+V26p8fiilhGGYz+esau88s6J4cLEqbvfQ
-rMNaVhZSUlrKiLeIYUxMDMLCw+FyOhEYGFhFJMo/FhRedpscNWpUn927d39iMBgWLFu2bB2ApgBY
-hmEcAJzH2GPry3el8NGzZjabYTabUVxcXKVDhKqq0Ol0uHjxIsdxXJEkSYrD4YDL5QLLsuB5HrIs
-77tX2kxNYta7d++vAAypGELt1mHUqvt727IyPT3do2HWbmVQw0H+vMQnHik9st2hOKzlL/gDoXx4
-qzoAasFdd+ICUJP3KgJwelMhveDpR/oJLD9SEcS2nJPnrE4u47YQIOHEA+pPzjBM6OAhQw8ePXq0
-nc1iQY8e3bdv3rx5EKXUu3icu/Bmj67dJUFsUz50mnsoNVGCLMnlHyMZRFHgVMiN86qaSil9IB9G
-oPJ+h8Dd9bWiV5fX9/N2en6UEsU67ZNEmYwSBAHO4pzt+btmf4LbRPK2c9OXn5fBE2/6/+Ywa716
-9bpy+fLlnbm5uf/A/aGzwy2+TrjfKQ6A4MsQqJdeeul9p9PZv0IEbxVCQRAgy/JJAItQfYOveK8P
-Y41CqaGhofH/d7QRzjU0NDRqQBNKDQ0NjRrQhFJDQ0OjBjSh1NDQ0KgBTSg1NDQ0akATSg0NDY0a
-0IRSQ0NDowY0odTQ0NCoAU0oNTQ0NGpAE0oNDQ2NGtCEUkNDQ6MGNKHU0NDQqAFNKDU0NDRqQBNK
-DQ0NjRrQhFJDQ0OjBmoc4bzZlJVfMXrDEAAApaBUBVVVoPwvVVVAJeW/yc2FqFBlcWX+gg89Grj3
-hz0XngMwXFXVzoQQkPJh+omiQCEESvnMcoqiQJblNFlRkn99a8A2T2zVxKi/9j4dFahbY3ZwTGFe
-zoheXTonqMBQjueXfz3osckPwubtbDuX11aUpWGiKPXiRTGMF8Q0jueTPxjQzas8V1xnAJ0B94j2
-iqJAdl9XyLJcMWeMew4ZSYIkimmCKCZvmDTWJ9f7hz0XJgMYVjHLY+V9vfMclv/29qDJXtoaAmAc
-IaT7bTYWTB/a7W1f5Od+WXgqe8CpMxdWZpw559c6voHcsn70kI8H9VgPVA4oHPHaikPrCC+QvxJ7
-dvu36Vd5d/8llCgrr3w5xOtBt+9G86/XdgXwOFVJPiXk8NUpL+c8KFu38t3OM0myJA0TRTFMEEUH
-z/PL573eZ1ZNx9UolIzeMCRvV0pzT06qVqtOQwD864v9w54LzwUadHMGtmsQExN+ywQXd+G62RI7
-c/3+Li9981vSqs/GbPLkXO/GiMWpT/tDWXMq2x5icfGMQReUfPXadcf8sS+YJvy5fRjDMNN8ORJ2
-dWw+kz2UquTrDnGR0fUiQkL8DXpdfpk99q/dx7q8Myf5g3kThm/0Ivnhwzs1GlQvLKjG61zB/ovZ
-sV/9scYAwCdCSSkd9mHPh2p8xl6ZlezV9f5hz4UhlNJx3do37B5iMLonE5MkZBUUYd+ZK+MYhpn4
-oO9lBQtPZQ/4M3nNutD6jeG4fhH7Tx3220uUdR8P6sEwDKMDEPbkb3svHjifHdlGyT8E9PzXNhi9
-Ycjlzwf963c3x8qi17wdHr279wul6uMHJjz/UbbFWfLy3HXT496ZdTB3XlKWL9Leei43SRDFYZwg
-hnEc73Bx/PKk/k/OmrY9I6l5VOgHfds+ZArw0+tcoqT+uPGQaeDURX7rv3xrJqX0rpN81SiUoBTT
-33nVoxP+dtdpj45TVXX4wLbx9yWSANAgKsL48lMdY2albB3JMMwOb6asvZXJG/+Z6HA6plhLzMEf
-9WjN8DyHWalngzKU2oEb0s6hID+PgXuY/RJf2KuO9aeut6WEfN2jdVyckxPlv/elZ5c5XOSZ9i2i
-h3XrGPPF4rUjAXgjlJ1vFcndmUWVG1qZwpFnZeEQJFzJOIHvTxbjn08Gg4PBKEhSRy9sAgB+2HMh
-EUBPQohp05lsqEQFUctLDwqBQtyeZXNTbTzWsiF4ngeAUHg4P5GqquOe6xjfPTgkBDYLC5UQ8AIP
-TpDB8zxe/SlFeHnmUtwyA+OC1BlJPvcyF57KHvDH0pR1ITGNcXXDH+jdNWHuwm8XTwCAcpEMeTt5
-z+ztp69H1ss9fnZ98sL++Pa/vj4NAMCmc7lIyy5B5wZ18EKbBuAkBeeLfDMT472gsly/Xrgxql64
-MWph4tPTRs9J+aLea5NR+Mdkr8Ry0+nspOgQ/w86toox+en1Ok6S1aV7Tpje+WmpX+1ONLlEAAAW
-T0lEQVS4xoP7tH3YFOCn1wEAL6u6rm1axBw6dW4IgLm4x7xMNQolVQmGP//vv2YA8M229Jp3qgZF
-UTrHRFQVySNZ1WvRY42iwIoKjMHBRpmo7QAEwwdTu07acHTi7nM3ZtCi6/rvh/dkjIEBCA2NwYIG
-scy7yfuYL7dmII6KkQDCGIYppQ9oTg0Xxw97rGlMtJ0V5IWb9285m3l1nyhJ5oKikhk/vj20qZNl
-23qTvqJUnQ6oVwv3ZHF5Vg75VhZt60cgyM+Axxo9h3ot8nDG7IJTUCpEyysopT0/7PlQbJ7VZYit
-FXLX/RZsO4JHmsSA4zjAPWukR0iy3D26dgiKLe55eRRFho0VUOZk0b19KzSqW7ty3xI7i+9+X+Yz
-L/P7w5fnrN26c/yL/Z6fm7JsxfjQuGa4tukvdHq0S9qiaZ9PXPjtpJsiuWLv3B1nckZ0lrKWrkhe
-+B68nOirgn3Xy9C9cSR2ZxaiV4t62HWpEGk3SvBV3474YtNxqKKAhKb14RQe2LxylRBJqJ2Sdkka
-2rmlf+82jWMWvTVw+uvfL/60zktJqaWrZnkslizHDev4UKzJT+8WQ1YiuqaNGsQcPnVuiMFuDw30
-M1S2y8hEBaeoOhfLhsCtG94IpQpRUZBTVnU+rwaRoTWetKp4dsFl5c65vB5rFHXX/RWVQlRIxcxr
-gR4ZvYXP1x2ZuP3M9RmGwkz9jBHPMsbAAJhMJtSqVQuUUvw+xogxf+xElhJSq8+H307Y8v3/PmEY
-RngQYul0sb1qh4aELE39JzvjQua+/Wnp2/r16t5EViR9mVNQrXaHVxNvybIMl8sFjuNgNBoREuIW
-rGslDjwSXwdmO4sbpQ7E1wnDf1rWx6L95xBft7ZXQvnDngvdAbQhhLQ4dLUoghUlQ77VVTl5HVHd
-09bWiwhBi/pRkCQZHMd5Lc5S+cx8lFIoigwrL6HQKUCAAZeKrDibWwxZllFYWIir16/DZS1bDsAf
-Xk5VCwApKavG13vkSSz79dfxtVt1wrXNS/DH91Ox5ZqjQYN3f/yaYZhJAILeXrF37o7zBa92lm8s
-Wf7j1+MBuO5VJPw3dG8cCQDo1aIeAODplvVw4Eo+APd73jTowQskAMR/9FvSQ6aI/6iSZNh3/gYe
-aRqH/7RpXmfhhJFTXp82DxHPj0m1bf3NI7F0uNgwP4O+ihiysqqzOpwhjKGkcr2dV2DjFLh4pWJq
-W7/q0qugZqEkBJykoE5oUJX1nFTztNqUeDb1tizd6RDey6OsQHC/CF615H+16Z/k1cczh7U32MiH
-Y/ozer0eJpMJxwtd+HLhbuz7ZAgaxdXHinF98WFyKo7mBE4YPuPPRskfJQ7HA5hS1uZwhl3IL9X5
-BwbGdWr7UF+jMegyLwgvDnyhZ9T+05dcJRZbhjfpi5IEu92OV5YewpwX2qNBw4bw9/dHkYOD0d+A
-n3adqtz3x2HdcaPUjnq1I8ALnk/FTClt82HPhyJP5ZQEdGgQ5WfnRCbceKejuONUJhpH14IgieBF
-yWuhFEUR151AmZVFmcUJVlLQ56FYNKgVXLlPjpXFzHX7rqfNn9QL7hkDfVKN80q/5wf+/uuv62o/
-3AXXNi9Bp66Pp+3IZht83PcxEyEkcRX/tf8LPbpE7ThfMPJR8fqS5Jlf+lQkGb0BuqBQ6KPioI9u
-ACbQneeIFu3x1Qud8MeedMzd4MD5WeN9Ya6SppNTgqhKPqaEDKNESaNEyWsfGznsh5d7xGw9dVmn
-VyXsZTl0atEYXVs3i5n//uikN7+dqwLwSChtzpsO3a1iaLU7wFBy9ExWgalRXExwsUvE9TInLlzP
-Zq3m/AuoYR77+/AoFbCijLTrRVXWd25sAi+r4GUFqkqhqgSEqCBEgdHfD7XDgj32KCX55nGK6j7/
-zg3rVLuvolIoKgVRaZW5fD3hq41H5y7ef3rYI4FO8sEL3fWBgYGIjo5GWEQtMMV8pT19QABq14nC
-9GE9mQ8XbyCp/6S/MOKLmQsAjPTqBKohslZEuCyLePHR1oZvkrOeDdLrHh7V//nIiJAQv8/nL8kt
-s9p2epN+xXzPrMOGAX8ewJa3n0dYeAREWYGDlxBfJwyffj0d0z7/GGUuAURVIcoEohdCKZffX0Lc
-GkApdT+l9Pb9FAiiCEGQIBPqlTgDgCAIuF4qw2ZxgXPyGNKhYRWRVFQVDkGGzeFs/NL0v64TRbGp
-qlr8/BfzIIri8tQZSZM9tf1+rw7reeuAgb8uWLBOpQBfkJVwMjDq3DRBqPtp/24mqpJxq7bvCXrK
-5Lc0+fspPhVJ4O5Oy2fr/4EgCEjs1h59TL6yVsXu8PHdHnr7/V7to05lm2PzLA6lR+uGISEB/rpB
-nVpgye6jsJUWKxez80njOmFCmJ8uihC5vqf2rHbH3szcovox9UyVYpiZlcMWF+ZdkG0B6/7em9a9
-W9tWiKgVGXzmynX22Il0qz332i7UUGq4D49Sgdnuwtm84irrG0aGoMAhIPGxVnccs/JQBmRKPfYo
-pVs8Skm5d2lWVAgEWYVC4LVQLkk99nqrQJn/sH+3oKCgINQxmWAMiYAKHXq2ikfPz+JvnpPOD0HB
-Yfigz2N6W3EBv3P/4ZeAD70SyttDgGRFCW8cFRbdrXU8Vu47gQAd9G8P7hOXX1Lm+t+8P3Nzisx/
-ujjuiDc2eUGAn58fiN4fSwd1RM8pi5E6+XVEB/tj6dFLGPlYa7y3PwWlTh7Ttx3Hw7FuD16sxuu/
-XyruLyGkvLjt/nu7UIqSDFGSIYgiREWF4KVQ8oIAQtyhbJIso0HtqvWipS4RRU4en778LFqbIgAg
-AkBEvp3DS5//OAzAZG/sf/rSM+sFS8nAjPTjq021I+Yb4+snRgTqmW/XptL/DeoZpEoCn7L7UAkA
-3pciCdx0OG7nkYZRmLIlHZHEiZDQ2Eqnw1eoimwutDkVAOjQsK5R1fmhxCmoOsYA3uVEHT9GXHTs
-UmFZ9qaTROSvMn7+MrGWXPLUnsXuWL76YHqfR1o1R3BYreDz126wJ06etJbeuLzrSsbBfUpQ2Oit
-ew+OlAh91GUpOefKv57qPHdkK+5RPwnch1CqRIEiK1BJ1fumyAoksfqXRRJFKLICWk1d4/0gimLa
-ZbMltlZwiJGTFDAMAz3DQFHVO244USkKbCzOXsvhWFvZNQAeP2BX50ysy46adDoiIqJRRJ060PuH
-QFYBqNUnKRMKg38gjl83F9gPrPcsNKCc20OAjl3J07Ecj17tmuHvXUfpHxt2uLKuXXWt3bm3TFDU
-Ey6O3ymI4hEAxTUmfg8qirMydECAEas+eBnvphzAzBefhDXEiMkbj6HI5oLR3w9dmsagc+P6OJNv
-qfQKPUGsFEoFqqpCIaTSu6yynyxDIhSiJENR4bVQcjy/rygvp3uAQV9ZX3krhFJwkoL/zk+GKIpQ
-ZNmpqqpZlGXVZSnxSSjUlDdfWf/f5TFzJEkaUy860q9d41jsOXaK+SplO/1i6LNBVFWHp6gfSgzD
-fE4pJb6wCVR1OLZeyEN6bgkS4urg+YcaoWtcJOwOO8LDwuFQAIX4TiizpiVujpsw5+8ODeq+2euh
-xmHxkeE4X2DRmS1Okp9foHy7+XBu2ZWzya5jW5YAsMP9ufQ434veH7m/5zuTRm9KPThSIOqj9tLi
-c9bca6ndHn/8euepMz8NMAb341mWYZ1OHc+x7WSFtJOUCY0EUVoG4K7VWDV7lOXBv+ptYqEoyl09
-OFGS3Md46FGKopg8a93+Ln0ebR8TEBhkrB0cgLBAPzh4CRZOgkxIpfPBALh0I4/7a826AmdB9k4A
-3rxNgi4gmNSvXx8IDATHq1BVitnL1mLb0RMwBgaif/euSOz7NABAVlWoYAC9nsCLEKHqQoBuFJXE
-vf38E4Y/th/CXxt3uo6dzPgIer8MxiWWQqcT4P4CugB4rFgMw4T2/2z26SPnrzRwcUKg2eUWMF6h
-uFFiQ93IOhiQ0LLKMaUuAZevXnXJTts5T+0KggBFpZAUAlkhkMs7EdyOKCmQCa0UZW+8WADgeX7B
-/j27DK1aP/yEnmHu2E4phSATEEW+njoj6S0ARXBfYwmAiOVzvLIPAB/8vXuWKEljRg54LrR1iIo9
-mflo26IxDp08x0z+eyOdPKKfSVXkxBXSu/CVWKoAREVFWp4NnWMjsOlsNv4a+SReXbIPneuF4kwJ
-j8cb18fh62Y0igyFUs1HyxsUR9nKifOTg6clDhjxbIeWYS2iw5BTatNnl9hYS17WsXKRzPM2umB3
-ZlFbAMM+efetQS4Xy9jsNp3L5Wonyko7mfEr69i8/kONY2ODpfL2FUopREHA4bOZY3cePKqDV0JJ
-FBBC8HTLqtUGhBAIoghOuvOiSpLkLuJ4KJS/v/PithenLkr6bcP2kSqYdrIsY8Wk8c3L2DLsT88o
-23HonzJZlit65UB02q6x5tydZcd3rwHAemQUAKVU7vT57/5nCu2IDJdRK8hdf7X7eAZeefU1HLlR
-jFNXLiDxtuNU90vucetzdSFAtcLD+r4ze8mzDSPD9E6r1QW9XwZjMJzk9qf4pHEBAOZs++fgVQvX
-7rvD2eDysvDdH7nXJFGEvlHbJh9///M1ovcjsixDkivCadyCpnLOc6q9ZIundgVBgKRQtxAqBJKs
-QlaqPkcM445+IPRmnabkpVCu/vS1lT2SpusPHzqgb9Ombdfbt/vr9YiLMEIQJaXLO1/9LJb3RpIk
-CZIsL4eXRe/3l+ycJYrimNeHvBDaIkjF3swCGA16LEs9xOUXFpIcc2m2QYfoL0f0N1FFTkyWRJ+I
-pQJ30btjTDgUlSIq2N1wFh0cgJycXDzaqjUUleLR+GgU2DmfFr0ZhvHr995naoHp4aGz1+7Mp0RB
-746tw+qGBMIUEWqAzi8cgN1Hgf7DHjKFvV0v3Bh260oVwLaTVxoVFhToYiKj3M9ReYCKzcWCGgLC
-HCzXF8AHd0u45qJ3eYPMjot5Vdb3bhULSZLASnfew4oHmqqeCSUArJn05iaGYXYACO72wcx/jAGA
-kxfU/cfSrZmb/kpyFdy4iJsVsCrcniTrTbD51M0nJr/0eNuYbCuHXacyER3sj4FPdEKtsJuhUCHV
-xMB7k0/griFAlyPDjA8n9u0Zd+TspTJGpyv1pUgCwM7MgnZXzDZYLl9ALb4s//jKP/oACHz48z8z
-rq5d+CKA0rscqgLwuAmaFwR3naMkuxvHdDrWbHUEAxSUAhQUDIDsQjM9ezVYWZ16UFm2YXOJIgr7
-4GWozt5ZHy9nGGb1w/PXXgTQpEqmKAUrE8z/7xvNy+soAQD5dg4JI97zqo5y/B/bZomiOGbgC31C
-mwYQrDmZhfAAA84WWpCTX0COzfviPwAK/ub49ylRRk5OHGxSiZK4zEdiGR0eVNnqHdljML4f1BnL
-tqTi54z90NeNhyG6AQzxbbBnbA9vzFSBYRg9gDCl1ePLSy9nR+oLs/HBnMXLxLHDXun+UJOwpqba
-Rqo3NIe7YOg1HC8MqhduCgPcD2iF3Jc5RVD/IN2BU0dgjKgLhmEqGxCtTh7ZJQ5YbfcOsr8vj/Ju
-3O0LXxEHSaspTv0bykVP6vru13DxKvYez7DmX72wy1Vw4xyAfEqpdwp1G3a7fdh7w3saSs0cwOiw
-fMNmdGvdCLXC3R+obX8twJsvDwLLuqOACCHui+5lPm0OZ5isQldYaiEsL5if6/5EE14QXnzjhZ6R
-VwtLXXZOOFFe3PYpkrX0dPGp9HZcfjYe6dD84uVyb9zFCQBQSCn1qv7zbvA87y56yzIIBYICA2yB
-/n52SqmOUsoAbo8yQK9Xmpgii2WBy3MdWjcZQCHcITteQSmVR85ecfRKQUm9ZjFRRl5WICkqCHVX
-Bwz9dPrliv7tUkVfc6fdqzpKjuPGPNnzmdCGATJ+P3IDdYx+SM8uxo4d25wOc/52ALkAiq2bF326
-RJYJVZTEKaOHmogiJybLghPAt97YL7bf/K59t+04BEHA8Ge7o+crT+GRR2861wV2r8JyK2EYhgEQ
-PPqvHWt3p51vXifv1OVwyTqslETqP573l9Tv8U5DIoyBBmIrOeATgwCsDndcPgXgFEilGJayIkpd
-AgpKrMjMzocu8GakgyApsLgE2O32e6Z93x5ldUQYA7HhwFFUFIMrlrZNG4Kj7iBWXyCKosNsdag7
-Dh21Fp8+sg6A1dciCQAWi+Xi6bM5zSRFZa7nm0F5F3Kyb6B2uVA+N2ocghkris1mAADDMJAkyRdC
-mZZXUhb7nw6towuKS2YwlOqHP/NU1G0hQL55gm9h55SxT8Ld0yW4x5SPNjV5pn9uWlYRss6eAWqI
-K/OGigakiGBj1s70i43ILS3f7oUCVMWclRvFmX/8naUI/HEAOZTSez/N/+4ckt9fkGKYMmpAv5DQ
-UCMvE6jUHWrGCwKurZg9BFU9aq88WZbj0CSYYse5XIT663G1yIatWzc7Heb8ndc2Lv4EgK28wwJh
-GObzP2URiiwlThjaPzp5y67B8EIoORFwCDedmpamCPx37TGEy07oAkxVtgHALfHa3hA47pc17245
-dvapDmrhgQ0blg4C4KCUygzDnFrnsh1TZSlePH9kE7xrV6ik1GIFANhFoMx1M0mZUAAMyiwWFJfZ
-4Bdy04GllELHMBVB53flvhpzAHdR+3bi61XfW4Yrf8Wo6ptGO1GSli/dvq9hce6NtVzhjct4AKIB
-AKVlZcu/WrSkNcuxDW1Wq8K5nNyB89ft8PMndPdhUEKwU1Xx0/L1N0dOoipU1r4PXrxIVrsjef7a
-7V3G9O0ZM/OdUU05QVTTzmfeHgLk82B2SqkTgJNhGHV/jq3NzWK4JbfYi0aimijvioj2zeIzFEU5
-Iwi8nyzL+lv30TGAzLosroNrUwBY4ON7vvrT17Z1n/idfsLsP/QyUdtJFSMjSRI4S/E+uEssd6t6
-+NewLPvb2n1p7zSPj/UvsLLYuGm902HO33ljy18flduqfH4opYRhmM+XyKJz6aYdg1Xeud1Tuy4C
-XC2ywCHevJ1N6kaiXrA/WKcTijEU2Zabj5aqUhh03peEB7z3eZ+dh9M/iSu9uGDDlnXrADQFwDIM
-4wDgZA+uWV++K4WPnjVzqaXa/FbkKa+gQNq/Z1ceMfgrPM+7w87K66AVp3XfvdKu2aOUhZVvzF46
-5Obwae6/VYdWqxhuTQWlFUOwUYCSld5nHxBF8ee/129xFR/buR0PyJsEgE2T30phGGYtgDoAasFd
-d+KCuz78nqcIL4qEvyS9uu2ZD7774MM5v4/kRbEtxwmci+MybgsBepD9y+Rbi+GdO7Y8f9kH3fbu
-Bs/zZ/v899s2Uvnwabc2GMm3Dp8nsDcAmCmlD+TDuO/HTzaX14OHwN31tcKV8up+VgfLsvP/OXrY
-/8Ah9VVRFOEsKdyes3XJJ7hNJCsoF8vpAH7C/QxeUw2UKCs7Tlvr8TBrnhxXQXaxdRr/z46lh7Ou
-/gN3N1A/uK+vHu786AAIvgyBKiotXT7iy9nDnC4WTpYDy/FgeR6cIEAUJYj2sgNFm3fMRPUNvvd8
-3pkHNJaDhoaGxv9n0EY419DQ0KgBTSg1NDQ0akATSg0NDY0a0IRSQ0NDowY0odTQ0NCoAU0oNTQ0
-NGpAE0oNDQ2NGvg/3gutUazaUF4AAAAASUVORK5CYII=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/menu.svg b/mp-wp/wp-admin/images/menu.svg
--- a/mp-wp/wp-admin/images/menu.svg a2a3e8015a9dd35529149429fa86c78ad043d8e0803f4c40e8a96d3ec75d06cfcb58992f2f527572c635b139a7732d50550bcdacabef0b8229cbc101aaf392f7
+++ b/mp-wp/wp-admin/images/menu.svg false
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="360px" height="64px" viewBox="0 0 360 64" enable-background="new 0 0 360 64" xml:space="preserve">  <image id="image0" width="360" height="64" x="0" y="0"
-    xlink:href="data:image/png;base64,
-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
-IaOU8P8CDACN7P1wVHsi9QAAAABJRU5ErkJggg==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/no.svg b/mp-wp/wp-admin/images/no.svg
--- a/mp-wp/wp-admin/images/no.svg 08a4d1623ce5d7d96c41fbfb3d74a9589bb08c55b3bd3bf986f1339b12ef4337e7fd940bee6e19050f7e3a4fb9075a9905f722311565458bd687cbcd83205d3c
+++ b/mp-wp/wp-admin/images/no.svg false
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">  <image id="image0" width="16" height="16" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC30lEQVQ4jaWRz2+TBRzGP9+3P9du
-a2nXdp0zS4GNlSnDTTcxkIHGUUOMhoOKB+PNPwBP/hM6Y+KFExCIUUY0HPRgRESSiT+GEPYLyUaa
-dV23tuv2tn3bvu/XAz1490mew3N4njzJR1SV/yMxxIejFnFgJhz56NlKcXnT4ScBsoAf6AS8wAt+
-45U7nq7R87s7X+YBbyCIgBto4YPR+mp+nsW/uJrJeL3QXG8PBAADOHfxsuq+OME3pydqcNfV0YEB
-LYCXPx+fnCdfguQhxk9NNSyg2bYFTEy/oRw5jjxzgJnXMr8BJ2zbRoD91je//ONdXYIb17GDEVwv
-vcjC9Qtcu3df/MDrY5M6mnmHxoN7eGnBUJr72S2OfP3FiAC4w73V+VR/x8jSMoVmHXwBYj1RSm+9
-TT2XIzk3R6FSgapJzOthLRwmtbGNYgkA+5IpgAePI1Gtg94E/Rm0PJjWQjKpt0Bvg1ZBF0GBta5g
-FPx+BKCjf5BadoUYzM12dU6Ud/fYAFxtVC6gBxDDxYeO/XATRnyhBFajgqxNnuTXuZvsASuAZzD9
-faZWPb2QXcP+D+/nYgm+c3tuSy57YpinN5LdEYwN22YLKAEmcHK3fNoy9ygBNaABlIGKVWfa5Tpu
-tnMR2ALcdceh2i5/EO9TK7/OisIhINa+nwOKlR0OmlXejyf0x828AFgoRtNuUQf3VDCoRiHHnsJh
-njowNo7/2DGeB1JA0W7SWSwxFQ1pDQItRzGajUb0k08/a3abJiVVBtrlP8Jhth49nF1fmL90NxLi
-KNAPFFoNQts7fHz2XbOpTh93zrzHrZ5u/Rv0EagFeiUe06zPvfxDKMCNcIBVj+vPK4lebYE+Bl3q
-DurvyV6dEcFwUFREtoEDw2muDQ/zaqHwxIYhB0FFsGFsqphf/CqeIJXoo1wxccQQxMBQBBvBBpkd
-2s+56VPYyoCjirZxOQq2o+mzQwN8mz6IA6IiOCL8C2ZiPnhZ5r4bAAAAAElFTkSuQmCC
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/required.svg b/mp-wp/wp-admin/images/required.svg
--- a/mp-wp/wp-admin/images/required.svg ee66eeb74965a182755e4a7d7123598f17dd1dfc1669f3c2d8151361c13f77d8a2a18cec3cd8d265b72e2cdaf0cb65c16f3e4fd406c4438287ed10b0112d462b
+++ b/mp-wp/wp-admin/images/required.svg false
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">  <image id="image0" width="16" height="16" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhEAAQAIAAAP8AAP///yH5BAUUAAEALAAAAAAQABAAAAIVjI+py+0HwAuxSmdnfnv6D4bi
-SCYFADs=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/screen-options-left.svg b/mp-wp/wp-admin/images/screen-options-left.svg
--- a/mp-wp/wp-admin/images/screen-options-left.svg 6ab564a84c795a2263abf5b962d0f16a315d44bf390808db960e915f445f532d66af8876015408f4791a9334f9b2aa52dc5dbc1751907a0bd227fdff661c52d3
+++ b/mp-wp/wp-admin/images/screen-options-left.svg false
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="250px" height="23px" viewBox="0 0 250 23" enable-background="new 0 0 250 23" xml:space="preserve">  <image id="image0" width="250" height="23" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlh+gAXAMQAANbW1uPj49ra2uDg4NTU1P7+/uTk5OHh4d7e3tvb2+Xl5dXV1eLi4t/f39zc
-3NnZ2ebm5ujo6NjY2NfX19PT0+fn5wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAA
-AAAALAAAAAD6ABcAAAX/YCSOZGmeaKqubOu+cCzPdD1XeK7vfO//wKBwSCwaj8ikcslsOp/QqHRK
-reog2Kx2y+16v+CweEwum8/otHqdVrjf8Lh8Tq/b7/i8fs/v+/+AgX8GhIWGh4iJiouMjY6PkJGS
-k5SVlpeVAZqbnJ2en6ChoqOkpaanqKmqq6ytqwywsbKztLW2t7i5uru8vb6/wMHCw8EHxsfIycrL
-zM3Oz9DR0tPU1dbX2NnXA9zd3t/g4eLj5OXm5+jp6uvs7e7v7Q3y8/T19vf4+fr7/P3+/wADChxI
-sOBABAgTKlzIsKHDhxAjSpxIsaLFixgzatyY0YHHjyBDihxJsqTJkyhT/apcybKly5cwY75MQLOm
-zZs4c+rcybOnz59AgwodSrSo0aNFBShdyrSp06dQo0qdSrWq1atYs2rdyrXr1gdgw4odS7as2bNo
-06pdy7at27dw48qdG1eC3bt48+rdy7ev37+AAwseTLiw4cOIEx+ewLix48eQI0ueTLmy5cuYM2ve
-zLmz58+dAYgeTbq06dOoU6tezbq169ewY8ueTbv27AW4c+vezbu379/AgwsfTry48ePIkytfnlwC
-gefQo0ufTr269evYs2vfzr279+/gw4v/HoGC+fPo06tfz769+/fw48ufT7++/fv489svUGGC/v8A
-BijggAQWaGB8IQAAOw==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/screen-options-right-up.svg b/mp-wp/wp-admin/images/screen-options-right-up.svg
--- a/mp-wp/wp-admin/images/screen-options-right-up.svg 2c13cdee744499b78f71ab4a4e9838cbf6555945b60a04656a2c88d845f6ab737dbe6f025217b7897ebf7132fea2186fe42b7845baadebf555c363271ca26120
+++ b/mp-wp/wp-admin/images/screen-options-right-up.svg false
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="19px" height="23px" viewBox="0 0 19 23" enable-background="new 0 0 19 23" xml:space="preserve">  <image id="image0" width="19" height="23" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhEwAXAMQAAN/f39zc3Nvb29ra2ru7u9nZ2b29vdDQ0L6+vr+/v8TExMvLy/7+/sPDw8HB
-wcnJyd7e3tTU1ODg4OTk5OHh4ejo6OXl5dXV1eLi4ubm5uPj49bW1tjY2NfX19PT0+fn5yH5BAAA
-AAAALAAAAAATABcAAAWTYCWOZEl+aKqubOuiWSzP9GzdeK7nU+//wJ9mSCwai5ikcslcUp7QqDQq
-qVqtgqsWwO1yAwiO1wspm8sPQuN8DrjfgQ5hfoC/Bfi8QDEnJAZ6eAODhAd9cwuEhAWMjQ4GkJAI
-G42MHJeYmZqZHZ2en6CfG6OkpaalF6mqq6yrEa+wsbKwHB62t7i5tx+6vbcdHwwhADs=
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/screen-options-right.svg b/mp-wp/wp-admin/images/screen-options-right.svg
--- a/mp-wp/wp-admin/images/screen-options-right.svg 3ce1986903c276e5d419bfb8d4fb1ca854223f72f403845620b5310dea2e47f4758816d88c2d973992e0f86451fedbf393b933768bd8dbfa2123bd78133b0bbb
+++ b/mp-wp/wp-admin/images/screen-options-right.svg false
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="19px" height="23px" viewBox="0 0 19 23" enable-background="new 0 0 19 23" xml:space="preserve">  <image id="image0" width="19" height="23" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhEwAXAMQAANra2tvb29zc3N7e3ru7u9/f3729vcLCws3Nzb6+vsjIyL+/v/7+/tDQ0MTE
-xNnZ2eTk5NTU1OHh4ejo6NjY2OXl5dXV1eLi4ubm5uPj4+Dg4NbW1tfX19PT0+fn5wAAACH5BAAA
-AAAALAAAAAATABcAAAWR4CSOZEl6aKqubOuiWCzP9FzdeK7nUO//wF9mSCwai5ekcslcSp7QqDSq
-qVqv2GthuxUkDGDwgcsdmM8IglrdOZ8F8HhgsXbE74G8PtBYb/Z6AIKDggcECoSED4uMix0GHI2N
-FJSVlRGWmRybnJ2enRuhoqOkoxanqKmqqRGtrq+wrhQdtLW2t7UeuLu1HB4MIQA7
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/se.svg b/mp-wp/wp-admin/images/se.svg
--- a/mp-wp/wp-admin/images/se.svg 4ada0d9ca918ce279ba1902a9deb2ca487b7bd28adb17b6aa5dc9c7fd20b733be45d1d53e9ad0fee74523a4c0c6288fc7f38894f0d9e7dba0b674df9aef3051e
+++ b/mp-wp/wp-admin/images/se.svg false
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">  <image id="image0" width="10" height="10" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKAQMAAAC3/F3+AAAABlBMVEX///+Dg4aixJs6AAAAAXRS
-TlMAQObYZgAAACdJREFUeF4FwEEJACAQBMARwZcFLsd1MsfWsJOhhBgxWeyoaA4vbj45LgUuKI7V
-KwAAAABJRU5ErkJggg==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/star.svg b/mp-wp/wp-admin/images/star.svg
--- a/mp-wp/wp-admin/images/star.svg c6722104c5034247692454f4f000f0d5e63f3929346269dc3d1b5d2936de450ab93f1dcad0b0ca0260c0291cbb86a9e19866b875ba8e286a08c174a55bf903ef
+++ b/mp-wp/wp-admin/images/star.svg false
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="19px" height="19px" viewBox="0 0 19 19" enable-background="new 0 0 19 19" xml:space="preserve">  <image id="image0" width="19" height="19" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhEwATAKEAAAAAAP///wAAAAAAACH5BAEKAAIALAAAAAATABMAAAI+jH+AywaimnxRrieg
-vVnv1FUXQJJdVpYBdrauwrovKLfiGts3bW85avmFJqfYblVEDjmQCgCzozSkjKMDUQAAOw==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/wheel.svg b/mp-wp/wp-admin/images/wheel.svg
--- a/mp-wp/wp-admin/images/wheel.svg a621dd6fb483f711896eb30f0debe642942c2dd5e257b295ffc797698464692de03c51e736a5377c79b428209f779296d663a1dd2dc61bbffc31e35112057b61
+++ b/mp-wp/wp-admin/images/wheel.svg false
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="195px" height="195px" viewBox="0 0 195 195" enable-background="new 0 0 195 195" xml:space="preserve">  <image id="image0" width="195" height="195" x="0" y="0"
-    xlink:href="data:image/png;base64,
-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
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/white-grad-active.svg b/mp-wp/wp-admin/images/white-grad-active.svg
--- a/mp-wp/wp-admin/images/white-grad-active.svg 0b7ec8154ecaa06915932364cb84370a2c0fb71a421e6a4f8fbf415cd56ea15cd8b75e890ef44b5946ccf41c97c0633f2de1d4e61f9aa8c300bcca40cfb7a4f1
+++ b/mp-wp/wp-admin/images/white-grad-active.svg false
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="30px" viewBox="0 0 5 30" enable-background="new 0 0 5 30" xml:space="preserve">  <image id="image0" width="5" height="30" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAMAAADToCSPAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAADlQTFRF7+/v8PDw8vLy7e3t+fn5////+/v7+Pj49PT0/f399vb27u7u
-8fHx/v7+/Pz89fX19/f38/Pz+vr68z2vlQAAADxJREFUeNpMxDkSgDAAxDBzE87A/x/LeLIFKsQg
-2rv465QP0Ss/YlW+xaZcxaI8Kr9iVr5EUT7FpPYnwABZDwRrFJ+PLwAAAABJRU5ErkJggg==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/white-grad.svg b/mp-wp/wp-admin/images/white-grad.svg
--- a/mp-wp/wp-admin/images/white-grad.svg 2f92c9844b3f390e433c6df3b8f5304fcef6c0e85b80dde8f4972b349f4457e4f36b3c41c54a74715965fbbf944786f220b21bf02fc1aa1109b125d1e4a26a61
+++ b/mp-wp/wp-admin/images/white-grad.svg false
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="30px" viewBox="0 0 5 30" enable-background="new 0 0 5 30" xml:space="preserve">  <image id="image0" width="5" height="30" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAYAAADkftS9AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
-AAALEgAACxIB0t1+/AAAACF0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgNC4w6iYn
-dQAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMS8xNy8wONpsdXEAAAAlSURBVHicY/z///9/BjTAhC7A
-wMDAwIJFIXbBoaJ9qLhz+IUSAIMMOibeSzRBAAAAAElFTkSuQmCC
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/wordpress-logo.svg b/mp-wp/wp-admin/images/wordpress-logo.svg
--- a/mp-wp/wp-admin/images/wordpress-logo.svg dab33b25841c706fd49dddbb34cba56408eeebee53190302a15a9dfef12241ab05c9816bdecb080379c3b89a47ff76f30a86cecf87053df783c69fd775367643
+++ b/mp-wp/wp-admin/images/wordpress-logo.svg false
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="250px" height="68px" viewBox="0 0 250 68" enable-background="new 0 0 250 68" xml:space="preserve">  <image id="image0" width="250" height="68" x="0" y="0"
-    xlink:href="data:image/png;base64,
-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
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/wp-logo.svg b/mp-wp/wp-admin/images/wp-logo.svg
--- a/mp-wp/wp-admin/images/wp-logo.svg eafc8b8af0024ae548f17132fb1b0ccf1962cfc7a55b254f00e8707c01a0c0676532ff0781aba8b8031e88d656b7c4edbefda845541641ab0dace6fadb329c86
+++ b/mp-wp/wp-admin/images/wp-logo.svg false
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="30px" height="31px" viewBox="0 0 30 31" enable-background="new 0 0 30 31" xml:space="preserve">  <image id="image0" width="30" height="31" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhHgAfAOZdAJaWlpOTk5GRkZCQkI2NjY6Ojo+Pj5eXl1RUVJKSkpSUlFNTU0pKSkJCQmlp
-aT4+Pjc3N2VlZUBAQENDQ2xsbJWVlYqKijk5OYiIiIKCgoyMjFxcXEtLS21tbWRkZIODg3JyclZW
-VlFRUVdXV0VFRUlJSX9/fzo6OnNzc2pqanp6ejExMYCAgImJiVpaWl1dXW5ubj09PYeHhzMzM2Zm
-ZouLi3t7e2FhYV9fX4aGhmNjY0ZGRm9vb3R0dDIyMjg4OISEhIGBgWtrazY2NjAwMEFBQZiYmH19
-fVtbW0RERE5OTnd3d0dHR1JSUmhoaHFxcVVVVTQ0NIWFhUxMTHV1dWdnZ1hYWGJiYk9PT3l5eXx8
-fF5eXnZ2dkRERAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5
-BAEAAF0ALAAAAAAeAB8AAAf/gF2Cg4QPP1ErREQ+UT8PhJCRghMXK00wGQlGRgUZME0rFxOSkQ8Q
-NAEBKg4hrSEOKqk0EI+kghAiCQQeFzNDHMAcQzMXHgQJIhC2ECAHDhcQEUAH1NVAERAXDgcgypHM
-AgszEQLV5tUCETMLAt2QD08DCxcfAPb3+Pg5JQgDT7VdJogAgIBevoP3BuBg0AUBABGjukgY4KCB
-FIQYNxByMECCIA8WumDp0MEDgxYVXlgh2SEFhw8VKogYdGKCBQ9dHhjQccFjlxsxY35oIGiLgaAe
-iHaJIEGHgQchCizlIGiBgqtXXQhigFVBgYghInQpEEJIjwkZHAxq0ZWLUhVd/3kIqpJhQg8hNiIk
-CVCgFo9UgHcIugI4laC/SSLYKIAAQaoFVQsH0LFVskQZARoXSNA4QQIqEWV49kxjUJbRCbow8NxZ
-QGMBsJXCgA17yg9BN2hr6eIE9usaIkbQHlGVdpAdTrbSjvBAA+wRImrYWDigugmlOapHeAGk1pLq
-SvpVZ4DDBgUKXYJUH0BCUIfqU0wMQIB7QI4uFKoHwU/hhYUYKRgg4A1VGcDCDgJSMAoDBlDwgAUC
-phCDBS90YQEUDEBowAc+SeHBCwJaoNQSIywQIgNQhNSFAx+ckEIBMJYgCAwcHAFjAcR1McIEFMCY
-wgkfqNVFCS24IAELMKK31aWNBYCgVAMtFMCCBC60IKMgGxDQAAkmEIBBLTQQIKaY7elIgAkkNECA
-RoSggMGWLBAAmQQZjCkmmz2wkCYGKEjiZhEnONAnB3aKeQRRDpxQBJ+2gKCBCz7E0IUHGlRqqQlK
-xOCDCxqAYAuWGGSwwAoQSLDAqQtIAMEKC2SAAZufDukABjJ0sAEDTDDBwAYdyICBA1fGSggSFKiQ
-QQ01ZKACBUh8GggAOw==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/xit.svg b/mp-wp/wp-admin/images/xit.svg
--- a/mp-wp/wp-admin/images/xit.svg 2070e95c9e218f70e6d31b243c91159a7584ca293795eea88f9157ec048ada230a07d3db84b1053691d34dc1ff109ff6e444e92490b16856716bf73b5f779791
+++ b/mp-wp/wp-admin/images/xit.svg false
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px" height="10px" viewBox="0 0 20 10" enable-background="new 0 0 20 10" xml:space="preserve">  <image id="image0" width="20" height="10" x="0" y="0"
-    xlink:href="data:image/png;base64,
-R0lGODlhFAAKALMAAODg4PjIyPa3t8jIyPrY2Onp6dbW1vOenubm5vnT0/KTk8LCwv///wAAAAAA
-AAAAACH5BAAAAAAALAAAAAAUAAoAAARikLFixjBFSiLOEYQGLGQJSIGirsG0MAiJMEtBKEyiJoxC
-GIsZQrgwCBS8RFIhGMgkscXgsJPoFAdnEEqaVnOqA1BINCJzS0HhFZ3VbuCzjzEqkU6M1ErVklAs
-GBoMHB4gEhEAOw==
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/images/yes.svg b/mp-wp/wp-admin/images/yes.svg
--- a/mp-wp/wp-admin/images/yes.svg 389f7e705af0e96883c3b0cdbe428b9324e439c32288992bbb98fd70c7f4c101173ac77794a8e6a29bf2a7b96d6ceb0a355b25fccff5c7a583127cbdea34dead
+++ b/mp-wp/wp-admin/images/yes.svg false
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">  <image id="image0" width="16" height="16" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACK0lEQVQ4jaWSXUhTYRjH/+/O3uPO
-Ofs4W2oRRGI0jPYRStaIjMS6SyQoC+kD0rqJwAjqqo+bbpLoQorIhjaShIqRLUtzdaHDDywpmzZ0
-NIS0rDV1tg87e7uQRMps1R+em+fh91z8+RHGGP4nqr8FhFqi/ucHopNI8qip23RQbplfMsbSGuEG
-pOVn5P72wVZ2wLmXqXbhIWMMJJ0OhGtEMoRk363DjbaGrjqMJcchJw1wP3jcPP8gq5FfBkZyJyoS
-vQthfT2RMob0PldVo83lv4nWTx5wMYpZLw0mZqIFKgDQ1JJM80d7YEPY0SHVk+0/4JX3Ja32ndHn
-On7b1jTegF7aAS3VIeyJDUenI5Zoy2xEnX1RzC4WS/zVpdWmqBLFpCfiWXFXs1MStT10SNdZc+Sy
-rfnzPQzS1xATOvibQiMklbImnrA4AHCKTK4XlTgKPwjviSwaUZCXT/u8A+UI0apzlWfNL+M9CHBv
-oEwR9DsDQS5LscbvzMEA5koUyjRP83av2movtPP5uo2ghIeBGjGovMII3mL6ywye1XQH+U1JS/io
-ElvYkRoAYu54CVemaoOMIrb5G2/m1yHMTWCCG4MyBXRcfRHMqchcP1A8GsdPmbdKcad20D2qdllv
-2mLcZswQiIDUJPD8UlfQccJqebS28xd4UZEy9qnbyntLExfCp1nuqZzhk18rNUsJtuhSd0j0rjm/
-uq+OXRH+ZOhvD8fi+2k6iqel8lL5Dvo2ZEkd1D8WAAAAAElFTkSuQmCC
-" />
-</svg>
diff -uNr a/mp-wp/wp-admin/import/wordpress.php b/mp-wp/wp-admin/import/wordpress.php
--- a/mp-wp/wp-admin/import/wordpress.php efae5b996de32533fa30deca52c2bd9912e8c34ec533abcebf2ae77fdca06740df26baf51dc54ec2b9f44a787936262047ac7750643fa60f30233f13bc774633
+++ b/mp-wp/wp-admin/import/wordpress.php false
@@ -1,806 +0,0 @@
-<?php
-/**
- * WordPress Importer
- *
- * @package WordPress
- * @subpackage Importer
- */
-
-/**
- * WordPress Importer
- *
- * Will process the WordPress eXtended RSS files that you upload from the export
- * file.
- *
- * @since unknown
- */
-class WP_Import {
-
-	var $post_ids_processed = array ();
-	var $orphans = array ();
-	var $file;
-	var $id;
-	var $mtnames = array ();
-	var $newauthornames = array ();
-	var $allauthornames = array ();
-
-	var $author_ids = array ();
-	var $tags = array ();
-	var $categories = array ();
-
-	var $j = -1;
-	var $fetch_attachments = false;
-	var $url_remap = array ();
-
-	function header() {
-		echo '<div class="wrap">';
-		screen_icon();
-		echo '<h2>'.__('Import WordPress').'</h2>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	function unhtmlentities($string) { // From php.net for < 4.3 compat
-		$trans_tbl = get_html_translation_table(HTML_ENTITIES);
-		$trans_tbl = array_flip($trans_tbl);
-		return strtr($string, $trans_tbl);
-	}
-
-	function greet() {
-		echo '<div class="narrow">';
-		echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this blog.').'</p>';
-		echo '<p>'.__('Choose a WordPress WXR file to upload, then click Upload file and import.').'</p>';
-		wp_import_upload_form("admin.php?import=wordpress&amp;step=1");
-		echo '</div>';
-	}
-
-	function get_tag( $string, $tag ) {
-		global $wpdb;
-		preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return);
-		$return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
-		$return = $wpdb->escape( trim( $return ) );
-		return $return;
-	}
-
-	function has_gzip() {
-		return is_callable('gzopen');
-	}
-
-	function fopen($filename, $mode='r') {
-		if ( $this->has_gzip() )
-			return gzopen($filename, $mode);
-		return fopen($filename, $mode);
-	}
-
-	function feof($fp) {
-		if ( $this->has_gzip() )
-			return gzeof($fp);
-		return feof($fp);
-	}
-
-	function fgets($fp, $len=8192) {
-		if ( $this->has_gzip() )
-			return gzgets($fp, $len);
-		return fgets($fp, $len);
-	}
-
-	function fclose($fp) {
-		if ( $this->has_gzip() )
-			return gzclose($fp);
-		return fclose($fp);
-	}
-
-	function get_entries($process_post_func=NULL) {
-		set_magic_quotes_runtime(0);
-
-		$doing_entry = false;
-		$is_wxr_file = false;
-
-		$fp = $this->fopen($this->file, 'r');
-		if ($fp) {
-			while ( !$this->feof($fp) ) {
-				$importline = rtrim($this->fgets($fp));
-
-				// this doesn't check that the file is perfectly valid but will at least confirm that it's not the wrong format altogether
-				if ( !$is_wxr_file && preg_match('|xmlns:wp="http://wordpress[.]org/export/\d+[.]\d+/"|', $importline) )
-					$is_wxr_file = true;
-
-				if ( false !== strpos($importline, '<wp:base_site_url>') ) {
-					preg_match('|<wp:base_site_url>(.*?)</wp:base_site_url>|is', $importline, $url);
-					$this->base_url = $url[1];
-					continue;
-				}
-				if ( false !== strpos($importline, '<wp:category>') ) {
-					preg_match('|<wp:category>(.*?)</wp:category>|is', $importline, $category);
-					$this->categories[] = $category[1];
-					continue;
-				}
-				if ( false !== strpos($importline, '<wp:tag>') ) {
-					preg_match('|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag);
-					$this->tags[] = $tag[1];
-					continue;
-				}
-				if ( false !== strpos($importline, '<item>') ) {
-					$this->post = '';
-					$doing_entry = true;
-					continue;
-				}
-				if ( false !== strpos($importline, '</item>') ) {
-					$doing_entry = false;
-					if ($process_post_func)
-						call_user_func($process_post_func, $this->post);
-					continue;
-				}
-				if ( $doing_entry ) {
-					$this->post .= $importline . "\n";
-				}
-			}
-
-			$this->fclose($fp);
-		}
-
-		return $is_wxr_file;
-
-	}
-
-	function get_wp_authors() {
-		// We need to find unique values of author names, while preserving the order, so this function emulates the unique_value(); php function, without the sorting.
-		$temp = $this->allauthornames;
-		$authors[0] = array_shift($temp);
-		$y = count($temp) + 1;
-		for ($x = 1; $x < $y; $x ++) {
-			$next = array_shift($temp);
-			if (!(in_array($next, $authors)))
-				array_push($authors, "$next");
-		}
-
-		return $authors;
-	}
-
-	function get_authors_from_post() {
-		global $current_user;
-
-		// this will populate $this->author_ids with a list of author_names => user_ids
-
-		foreach ( $_POST['author_in'] as $i => $in_author_name ) {
-
-			if ( !empty($_POST['user_select'][$i]) ) {
-				// an existing user was selected in the dropdown list
-				$user = get_userdata( intval($_POST['user_select'][$i]) );
-				if ( isset($user->ID) )
-					$this->author_ids[$in_author_name] = $user->ID;
-			}
-			elseif ( $this->allow_create_users() ) {
-				// nothing was selected in the dropdown list, so we'll use the name in the text field
-
-				$new_author_name = trim($_POST['user_create'][$i]);
-				// if the user didn't enter a name, assume they want to use the same name as in the import file
-				if ( empty($new_author_name) )
-					$new_author_name = $in_author_name;
-
-				$user_id = username_exists($new_author_name);
-				if ( !$user_id ) {
-					$user_id = wp_create_user($new_author_name, wp_generate_password());
-				}
-
-				$this->author_ids[$in_author_name] = $user_id;
-			}
-
-			// failsafe: if the user_id was invalid, default to the current user
-			if ( empty($this->author_ids[$in_author_name]) ) {
-				$this->author_ids[$in_author_name] = intval($current_user->ID);
-			}
-		}
-
-	}
-
-	function wp_authors_form() {
-?>
-<?php screen_icon(); ?>
-<h2><?php _e('Assign Authors'); ?></h2>
-<p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.'); ?></p>
-<?php
-	if ( $this->allow_create_users() ) {
-		echo '<p>'.__('If a new user is created by WordPress, a password will be randomly generated. Manually change the user\'s details if necessary.')."</p>\n";
-	}
-
-
-		$authors = $this->get_wp_authors();
-		echo '<form action="?import=wordpress&amp;step=2&amp;id=' . $this->id . '" method="post">';
-		wp_nonce_field('import-wordpress');
-		echo '<ol id="authors">';
-		$j = -1;
-		foreach ($authors as $author) {
-			++ $j;
-			echo '<li>'.__('Import author:').' <strong>'.$author.'</strong><br />';
-			$this->users_form($j, $author);
-			echo '</li>';
-		}
-
-		if ( $this->allow_fetch_attachments() ) {
-?>
-</ol>
-<?php screen_icon(); ?>
-<h2><?php _e('Import Attachments'); ?></h2>
-<p>
-	<input type="checkbox" value="1" name="attachments" id="import-attachments" />
-	<label for="import-attachments"><?php _e('Download and import file attachments') ?></label>
-</p>
-
-<?php
-		}
-
-		echo '<p class="submit">';
-		echo '<input type="submit" class="button" value="'.attribute_escape( __('Submit') ).'" />'.'<br />';
-		echo '</p>';
-		echo '</form>';
-
-	}
-
-	function users_form($n, $author) {
-
-		if ( $this->allow_create_users() ) {
-			printf('<label>'.__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30" /></label> <br />');
-		}
-		else {
-			echo __('Map to existing').'<br />';
-		}
-
-		// keep track of $n => $author name
-		echo '<input type="hidden" name="author_in['.intval($n).']" value="'.htmlspecialchars($author).'" />';
-
-		$users = get_users_of_blog();
-?><select name="user_select[<?php echo $n; ?>]">
-	<option value="0"><?php _e('- Select -'); ?></option>
-	<?php
-		foreach ($users as $user) {
-			echo '<option value="'.$user->user_id.'">'.$user->user_login.'</option>';
-		}
-?>
-	</select>
-	<?php
-	}
-
-	function select_authors() {
-		$is_wxr_file = $this->get_entries(array(&$this, 'process_author'));
-		if ( $is_wxr_file ) {
-			$this->wp_authors_form();
-		}
-		else {
-			echo '<h2>'.__('Invalid file').'</h2>';
-			echo '<p>'.__('Please upload a valid WXR (WordPress eXtended RSS) export file.').'</p>';
-		}
-	}
-
-	// fetch the user ID for a given author name, respecting the mapping preferences
-	function checkauthor($author) {
-		global $current_user;
-
-		if ( !empty($this->author_ids[$author]) )
-			return $this->author_ids[$author];
-
-		// failsafe: map to the current user
-		return $current_user->ID;
-	}
-
-
-
-	function process_categories() {
-		global $wpdb;
-
-		$cat_names = (array) get_terms('category', 'fields=names');
-
-		while ( $c = array_shift($this->categories) ) {
-			$cat_name = trim($this->get_tag( $c, 'wp:cat_name' ));
-
-			// If the category exists we leave it alone
-			if ( in_array($cat_name, $cat_names) )
-				continue;
-
-			$category_nicename	= $this->get_tag( $c, 'wp:category_nicename' );
-			$posts_private		= (int) $this->get_tag( $c, 'wp:posts_private' );
-			$links_private		= (int) $this->get_tag( $c, 'wp:links_private' );
-
-			$parent = $this->get_tag( $c, 'wp:category_parent' );
-
-			if ( empty($parent) )
-				$category_parent = '0';
-			else
-				$category_parent = category_exists($parent);
-
-			$catarr = compact('category_nicename', 'category_parent', 'posts_private', 'links_private', 'posts_private', 'cat_name');
-
-			$cat_ID = wp_insert_category($catarr);
-		}
-	}
-
-	function process_tags() {
-		global $wpdb;
-
-		$tag_names = (array) get_terms('post_tag', 'fields=names');
-
-		while ( $c = array_shift($this->tags) ) {
-			$tag_name = trim($this->get_tag( $c, 'wp:tag_name' ));
-
-			// If the category exists we leave it alone
-			if ( in_array($tag_name, $tag_names) )
-				continue;
-
-			$slug = $this->get_tag( $c, 'wp:tag_slug' );
-			$description = $this->get_tag( $c, 'wp:tag_description' );
-
-			$tagarr = compact('slug', 'description');
-
-			$tag_ID = wp_insert_term($tag_name, 'post_tag', $tagarr);
-		}
-	}
-
-	function process_author($post) {
-		$author = $this->get_tag( $post, 'dc:creator' );
-		if ($author)
-			$this->allauthornames[] = $author;
-	}
-
-	function process_posts() {
-		echo '<ol>';
-
-		$this->get_entries(array(&$this, 'process_post'));
-
-		echo '</ol>';
-
-		wp_import_cleanup($this->id);
-		do_action('import_done', 'wordpress');
-
-		echo '<h3>'.sprintf(__('All done.').' <a href="%s">'.__('Have fun!').'</a>', get_option('home')).'</h3>';
-	}
-
-	function process_post($post) {
-		global $wpdb;
-
-		$post_ID = (int) $this->get_tag( $post, 'wp:post_id' );
-  		if ( $post_ID && !empty($this->post_ids_processed[$post_ID]) ) // Processed already
-			return 0;
-
-		set_time_limit( 60 );
-
-		// There are only ever one of these
-		$post_title     = $this->get_tag( $post, 'title' );
-		$post_date      = $this->get_tag( $post, 'wp:post_date' );
-		$post_date_gmt  = $this->get_tag( $post, 'wp:post_date_gmt' );
-		$comment_status = $this->get_tag( $post, 'wp:comment_status' );
-		$ping_status    = $this->get_tag( $post, 'wp:ping_status' );
-		$post_status    = $this->get_tag( $post, 'wp:status' );
-		$post_name      = $this->get_tag( $post, 'wp:post_name' );
-		$post_parent    = $this->get_tag( $post, 'wp:post_parent' );
-		$menu_order     = $this->get_tag( $post, 'wp:menu_order' );
-		$post_type      = $this->get_tag( $post, 'wp:post_type' );
-		$post_password  = $this->get_tag( $post, 'wp:post_password' );
-		$guid           = $this->get_tag( $post, 'guid' );
-		$post_author    = $this->get_tag( $post, 'dc:creator' );
-
-		$post_excerpt = $this->get_tag( $post, 'excerpt:encoded' );
-		$post_excerpt = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_excerpt);
-		$post_excerpt = str_replace('<br>', '<br />', $post_excerpt);
-		$post_excerpt = str_replace('<hr>', '<hr />', $post_excerpt);
-
-		$post_content = $this->get_tag( $post, 'content:encoded' );
-		$post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
-		$post_content = str_replace('<br>', '<br />', $post_content);
-		$post_content = str_replace('<hr>', '<hr />', $post_content);
-
-		preg_match_all('|<category domain="tag">(.*?)</category>|is', $post, $tags);
-		$tags = $tags[1];
-
-		$tag_index = 0;
-		foreach ($tags as $tag) {
-			$tags[$tag_index] = $wpdb->escape($this->unhtmlentities(str_replace(array ('<![CDATA[', ']]>'), '', $tag)));
-			$tag_index++;
-		}
-
-		preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
-		$categories = $categories[1];
-
-		$cat_index = 0;
-		foreach ($categories as $category) {
-			$categories[$cat_index] = $wpdb->escape($this->unhtmlentities(str_replace(array ('<![CDATA[', ']]>'), '', $category)));
-			$cat_index++;
-		}
-
-		$post_exists = post_exists($post_title, '', $post_date);
-
-		if ( $post_exists ) {
-			echo '<li>';
-			printf(__('Post <em>%s</em> already exists.'), stripslashes($post_title));
-			$comment_post_ID = $post_id = $post_exists;
-		} else {
-
-			// If it has parent, process parent first.
-			$post_parent = (int) $post_parent;
-			if ($post_parent) {
-				// if we already know the parent, map it to the local ID
-				if ( $parent = $this->post_ids_processed[$post_parent] ) {
-					$post_parent = $parent;  // new ID of the parent
-				}
-				else {
-					// record the parent for later
-					$this->orphans[intval($post_ID)] = $post_parent;
-				}
-			}
-
-			echo '<li>';
-
-			$post_author = $this->checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor
-
-			$postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt', 'post_title', 'post_status', 'post_name', 'comment_status', 'ping_status', 'guid', 'post_parent', 'menu_order', 'post_type', 'post_password');
-			$postdata['import_id'] = $post_ID;
-			if ($post_type == 'attachment') {
-				$remote_url = $this->get_tag( $post, 'wp:attachment_url' );
-				if ( !$remote_url )
-					$remote_url = $guid;
-
-				$comment_post_ID = $post_id = $this->process_attachment($postdata, $remote_url);
-				if ( !$post_id or is_wp_error($post_id) )
-					return $post_id;
-			}
-			else {
-				printf(__('Importing post <em>%s</em>...'), stripslashes($post_title));
-				$comment_post_ID = $post_id = wp_insert_post($postdata);
-			}
-
-			if ( is_wp_error( $post_id ) )
-				return $post_id;
-
-			// Memorize old and new ID.
-			if ( $post_id && $post_ID ) {
-				$this->post_ids_processed[intval($post_ID)] = intval($post_id);
-			}
-
-			// Add categories.
-			if (count($categories) > 0) {
-				$post_cats = array();
-				foreach ($categories as $category) {
-					if ( '' == $category )
-						continue;
-					$slug = sanitize_term_field('slug', $category, 0, 'category', 'db');
-					$cat = get_term_by('slug', $slug, 'category');
-					$cat_ID = 0;
-					if ( ! empty($cat) )
-						$cat_ID = $cat->term_id;
-					if ($cat_ID == 0) {
-						$category = $wpdb->escape($category);
-						$cat_ID = wp_insert_category(array('cat_name' => $category));
-						if ( is_wp_error($cat_ID) )
-							continue;
-					}
-					$post_cats[] = $cat_ID;
-				}
-				wp_set_post_categories($post_id, $post_cats);
-			}
-
-			// Add tags.
-			if (count($tags) > 0) {
-				$post_tags = array();
-				foreach ($tags as $tag) {
-					if ( '' == $tag )
-						continue;
-					$slug = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
-					$tag_obj = get_term_by('slug', $slug, 'post_tag');
-					$tag_id = 0;
-					if ( ! empty($tag_obj) )
-						$tag_id = $tag_obj->term_id;
-					if ( $tag_id == 0 ) {
-						$tag = $wpdb->escape($tag);
-						$tag_id = wp_insert_term($tag, 'post_tag');
-						if ( is_wp_error($tag_id) )
-							continue;
-						$tag_id = $tag_id['term_id'];
-					}
-					$post_tags[] = intval($tag_id);
-				}
-				wp_set_post_tags($post_id, $post_tags);
-			}
-		}
-
-		// Now for comments
-		preg_match_all('|<wp:comment>(.*?)</wp:comment>|is', $post, $comments);
-		$comments = $comments[1];
-		$num_comments = 0;
-		if ( $comments) { foreach ($comments as $comment) {
-			$comment_author       = $this->get_tag( $comment, 'wp:comment_author');
-			$comment_author_email = $this->get_tag( $comment, 'wp:comment_author_email');
-			$comment_author_IP    = $this->get_tag( $comment, 'wp:comment_author_IP');
-			$comment_author_url   = $this->get_tag( $comment, 'wp:comment_author_url');
-			$comment_date         = $this->get_tag( $comment, 'wp:comment_date');
-			$comment_date_gmt     = $this->get_tag( $comment, 'wp:comment_date_gmt');
-			$comment_content      = $this->get_tag( $comment, 'wp:comment_content');
-			$comment_approved     = $this->get_tag( $comment, 'wp:comment_approved');
-			$comment_type         = $this->get_tag( $comment, 'wp:comment_type');
-			$comment_parent       = $this->get_tag( $comment, 'wp:comment_parent');
-
-			// if this is a new post we can skip the comment_exists() check
-			if ( !$post_exists || !comment_exists($comment_author, $comment_date) ) {
-				$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_approved', 'comment_type', 'comment_parent');
-				wp_insert_comment($commentdata);
-				$num_comments++;
-			}
-		} }
-
-		if ( $num_comments )
-			printf(' '.__ngettext('(%s comment)', '(%s comments)', $num_comments), $num_comments);
-
-		// Now for post meta
-		preg_match_all('|<wp:postmeta>(.*?)</wp:postmeta>|is', $post, $postmeta);
-		$postmeta = $postmeta[1];
-		if ( $postmeta) { foreach ($postmeta as $p) {
-			$key   = $this->get_tag( $p, 'wp:meta_key' );
-			$value = $this->get_tag( $p, 'wp:meta_value' );
-			$value = stripslashes($value); // add_post_meta() will escape.
-
-			$this->process_post_meta($post_id, $key, $value);
-
-		} }
-
-		do_action('import_post_added', $post_id);
-		print "</li>\n";
-	}
-
-	function process_post_meta($post_id, $key, $value) {
-		// the filter can return false to skip a particular metadata key
-		$_key = apply_filters('import_post_meta_key', $key);
-		if ( $_key ) {
-			add_post_meta( $post_id, $_key, $value );
-			do_action('import_post_meta', $post_id, $_key, $value);
-		}
-	}
-
-	function process_attachment($postdata, $remote_url) {
-		if ($this->fetch_attachments and $remote_url) {
-			printf( __('Importing attachment <em>%s</em>... '), htmlspecialchars($remote_url) );
-
-			// If the URL is absolute, but does not contain http, upload it assuming the base_site_url variable
-			if ( preg_match('/^\/[\w\W]+$/', $remote_url) )
-				$remote_url = rtrim($this->base_url,'/').$remote_url;
-
-			$upload = $this->fetch_remote_file($postdata, $remote_url);
-			if ( is_wp_error($upload) ) {
-				printf( __('Remote file error: %s'), htmlspecialchars($upload->get_error_message()) );
-				return $upload;
-			}
-			else {
-				print '('.size_format(filesize($upload['file'])).')';
-			}
-
-			if ( $info = wp_check_filetype($upload['file']) ) {
-				$postdata['post_mime_type'] = $info['type'];
-			}
-			else {
-				print __('Invalid file type');
-				return;
-			}
-
-			$postdata['guid'] = $upload['url'];
-
-			// as per wp-admin/includes/upload.php
-			$post_id = wp_insert_attachment($postdata, $upload['file']);
-			wp_update_attachment_metadata( $post_id, wp_generate_attachment_metadata( $post_id, $upload['file'] ) );
-
-			// remap the thumbnail url.  this isn't perfect because we're just guessing the original url.
-			if ( preg_match('@^image/@', $info['type']) && $thumb_url = wp_get_attachment_thumb_url($post_id) ) {
-				$parts = pathinfo($remote_url);
-				$ext = $parts['extension'];
-				$name = basename($parts['basename'], ".{$ext}");
-				$this->url_remap[$parts['dirname'] . '/' . $name . '.thumbnail.' . $ext] = $thumb_url;
-			}
-
-			return $post_id;
-		}
-		else {
-			printf( __('Skipping attachment <em>%s</em>'), htmlspecialchars($remote_url) );
-		}
-	}
-
-	function fetch_remote_file($post, $url) {
-		$upload = wp_upload_dir($post['post_date']);
-
-		// extract the file name and extension from the url
-		$file_name = basename($url);
-
-		// get placeholder file in the upload dir with a unique sanitized filename
-		$upload = wp_upload_bits( $file_name, 0, '', $post['post_date']);
-		if ( $upload['error'] ) {
-			echo $upload['error'];
-			return new WP_Error( 'upload_dir_error', $upload['error'] );
-		}
-
-		// fetch the remote url and write it to the placeholder file
-		$headers = wp_get_http($url, $upload['file']);
-
-		//Request failed
-		if ( ! $headers ) {
-			@unlink($upload['file']);
-			return new WP_Error( 'import_file_error', __('Remote server did not respond') );
-		}
-
-		// make sure the fetch was successful
-		if ( $headers['response'] != '200' ) {
-			@unlink($upload['file']);
-			return new WP_Error( 'import_file_error', sprintf(__('Remote file returned error response %1$d %2$s'), $headers['response'], get_status_header_desc($headers['response']) ) );
-		}
-		elseif ( isset($headers['content-length']) && filesize($upload['file']) != $headers['content-length'] ) {
-			@unlink($upload['file']);
-			return new WP_Error( 'import_file_error', __('Remote file is incorrect size') );
-		}
-
-		$max_size = $this->max_attachment_size();
-		if ( !empty($max_size) and filesize($upload['file']) > $max_size ) {
-			@unlink($upload['file']);
-			return new WP_Error( 'import_file_error', sprintf(__('Remote file is too large, limit is %s', size_format($max_size))) );
-		}
-
-		// keep track of the old and new urls so we can substitute them later
-		$this->url_remap[$url] = $upload['url'];
-		// if the remote url is redirected somewhere else, keep track of the destination too
-		if ( $headers['x-final-location'] != $url )
-			$this->url_remap[$headers['x-final-location']] = $upload['url'];
-
-		return $upload;
-
-	}
-
-	// sort by strlen, longest string first
-	function cmpr_strlen($a, $b) {
-		return strlen($b) - strlen($a);
-	}
-
-	// update url references in post bodies to point to the new local files
-	function backfill_attachment_urls() {
-
-		// make sure we do the longest urls first, in case one is a substring of another
-		uksort($this->url_remap, array(&$this, 'cmpr_strlen'));
-
-		global $wpdb;
-		foreach ($this->url_remap as $from_url => $to_url) {
-			// remap urls in post_content
-			$wpdb->query( $wpdb->prepare("UPDATE {$wpdb->posts} SET post_content = REPLACE(post_content, '%s', '%s')", $from_url, $to_url) );
-			// remap enclosure urls
-			$result = $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->postmeta} SET meta_value = REPLACE(meta_value, '%s', '%s') WHERE meta_key='enclosure'", $from_url, $to_url) );
-		}
-	}
-
-	// update the post_parent of orphans now that we know the local id's of all parents
-	function backfill_parents() {
-		global $wpdb;
-
-		foreach ($this->orphans as $child_id => $parent_id) {
-			$local_child_id = $this->post_ids_processed[$child_id];
-			$local_parent_id = $this->post_ids_processed[$parent_id];
-			if ($local_child_id and $local_parent_id) {
-				$wpdb->query( $wpdb->prepare("UPDATE {$wpdb->posts} SET post_parent = %d WHERE ID = %d", $local_parent_id, $local_child_id));
-			}
-		}
-	}
-
-	function is_valid_meta_key($key) {
-		// skip _wp_attached_file metadata since we'll regenerate it from scratch
-		if ( $key == '_wp_attached_file' )
-			return false;
-		return $key;
-	}
-
-	// give the user the option of creating new users to represent authors in the import file?
-	function allow_create_users() {
-		return apply_filters('import_allow_create_users', true);
-	}
-
-	// give the user the option of downloading and importing attached files
-	function allow_fetch_attachments() {
-		return apply_filters('import_allow_fetch_attachments', true);
-	}
-
-	function max_attachment_size() {
-		// can be overridden with a filter - 0 means no limit
-		return apply_filters('import_attachment_size_limit', 0);
-	}
-
-	function import_start() {
-		wp_defer_term_counting(true);
-		wp_defer_comment_counting(true);
-		do_action('import_start');
-	}
-
-	function import_end() {
-		do_action('import_end');
-
-		// clear the caches after backfilling
-		foreach ($this->post_ids_processed as $post_id)
-			clean_post_cache($post_id);
-
-		wp_defer_term_counting(false);
-		wp_defer_comment_counting(false);
-	}
-
-	function import($id, $fetch_attachments = false) {
-		$this->id = (int) $id;
-		$this->fetch_attachments = ($this->allow_fetch_attachments() && (bool) $fetch_attachments);
-
-		add_filter('import_post_meta_key', array($this, 'is_valid_meta_key'));
-		$file = get_attached_file($this->id);
-		$this->import_file($file);
-	}
-
-	function import_file($file) {
-		$this->file = $file;
-
-		$this->import_start();
-		$this->get_authors_from_post();
-		wp_suspend_cache_invalidation(true);
-		$this->get_entries();
-		$this->process_categories();
-		$this->process_tags();
-		$result = $this->process_posts();
-		wp_suspend_cache_invalidation(false);
-		$this->backfill_parents();
-		$this->backfill_attachment_urls();
-		$this->import_end();
-
-		if ( is_wp_error( $result ) )
-			return $result;
-	}
-
-	function handle_upload() {
-		$file = wp_import_handle_upload();
-		if ( isset($file['error']) ) {
-			echo '<p>'.__('Sorry, there has been an error.').'</p>';
-			echo '<p><strong>' . $file['error'] . '</strong></p>';
-			return false;
-		}
-		$this->file = $file['file'];
-		$this->id = (int) $file['id'];
-		return true;
-	}
-
-	function dispatch() {
-		if (empty ($_GET['step']))
-			$step = 0;
-		else
-			$step = (int) $_GET['step'];
-
-		$this->header();
-		switch ($step) {
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				check_admin_referer('import-upload');
-				if ( $this->handle_upload() )
-					$this->select_authors();
-				break;
-			case 2:
-				check_admin_referer('import-wordpress');
-				$result = $this->import( $_GET['id'], $_POST['attachments'] );
-				if ( is_wp_error( $result ) )
-					echo $result->get_error_message();
-				break;
-		}
-		$this->footer();
-	}
-
-	function WP_Import() {
-		// Nothing.
-	}
-}
-
-/**
- * Register WordPress Importer
- *
- * @since unknown
- * @var WP_Import
- * @name $wp_import
- */
-$wp_import = new WP_Import();
-
-register_importer('wordpress', 'WordPress', __('Import <strong>posts, pages, comments, custom fields, categories, and tags</strong> from a WordPress export file.'), array ($wp_import, 'dispatch'));
-
-?>
diff -uNr a/mp-wp/wp-admin/import/wp-cat2tag.php b/mp-wp/wp-admin/import/wp-cat2tag.php
--- a/mp-wp/wp-admin/import/wp-cat2tag.php 8efafe653749909462bbdcf77f3a4ced3dd6aed05e15bbd4757603e8f74d393f0cb5dd74e4867c3360ed38bb44458836c0a692e8d5e98de8a2ff44efadcf0069
+++ b/mp-wp/wp-admin/import/wp-cat2tag.php false
@@ -1,476 +0,0 @@
-<?php
-/**
- * WordPress Categories to Tags Converter.
- *
- * @package WordPress
- * @subpackage Importer
- */
-
-/**
- * WordPress categories to tags converter class.
- *
- * Will convert WordPress categories to tags, removing the category after the
- * process is complete and updating all posts to switch to the tag.
- *
- * @since unknown
- */
-class WP_Categories_to_Tags {
-	var $categories_to_convert = array();
-	var $all_categories = array();
-	var $tags_to_convert = array();
-	var $all_tags = array();
-	var $hybrids_ids = array();
-
-	function header() {
-		echo '<div class="wrap">';
-		if ( ! current_user_can('manage_categories') ) {
-			echo '<div class="narrow">';
-			echo '<p>' . __('Cheatin&#8217; uh?') . '</p>';
-			echo '</div>';
-		} else { ?>
-			<div class="tablenav"><p style="margin:4px"><a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag"><?php _e( "Categories to Tags" ); ?></a>
-			<a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag&amp;step=3"><?php _e( "Tags to Categories" ); ?></a></p></div>
-<?php	}
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	function populate_cats() {
-
-		$categories = get_categories('get=all');
-		foreach ( $categories as $category ) {
-			$this->all_categories[] = $category;
-			if ( is_term( $category->slug, 'post_tag' ) )
-				$this->hybrids_ids[] = $category->term_id;
-		}
-	}
-
-	function populate_tags() {
-
-		$tags = get_terms( array('post_tag'), 'get=all' );
-		foreach ( $tags as $tag ) {
-			$this->all_tags[] = $tag;
-			if ( is_term( $tag->slug, 'category' ) )
-				$this->hybrids_ids[] = $tag->term_id;
-		}
-	}
-
-	function categories_tab() {
-		$this->populate_cats();
-		$cat_num = count($this->all_categories);
-
-		echo '<br class="clear" />';
-
-		if ( $cat_num > 0 ) {
-			screen_icon();
-			echo '<h2>' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '</h2>';
-			echo '<div class="narrow">';
-			echo '<p>' . __('Hey there. Here you can selectively convert existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>';
-			echo '<p>' . __('Keep in mind that if you convert a category with child categories, the children become top-level orphans.') . '</p></div>';
-
-			$this->categories_form();
-		} else {
-			echo '<p>'.__('You have no categories to convert!').'</p>';
-		}
-	}
-
-	function categories_form() { ?>
-
-<script type="text/javascript">
-/* <![CDATA[ */
-var checkflag = "false";
-function check_all_rows() {
-	field = document.catlist;
-	if ( 'false' == checkflag ) {
-		for ( i = 0; i < field.length; i++ ) {
-			if ( 'cats_to_convert[]' == field[i].name )
-				field[i].checked = true;
-		}
-		checkflag = 'true';
-		return '<?php _e('Uncheck All') ?>';
-	} else {
-		for ( i = 0; i < field.length; i++ ) {
-			if ( 'cats_to_convert[]' == field[i].name )
-				field[i].checked = false;
-		}
-		checkflag = 'false';
-		return '<?php _e('Check All') ?>';
-	}
-}
-/* ]]> */
-</script>
-
-<form name="catlist" id="catlist" action="admin.php?import=wp-cat2tag&amp;step=2" method="post">
-<p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_rows()" />
-<?php wp_nonce_field('import-cat2tag'); ?></p>
-<ul style="list-style:none">
-
-<?php	$hier = _get_term_hierarchy('category');
-
-		foreach ($this->all_categories as $category) {
-			$category = sanitize_term( $category, 'category', 'display' );
-
-			if ( (int) $category->parent == 0 ) { ?>
-
-	<li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($category->term_id); ?>" /> <?php echo $category->name . ' (' . $category->count . ')'; ?></label><?php
-
-				 if ( in_array( intval($category->term_id),  $this->hybrids_ids ) )
-				 	echo ' <a href="#note"> * </a>';
-
-				if ( isset($hier[$category->term_id]) )
-					$this->_category_children($category, $hier); ?></li>
-<?php		}
-		} ?>
-</ul>
-
-<?php	if ( ! empty($this->hybrids_ids) )
-			echo '<p><a name="note"></a>' . __('* This category is also a tag. Converting it will add that tag to all posts that are currently in the category.') . '</p>'; ?>
-
-<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Convert Categories to Tags'); ?>" /></p>
-</form>
-
-<?php }
-
-	function tags_tab() {
-		$this->populate_tags();
-		$tags_num = count($this->all_tags);
-
-		echo '<br class="clear" />';
-
-		if ( $tags_num > 0 ) {
-			screen_icon();
-			echo '<h2>' . sprintf( __ngettext( 'Convert Tag to Category.', 'Convert Tags (%d) to Categories.', $tags_num ), $tags_num ) . '</h2>';
-			echo '<div class="narrow">';
-			echo '<p>' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '</p>';
-			echo '<p>' . __('The newly created categories will still be associated with the same posts.') . '</p></div>';
-
-			$this->tags_form();
-		} else {
-			echo '<p>'.__('You have no tags to convert!').'</p>';
-		}
-	}
-
-	function tags_form() { ?>
-
-<script type="text/javascript">
-/* <![CDATA[ */
-var checktags = "false";
-function check_all_tagrows() {
-	field = document.taglist;
-	if ( 'false' == checktags ) {
-		for ( i = 0; i < field.length; i++ ) {
-			if ( 'tags_to_convert[]' == field[i].name )
-				field[i].checked = true;
-		}
-		checktags = 'true';
-		return '<?php _e('Uncheck All') ?>';
-	} else {
-		for ( i = 0; i < field.length; i++ ) {
-			if ( 'tags_to_convert[]' == field[i].name )
-				field[i].checked = false;
-		}
-		checktags = 'false';
-		return '<?php _e('Check All') ?>';
-	}
-}
-/* ]]> */
-</script>
-
-<form name="taglist" id="taglist" action="admin.php?import=wp-cat2tag&amp;step=4" method="post">
-<p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_tagrows()" />
-<?php wp_nonce_field('import-cat2tag'); ?></p>
-<ul style="list-style:none">
-
-<?php	foreach ( $this->all_tags as $tag ) { ?>
-	<li><label><input type="checkbox" name="tags_to_convert[]" value="<?php echo intval($tag->term_id); ?>" /> <?php echo attribute_escape($tag->name) . ' (' . $tag->count . ')'; ?></label><?php if ( in_array( intval($tag->term_id),  $this->hybrids_ids ) ) echo ' <a href="#note"> * </a>'; ?></li>
-
-<?php	} ?>
-</ul>
-
-<?php	if ( ! empty($this->hybrids_ids) )
-			echo '<p><a name="note"></a>' . __('* This tag is also a category. When converted, all posts associated with the tag will also be in the category.') . '</p>'; ?>
-
-<p class="submit"><input type="submit" name="submit_tags" class="button" value="<?php _e('Convert Tags to Categories'); ?>" /></p>
-</form>
-
-<?php }
-
-	function _category_children($parent, $hier) { ?>
-
-		<ul style="list-style:none">
-<?php	foreach ($hier[$parent->term_id] as $child_id) {
-			$child =& get_category($child_id); ?>
-		<li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($child->term_id); ?>" /> <?php echo $child->name . ' (' . $child->count . ')'; ?></label><?php
-
-			if ( in_array( intval($child->term_id), $this->hybrids_ids ) )
-				echo ' <a href="#note"> * </a>';
-
-			if ( isset($hier[$child->term_id]) )
-				$this->_category_children($child, $hier); ?></li>
-<?php	} ?>
-		</ul><?php
-	}
-
-	function _category_exists($cat_id) {
-		$cat_id = (int) $cat_id;
-
-		$maybe_exists = category_exists($cat_id);
-
-		if ( $maybe_exists ) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	function convert_categories() {
-		global $wpdb;
-
-		if ( (!isset($_POST['cats_to_convert']) || !is_array($_POST['cats_to_convert'])) && empty($this->categories_to_convert)) { ?>
-			<div class="narrow">
-			<p><?php printf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag'); ?></p>
-			</div>
-<?php		return;
-		}
-
-		if ( empty($this->categories_to_convert) )
-			$this->categories_to_convert = $_POST['cats_to_convert'];
-
-		$hier = _get_term_hierarchy('category');
-		$hybrid_cats = $clear_parents = $parents = false;
-		$clean_term_cache = $clean_cat_cache = array();
-		$default_cat = get_option('default_category');
-
-		echo '<ul>';
-
-		foreach ( (array) $this->categories_to_convert as $cat_id) {
-			$cat_id = (int) $cat_id;
-
-			if ( ! $this->_category_exists($cat_id) ) {
-				echo '<li>' . sprintf( __('Category %s doesn\'t exist!'),  $cat_id ) . "</li>\n";
-			} else {
-				$category =& get_category($cat_id);
-				echo '<li>' . sprintf(__('Converting category <strong>%s</strong> ... '),  $category->name);
-
-				// If the category is the default, leave category in place and create tag.
-				if ( $default_cat == $category->term_id ) {
-
-					if ( ! ($id = is_term( $category->slug, 'post_tag' ) ) )
-						$id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug));
-
-					$id = $id['term_taxonomy_id'];
-					$posts = get_objects_in_term($category->term_id, 'category');
-					$term_order = 0;
-
-					foreach ( $posts as $post ) {
-						$values[] = $wpdb->prepare( "(%d, %d, %d)", $post, $id, $term_order);
-						clean_post_cache($post);
-					}
-
-					if ( $values ) {
-						$wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
-
-						$wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET count = %d WHERE term_id = %d AND taxonomy = 'post_tag'", $category->count, $category->term_id) );
-					}
-
-					echo __('Converted successfully.') . "</li>\n";
-					continue;
-				}
-
-				// if tag already exists, add it to all posts in the category
-				if ( $tag_ttid = $wpdb->get_var( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $category->term_id) ) ) {
-					$objects_ids = get_objects_in_term($category->term_id, 'category');
-					$tag_ttid = (int) $tag_ttid;
-					$term_order = 0;
-
-					foreach ( $objects_ids as $object_id )
-						$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tag_ttid, $term_order);
-
-					if ( $values ) {
-						$wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
-
-						$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tag_ttid) );
-						$wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET count = %d WHERE term_id = %d AND taxonomy = 'post_tag'", $count, $category->term_id) );
-					}
-					echo __('Tag added to all posts in this category.') . " *</li>\n";
-
-					$hybrid_cats = true;
-					$clean_term_cache[] = $category->term_id;
-					$clean_cat_cache[] = $category->term_id;
-
-					continue;
-				}
-
-				$tt_ids = $wpdb->get_col( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'category'", $category->term_id) );
-				if ( $tt_ids ) {
-					$posts = $wpdb->get_col("SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id IN (" . join(',', $tt_ids) . ") GROUP BY object_id");
-					foreach ( (array) $posts as $post )
-						clean_post_cache($post);
-				}
-
-				// Change the category to a tag.
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET taxonomy = 'post_tag' WHERE term_id = %d AND taxonomy = 'category'", $category->term_id) );
-
-				// Set all parents to 0 (root-level) if their parent was the converted tag
-				$parents = $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET parent = 0 WHERE parent = %d AND taxonomy = 'category'", $category->term_id) );
-
-				if ( $parents ) $clear_parents = true;
-				$clean_cat_cache[] = $category->term_id;
-				echo __('Converted successfully.') . "</li>\n";
-			}
-		}
-		echo '</ul>';
-
-		if ( ! empty($clean_term_cache) ) {
-			$clean_term_cache = array_unique(array_values($clean_term_cache));
-			foreach ( $clean_term_cache as $id )
-				wp_cache_delete($id, 'post_tag');
-		}
-
-		if ( ! empty($clean_cat_cache) ) {
-			$clean_cat_cache = array_unique(array_values($clean_cat_cache));
-			foreach ( $clean_cat_cache as $id )
-				wp_cache_delete($id, 'category');
-		}
-
-		if ( $clear_parents ) delete_option('category_children');
-
-		if ( $hybrid_cats )
-			echo '<p>' . sprintf( __('* This category is also a tag. The converter has added that tag to all posts currently in the category. If you want to remove it, please confirm that all tags were added successfully, then delete it from the <a href="%s">Manage Categories</a> page.'), 'categories.php') . '</p>';
-		echo '<p>' . sprintf( __('We&#8217;re all done here, but you can always <a href="%s">convert more</a>.'), 'admin.php?import=wp-cat2tag' ) . '</p>';
-	}
-
-	function convert_tags() {
-		global $wpdb;
-
-		if ( (!isset($_POST['tags_to_convert']) || !is_array($_POST['tags_to_convert'])) && empty($this->tags_to_convert)) {
-			echo '<div class="narrow">';
-			echo '<p>' . sprintf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag&amp;step=3') . '</p>';
-			echo '</div>';
-			return;
-		}
-
-		if ( empty($this->tags_to_convert) )
-			$this->tags_to_convert = $_POST['tags_to_convert'];
-
-		$hybrid_tags = $clear_parents = false;
-		$clean_cat_cache = $clean_term_cache = array();
-		$default_cat = get_option('default_category');
-		echo '<ul>';
-
-		foreach ( (array) $this->tags_to_convert as $tag_id) {
-			$tag_id = (int) $tag_id;
-
-			if ( $tag = get_term( $tag_id, 'post_tag' ) ) {
-				printf('<li>' . __('Converting tag <strong>%s</strong> ... '),  $tag->name);
-
-				if ( $cat_ttid = $wpdb->get_var( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'category'", $tag->term_id) ) ) {
-					$objects_ids = get_objects_in_term($tag->term_id, 'post_tag');
-					$cat_ttid = (int) $cat_ttid;
-					$term_order = 0;
-
-					foreach ( $objects_ids as $object_id ) {
-						$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $cat_ttid, $term_order);
-						clean_post_cache($object_id);
-					}
-
-					if ( $values ) {
-						$wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
-
-						if ( $default_cat != $tag->term_id ) {
-							$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tag->term_id) );
-							$wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET count = %d WHERE term_id = %d AND taxonomy = 'category'", $count, $tag->term_id) );
-						}
-					}
-
-					$hybrid_tags = true;
-					$clean_term_cache[] = $tag->term_id;
-					$clean_cat_cache[] = $tag->term_id;
-					echo __('All posts were added to the category with the same name.') . " *</li>\n";
-
-					continue;
-				}
-
-				// Change the tag to a category.
-				$parent = $wpdb->get_var( $wpdb->prepare("SELECT parent FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $tag->term_id) );
-				if ( 0 == $parent || (0 < (int) $parent && $this->_category_exists($parent)) ) {
-					$reset_parent = '';
-					$clear_parents = true;
-				} else
-					$reset_parent = ", parent = '0'";
-
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET taxonomy = 'category' $reset_parent WHERE term_id = %d AND taxonomy = 'post_tag'", $tag->term_id) );
-
-				$clean_term_cache[] = $tag->term_id;
-				$clean_cat_cache[] = $cat['term_id'];
-				echo __('Converted successfully.') . "</li>\n";
-
-			} else {
-				printf( '<li>' . __('Tag #%s doesn\'t exist!') . "</li>\n",  $tag_id );
-			}
-		}
-
-		if ( ! empty($clean_term_cache) ) {
-			$clean_term_cache = array_unique(array_values($clean_term_cache));
-			foreach ( $clean_term_cache as $id )
-				wp_cache_delete($id, 'post_tag');
-		}
-
-		if ( ! empty($clean_cat_cache) ) {
-			$clean_cat_cache = array_unique(array_values($clean_cat_cache));
-			foreach ( $clean_cat_cache as $id )
-				wp_cache_delete($id, 'category');
-		}
-
-		if ( $clear_parents ) delete_option('category_children');
-
-		echo '</ul>';
-		if ( $hybrid_tags )
-			echo '<p>' . sprintf( __('* This tag is also a category. The converter has added all posts from it to the category. If you want to remove it, please confirm that all posts were added successfully, then delete it from the <a href="%s">Manage Tags</a> page.'), 'edit-tags.php') . '</p>';
-		echo '<p>' . sprintf( __('We&#8217;re all done here, but you can always <a href="%s">convert more</a>.'), 'admin.php?import=wp-cat2tag&amp;step=3' ) . '</p>';
-	}
-
-	function init() {
-
-		$step = (isset($_GET['step'])) ? (int) $_GET['step'] : 1;
-
-		$this->header();
-
-		if ( current_user_can('manage_categories') ) {
-
-			switch ($step) {
-				case 1 :
-					$this->categories_tab();
-				break;
-
-				case 2 :
-					check_admin_referer('import-cat2tag');
-					$this->convert_categories();
-				break;
-
-				case 3 :
-					$this->tags_tab();
-				break;
-
-				case 4 :
-					check_admin_referer('import-cat2tag');
-					$this->convert_tags();
-				break;
-			}
-		}
-
-		$this->footer();
-	}
-
-	function WP_Categories_to_Tags() {
-		// Do nothing.
-	}
-}
-
-$wp_cat2tag_importer = new WP_Categories_to_Tags();
-
-register_importer('wp-cat2tag', __('Categories and Tags Converter'), __('Convert existing categories to tags or tags to categories, selectively.'), array(&$wp_cat2tag_importer, 'init'));
-
-?>
diff -uNr a/mp-wp/wp-admin/import.php b/mp-wp/wp-admin/import.php
--- a/mp-wp/wp-admin/import.php 897774b9d3f8540845fb15ecee11b90e2afe56017750628c7b28a28f10cd15bfacc4d640da4407d1064d28bf868f01df283cfbf144468affd79f08588b7d09e1
+++ b/mp-wp/wp-admin/import.php false
@@ -1,73 +0,0 @@
-<?php
-/**
- * Import WordPress Administration Panel
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** Load WordPress Bootstrap */
-require_once ('admin.php');
-$title = __('Import');
-require_once ('admin-header.php');
-$parent_file = 'tools.php';
-?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
-<p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p>
-
-<?php
-
-// Load all importers so that they can register.
-$import_loc = 'wp-admin/import';
-$import_root = ABSPATH.$import_loc;
-$imports_dir = @ opendir($import_root);
-if ($imports_dir) {
-	while (($file = readdir($imports_dir)) !== false) {
-		if ($file{0} == '.') {
-			continue;
-		} elseif (substr($file, -4) == '.php') {
-			require_once($import_root . '/' . $file);
-		}
-	}
-}
-@closedir($imports_dir);
-
-$importers = get_importers();
-
-if (empty ($importers)) {
-	echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful
-} else {
-?>
-<table class="widefat" cellspacing="0">
-
-<?php
-	$style = '';
-	foreach ($importers as $id => $data) {
-		$style = ('class="alternate"' == $style || 'class="alternate active"' == $style) ? '' : 'alternate';
-		$action = "<a href='admin.php?import=$id' title='".wptexturize(strip_tags($data[1]))."'>{$data[0]}</a>";
-
-		if ($style != '')
-			$style = 'class="'.$style.'"';
-		echo "
-			<tr $style>
-				<td class='import-system row-title'>$action</td>
-				<td class='desc'>{$data[1]}</td>
-			</tr>";
-	}
-?>
-
-</table>
-<?php
-}
-?>
-
-</div>
-
-<?php
-
-include ('admin-footer.php');
-?>
-
diff -uNr a/mp-wp/wp-admin/includes/class-pclzip.php b/mp-wp/wp-admin/includes/class-pclzip.php
--- a/mp-wp/wp-admin/includes/class-pclzip.php 00f67e82c1c9704c47e73c6ef538b2a3859b0e79a9c39e74b0bfa5ff2e2aa11db6ac811f8a0702f08ed373846f650ecec2c2224c72ada4bd67a7cb6a818ca3df
+++ b/mp-wp/wp-admin/includes/class-pclzip.php false
@@ -1,5759 +0,0 @@
-<?php
-/**
- * PhpConcept Library - Zip Module 2.5
- *
- * Presentation :
- *   PclZip is a PHP library that manage ZIP archives.
- *   So far tests show that archives generated by PclZip are readable by
- *   WinZip application and other tools.
- *
- * Warning :
- *   This library and the associated files are non commercial, non professional
- *   work.
- *   It should not have unexpected results. However if any damage is caused by
- *   this software the author can not be responsible.
- *   The use of this software is at the risk of the user.
- *
- * @package External
- * @subpackage PclZip
- *
- * @license License GNU/LGPL
- * @copyright March 2006 Vincent Blavet
- * @author Vincent Blavet
- * @link http://www.phpconcept.net
- * @version $Id: pclzip.lib.php,v 1.44 2006/03/08 21:23:59 vblavet Exp $
- */
-
-/**
- * The read block size for reading zip files.
- *
- * @since 2.5
- */
-define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
-
-/**
- * File list separator
- *
- * In version 1.x of PclZip, the separator for file list is a space(which is not
- * a very smart choice, specifically for windows paths !). A better separator
- * should be a comma (,). This constant gives you the abilty to change that.
- *
- * However notice that changing this value, may have impact on existing scripts,
- * using space separated filenames. Recommanded values for compatibility with
- * older versions :
- * <code>define( 'PCLZIP_SEPARATOR', ' ' );</code>
- * Recommanded values for smart separation of filenames.
- */
-define( 'PCLZIP_SEPARATOR', ',' );
-
-/**
- * Error configuration
- *
- * 0 : PclZip Class integrated error handling
- * 1 : PclError external library error handling. By enabling this you must
- *     ensure that you have included PclError library.
- * [2,...] : reserved for future use
- */
-define( 'PCLZIP_ERROR_EXTERNAL', 0 );
-
-  // ----- Optional static temporary directory
-  //       By default temporary files are generated in the script current
-  //       path.
-  //       If defined :
-  //       - MUST BE terminated by a '/'.
-  //       - MUST be a valid, already created directory
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  define( 'PCLZIP_TEMPORARY_DIR', '' );
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
-// --------------------------------------------------------------------------------
-
-  // ----- Global variables
-  $g_pclzip_version = "2.5";
-
-  // ----- Error codes
-  //   -1 : Unable to open file in binary write mode
-  //   -2 : Unable to open file in binary read mode
-  //   -3 : Invalid parameters
-  //   -4 : File does not exist
-  //   -5 : Filename is too long (max. 255)
-  //   -6 : Not a valid zip file
-  //   -7 : Invalid extracted file size
-  //   -8 : Unable to create directory
-  //   -9 : Invalid archive extension
-  //  -10 : Invalid archive format
-  //  -11 : Unable to delete file (unlink)
-  //  -12 : Unable to rename file (rename)
-  //  -13 : Invalid header checksum
-  //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
-
-  // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
-  // Having big trouble with crypt. Need to multiply 2 long int
-  // which is not correctly supported by PHP ...
-  //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-
-  // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-
-  // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
-  /* For future use
-  define( 'PCLZIP_CB_PRE_LIST', 78005 );
-  define( 'PCLZIP_CB_POST_LIST', 78006 );
-  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
-  define( 'PCLZIP_CB_POST_DELETE', 78008 );
-  */
-
-  // --------------------------------------------------------------------------------
-  // Class : PclZip
-  // Description :
-  //   PclZip is the class that represent a Zip archive.
-  //   The public methods allow the manipulation of the archive.
-  // Attributes :
-  //   Attributes must not be accessed directly.
-  // Methods :
-  //   PclZip() : Object creator
-  //   create() : Creates the Zip archive
-  //   listContent() : List the content of the Zip archive
-  //   extract() : Extract the content of the archive
-  //   properties() : List the properties of the archive
-  // --------------------------------------------------------------------------------
-  class PclZip
-  {
-    // ----- Filename of the zip file
-    var $zipname = '';
-
-    // ----- File descriptor of the zip file
-    var $zip_fd = 0;
-
-    // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
-
-    // ----- Current status of the magic_quotes_runtime
-    // This value store the php configuration for magic_quotes
-    // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZip()
-  // Description :
-  //   Creates a PclZip object and set the name of the associated Zip archive
-  //   filename.
-  //   Note that no real action is taken, if the archive does not exist it is not
-  //   created. Use create() for that.
-  // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::PclZip', "zipname=$p_zipname");
-
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 1, "zlib extension seems to be missing");
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
-
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->magic_quotes_status = -1;
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 1);
-    return;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   create($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two different synopsis. The first one is historical.
-  //   This method creates a Zip Archive. The Zip file is created in the
-  //   filesystem. The files and directories indicated in $p_filelist
-  //   are added in the archive. See the parameters description for the
-  //   supported format of $p_filelist.
-  //   When a directory is in the list, the directory and its content is added
-  //   in the archive.
-  //   In this synopsis, the function takes an optional variable list of
-  //   options. See bellow the supported options.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function create($p_filelist)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::create', "filelist='$p_filelist', ...");
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options detected");
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis");
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Invalid number / type of arguments");
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-          return 0;
-        }
-      }
-    }
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return 0;
-    }
-
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Ignore an empty filename");
-        }
-      }
-    }
-
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return 0;
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_result_list);
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   add($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This methods add the list of files in an existing archive.
-  //   If a file with the same name already exists, it is added at the end of the
-  //   archive, the first one is still present.
-  //   If the archive does not exist, it is created.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_OPT_ADD_COMMENT :
-  //   PCLZIP_OPT_PREPEND_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function add($p_filelist)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::add', "filelist='$p_filelist', ...");
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options detected");
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-												   ));
-        if ($v_result != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis");
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-          return 0;
-        }
-      }
-    }
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return 0;
-    }
-
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
-
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return 0;
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_result_list);
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : listContent()
-  // Description :
-  //   This public method, gives the list of the files and directories, with their
-  //   properties.
-  //   The properties of each entries in the list are (used also in other functions) :
-  //     filename : Name of the file. For a create or add action it is the filename
-  //                given by the user. For an extract function it is the filename
-  //                of the extracted file.
-  //     stored_filename : Name of the file / directory stored in the archive.
-  //     size : Size of the stored file.
-  //     compressed_size : Size of the file's data compressed in the archive
-  //                       (without the headers overhead)
-  //     mtime : Last known modification date of the file (UNIX timestamp)
-  //     comment : Comment associated with the file
-  //     folder : true | false
-  //     index : index of the file in the archive
-  //     status : status of the action (depending of the action) :
-  //              Values are :
-  //                ok : OK !
-  //                filtered : the file / dir is not extracted (filtered by user)
-  //                already_a_directory : the file can not be extracted because a
-  //                                      directory with the same name already exists
-  //                write_protected : the file can not be extracted because a file
-  //                                  with the same name already exists and is
-  //                                  write protected
-  //                newer_exist : the file was not extracted because a newer file exists
-  //                path_creation_fail : the file is not extracted because the folder
-  //                                     does not exists and can not be created
-  //                write_error : the file was not extracted because there was a
-  //                              error while writing the file
-  //                read_error : the file was not extracted because there was a error
-  //                             while reading the file
-  //                invalid_header : the file was not extracted because of an archive
-  //                                 format error (bad file header)
-  //   Note that each time a method can continue operating when there
-  //   is an action error on a file, the error is only logged in the file status.
-  // Return Values :
-  //   0 on an unrecoverable failure,
-  //   The list of the files in the archive.
-  // --------------------------------------------------------------------------------
-  function listContent()
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::listContent', "");
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return(0);
-    }
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo());
-      return(0);
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extract($p_path="./", $p_remove_path="")
-  //   extract([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method extract all the files / directories from the archive to the
-  //   folder indicated in $p_path.
-  //   If you want to ignore the 'root' part of path of the memorized files
-  //   you can indicate this in the optional $p_remove_path parameter.
-  //   By default, if a newer file with the same name already exists, the
-  //   file is not extracted.
-  //
-  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
-  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
-  //   at the end of the path value of PCLZIP_OPT_PATH.
-  // Parameters :
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 or a negative value on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function extract()
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::extract", "");
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options");
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional'
-												    ));
-        if ($v_result != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis");
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo());
-          return 0;
-        }
-      }
-    }
-
-    // ----- Trace
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "path='$v_path', remove_path='$v_remove_path', remove_all_path='".($v_remove_path?'true':'false')."'");
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-	                                     $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo());
-      return(0);
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
-  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method is doing a partial extract of the archive.
-  //   The extracted files or folders are identified by their index in the
-  //   archive (from 0 to n).
-  //   Note that if the index identify a folder, only the folder entry is
-  //   extracted, not all the files included in the archive.
-  // Parameters :
-  //   $p_index : A single index (integer) or a string of indexes of files to
-  //              extract. The form of the string is "0,4-6,8-12" with only numbers
-  //              and '-' for range or ',' to separate ranges. No spaces or ';'
-  //              are allowed.
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
-  //     not as files.
-  //     The resulting content is in a new field 'content' in the file
-  //     structure.
-  //     This option must be used alone (any other options are ignored).
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  //function extractByIndex($p_index, options...)
-  function extractByIndex($p_index)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::extractByIndex", "index='$p_index', ...");
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options");
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional'
-												   ));
-        if ($v_result != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Option PCLZIP_OPT_EXTRACT_AS_STRING not set.");
-        }
-        else {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Option PCLZIP_OPT_EXTRACT_AS_STRING set.");
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis");
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-          return 0;
-        }
-      }
-    }
-
-    // ----- Trace
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "index='$p_index', path='$v_path', remove_path='$v_remove_path', remove_all_path='".($v_remove_path?'true':'false')."'");
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
-
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo());
-        return(0);
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   delete([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method removes files from the archive.
-  //   If no parameters are given, then all the archive is emptied.
-  // Parameters :
-  //   None or optional arguments.
-  // Options :
-  //   PCLZIP_OPT_BY_INDEX :
-  //   PCLZIP_OPT_BY_NAME :
-  //   PCLZIP_OPT_BY_EREG :
-  //   PCLZIP_OPT_BY_PREG :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the files which are still present in the archive.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function delete()
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::delete", "");
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-          return 0;
-      }
-    }
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo());
-      return(0);
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_list);
-    return $v_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : deleteByIndex()
-  // Description :
-  //   ***** Deprecated *****
-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
-  // --------------------------------------------------------------------------------
-  function deleteByIndex($p_index)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::deleteByIndex", "index='$p_index'");
-
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : properties()
-  // Description :
-  //   This method gives the properties of the archive.
-  //   The properties are :
-  //     nb : Number of files in the archive
-  //     comment : Comment associated with the archive file
-  //     status : not_exist, ok
-  // Parameters :
-  //   None
-  // Return Values :
-  //   0 on failure,
-  //   An array with the archive properties.
-  // --------------------------------------------------------------------------------
-  function properties()
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::properties", "");
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return(0);
-    }
-
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-        // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), 0);
-        return 0;
-      }
-
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-        return 0;
-      }
-
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_prop);
-    return $v_prop;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : duplicate()
-  // Description :
-  //   This method creates an archive by copying the content of an other one. If
-  //   the archive already exist, it is replaced by the new one without any warning.
-  // Parameters :
-  //   $p_archive : The filename of a valid archive, or
-  //                a valid PclZip object.
-  // Return Values :
-  //   1 on success.
-  //   0 or a negative value on error (error code).
-  // --------------------------------------------------------------------------------
-  function duplicate($p_archive)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::duplicate", "");
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The parameter is valid PclZip object '".$p_archive->zipname."'");
-
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
-
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The parameter is a filename '$p_archive'");
-
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : merge()
-  // Description :
-  //   This method merge the $p_archive_to_add archive at the end of the current
-  //   one ($this).
-  //   If the archive ($this) does not exist, the merge becomes a duplicate.
-  //   If the $p_archive_to_add archive does not exist, the merge is a success.
-  // Parameters :
-  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
-  //                       or a PclZip object archive.
-  // Return Values :
-  //   1 on success,
-  //   0 or negative values on error (see below).
-  // --------------------------------------------------------------------------------
-  function merge($p_archive_to_add)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::merge", "");
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
-      return(0);
-    }
-
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The parameter is valid PclZip object");
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
-
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The parameter is a filename");
-
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : errorCode()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorCode()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorName()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
-  {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
-
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorInfo()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
-// *****                                                        *****
-// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
-// --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFormat()
-  // Description :
-  //   This method check that the archive exists and is a valid zip archive.
-  //   Several level of check exists. (futur)
-  // Parameters :
-  //   $p_level : Level of check. Default 0.
-  //              0 : Check the first bytes (magic codes) (default value))
-  //              1 : 0 + Check the central directory (futur)
-  //              2 : 1 + Check each file header (futur)
-  // Return Values :
-  //   true on success,
-  //   false on error, the error code is set.
-  // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCheckFormat", "");
-    $v_result = true;
-
-	// ----- Reset the file system cache
-    clearstatcache();
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, false, PclZip::errorInfo());
-      return(false);
-    }
-
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, false, PclZip::errorInfo());
-      return(false);
-    }
-
-    // ----- Check the magic code
-    // TBC
-
-    // ----- Check the central header
-    // TBC
-
-    // ----- Check each file header
-    // TBC
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privParseOptions()
-  // Description :
-  //   This internal methods reads the variable list of arguments ($p_options_list,
-  //   $p_size) and generate an array with the options and values ($v_result_list).
-  //   $v_requested_options contains the options that can be present and those that
-  //   must be present.
-  //   $v_requested_options is an array, with the option value as key, and 'optional',
-  //   or 'mandatory' as value.
-  // Parameters :
-  //   See above.
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privParseOptions", "");
-    $v_result=1;
-
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Looking for table index $i, option = '".PclZipUtilOptionText($p_options_list[$i])."(".$p_options_list[$i].")'");
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
-
-        // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
-          $i++;
-        break;
-
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false);
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
-            $i++;
-          }
-          else {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." set with an empty value is ignored.");
-          }
-        break;
-
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-          ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-			                     "Missing parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-			                     "Wrong parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Index value is a string '".$p_options_list[$i+1]."'");
-
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
-
-              // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Index value is an integer '".$p_options_list[$i+1]."'");
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Index value is an array");
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
-
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
-
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-                  return PclZip::errorCode();
-              }
-
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extracted index item = [".$v_result_list[$p_options_list[$i]][$j]['start'].",".$v_result_list[$p_options_list[$i]][$j]['end']."]");
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The list should be sorted ...");
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
-
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "List sorting is not yet write ...");
-          }
-
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
-        case PCLZIP_CB_PRE_DELETE :
-        case PCLZIP_CB_POST_DELETE :
-        case PCLZIP_CB_PRE_LIST :
-        case PCLZIP_CB_POST_LIST :
-        */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "call-back ".PclZipUtilOptionText($p_options_list[$i])." = '".$v_function_name."'");
-
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Unknown parameter '"
-							   .$p_options_list[$i]."'");
-
-          // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-          return PclZip::errorCode();
-      }
-
-      // ----- Next options
-      $i++;
-    }
-
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Detect a mandatory option : ".PclZipUtilOptionText($key)."(".$key.")");
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrParseAtt()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privFileDescrParseAtt", "");
-    $v_result=1;
-
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
-
-        // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($v_key)." = '".$v_value."'");
-
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($v_key)." = '".$v_value."'");
-
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($v_key)." = '".$v_value."'");
-
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-          }
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                           "Unknown parameter '".$v_key."'");
-
-          // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-          return PclZip::errorCode();
-      }
-
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Detect a mandatory option : ".PclZipUtilOptionText($key)."(".$key.")");
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
-
-    // end foreach
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrExpand()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privFileDescrExpand", "");
-    $v_result=1;
-
-    // ----- Create a result list
-    $v_result_list = array();
-
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
-
-      // ----- Reduce the filename
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filedescr before reduction :'".$v_descr['filename']."'");
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename']);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filedescr after reduction :'".$v_descr['filename']."'");
-
-      // ----- Get type of descr
-      if (!file_exists($v_descr['filename'])) {
-        // ----- Error log
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$v_descr['filename']."' does not exists");
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exists");
-
-        // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-        return PclZip::errorCode();
-      }
-      if (@is_file($v_descr['filename'])) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "This is a file");
-        $v_descr['type'] = 'file';
-      }
-      else if (@is_dir($v_descr['filename'])) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "This is a folder");
-        $v_descr['type'] = 'folder';
-      }
-      else if (@is_link($v_descr['filename'])) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Unsupported file type : link");
-        // skip
-        continue;
-      }
-      else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Unsupported file type : unknown type");
-        // skip
-        continue;
-      }
-
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
-
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
-
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Looking for '".$v_item_handler."' in the directory");
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
-
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if ($v_descr['stored_filename'] != $v_descr['filename']) {
-              $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-            }
-
-            $v_dirlist_nb++;
-          }
-        }
-        else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to open dir '".$v_descr['filename']."' in read mode. Skipped.");
-          // TBC : unable to open folder in read mode
-        }
-
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-            return $v_result;
-          }
-
-          // ----- Concat the resulting list
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Merging result list (size '".sizeof($v_result_list)."') with dirlist (size '".sizeof($v_dirlist_descr)."')");
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "merged result list is size '".sizeof($v_result_list)."'");
-        }
-        else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Nothing in this folder to expand.");
-        }
-
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
-
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCreate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCreate", "list");
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAdd()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAdd", "list");
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Archive does not exist, or is empty, create it.");
-
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in file : ".ftell($this->zip_fd)."'");
-    @rewind($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in file : ".ftell($this->zip_fd)."'");
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "New offset of central dir : $v_offset");
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOpenFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privOpenFd($p_mode)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privOpenFd", 'mode='.$p_mode);
-    $v_result=1;
-
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Open file in '.$p_mode.' mode');
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCloseFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privCloseFd()
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCloseFd", "");
-    $v_result=1;
-
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
-  //   running in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // --------------------------------------------------------------------------------
-//  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
-  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddList", "list");
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileList()
-  // Description :
-  // Parameters :
-  //   $p_filedescr_list : An array containing the file description
-  //                      or directory names to add in the zip
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddFileList", "filedescr_list");
-    $v_result=1;
-    $v_header = array();
-
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Before add, list have ".$v_nb." elements");
-
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
-
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Looking for file '".$p_filedescr_list[$j]['filename']."'");
-
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Skip empty filename");
-        continue;
-      }
-
-      // ----- Check the filename
-      if (!file_exists($p_filedescr_list[$j]['filename'])) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$p_filedescr_list[$j]['filename']."' does not exists");
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exists");
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-        return PclZip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all path remove option
-      if (   (is_file($p_filedescr_list[$j]['filename']))
-          || (   is_dir($p_filedescr_list[$j]['filename'])
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "After add, list have ".$v_nb." elements");
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFile($p_filedescr, &$p_header, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddFile", "filename='".$p_filedescr['filename']."'");
-    $v_result=1;
-
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Look for a stored different filename
-    if (isset($p_filedescr['stored_filename'])) {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 'Stored filename is NOT the same "'.$v_stored_filename.'"');
-    }
-    else {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 'Stored filename is the same');
-    }
-
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['mtime'] = filemtime($p_filename);
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['size'] = filesize($p_filename);
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['comment_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-//    $p_header['external'] = (is_file($p_filename)?0xFE49FFE0:0x41FF0010);
-    $p_header['external'] = (is_file($p_filename)?0x00000000:0x00000010);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header external extension '".sprintf("0x%X",$p_header['external'])."'");
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
-    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['extra'] = '';
-    $p_header['comment'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A pre-callback '".$p_options[PCLZIP_CB_PRE_ADD]."()') is defined for the extraction");
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New stored filename is '".$p_header['stored_filename']."'");
-      }
-    }
-
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
-
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
-
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
-
-      // ----- Look for a file
-      if (is_file($p_filename))
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "'".$p_filename."' is a file");
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-          return PclZip::errorCode();
-        }
-
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File will not be compressed");
-          // ----- Read the file content
-          $v_content_compressed = @fread($v_file, $p_header['size']);
-
-          // ----- Calculate the CRC
-          $p_header['crc'] = @crc32($v_content_compressed);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File will be compressed");
-          // ----- Read the file content
-          $v_content = @fread($v_file, $p_header['size']);
-
-          // ----- Calculate the CRC
-          $p_header['crc'] = @crc32($v_content);
-
-          // ----- Compress the file
-          $v_content_compressed = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content_compressed);
-          $p_header['compression'] = 8;
-        }
-
-        // ----- Look for encryption
-        /*
-        if ((isset($p_options[PCLZIP_OPT_CRYPT]))
-		    && ($p_options[PCLZIP_OPT_CRYPT] != "")) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File need to be crypted ....");
-
-          // Should be a random header
-          $v_header = 'xxxxxxxxxxxx';
-	      $v_content_compressed = PclZipUtilZipEncrypt($v_content_compressed,
-		                                           $p_header['compressed_size'],
-	                                               $v_header,
-												   $p_header['crc'],
-												   "test");
-
-          $p_header['compressed_size'] += 12;
-          $p_header['flag'] = 1;
-
-          // ----- Add the header to the data
-          $v_content_compressed = $v_header.$v_content_compressed;
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Size after header : ".strlen($v_content_compressed)."");
-        }
-        */
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-          return $v_result;
-        }
-
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd,
-		            $v_content_compressed, $p_header['compressed_size']);
-
-        // ----- Close the file
-        @fclose($v_file);
-      }
-
-      // ----- Look for a directory
-      else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "'".$p_filename."' is a folder");
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
-        }
-
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A post-callback '".$p_options[PCLZIP_CB_POST_ADD]."()') is defined for the extraction");
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Nothing can be modified
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCalculateStoredFilename()
-  // Description :
-  //   Based on file descriptor properties and global options, this method
-  //   calculate the filename that will be stored in the archive.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCalculateStoredFilename", "filename='".$p_filedescr['filename']."'");
-    $v_result=1;
-
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
-      $p_remove_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
-      $p_remove_all_dir = 0;
-    }
-
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      $v_stored_filename = $p_filedescr['new_full_name'];
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Changing full name of '".$p_filename."' for '".$v_stored_filename."'");
-    }
-
-    // ----- Look for path and/or short name change
-    else {
-
-      // ----- Look for short name change
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Changing short name of '".$p_filename."' for '".$v_stored_filename."'");
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
-
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Remove all path selected change '".$p_filename."' for '".$v_stored_filename."'");
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
-
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
-
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
-
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Path to remove is the current folder");
-          }
-          else {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Remove path '$p_remove_dir' in file '$v_stored_filename'");
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Result is '$v_stored_filename'");
-          }
-        }
-      }
-      // ----- Look for path to add
-      if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_filename' = '$v_stored_filename'");
-      }
-    }
-
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Stored filename will be '".$p_filedescr['stored_filename']."', strlen ".strlen($p_filedescr['stored_filename']));
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteFileHeader(&$p_header)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privWriteFileHeader", 'file="'.$p_header['filename'].'", stored as "'.$p_header['stored_filename'].'"');
-    $v_result=1;
-
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 'File offset of the header :'.$p_header['offset']);
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-	                      $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
-						  $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len']);
-
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralFileHeader(&$p_header)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privWriteCentralFileHeader", 'file="'.$p_header['filename'].'", stored as "'.$p_header['stored_filename'].'"');
-    $v_result=1;
-
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "header[$key] = ".$p_header[$key]);
-    //}
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-	                      $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
-						  $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
-						  $p_header['external'], $p_header['offset']);
-
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privWriteCentralHeader", 'nb_entries='.$p_nb_entries.', size='.$p_size.', offset='.$p_offset.', comment="'.$p_comment.'"');
-    $v_result=1;
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-	                      $p_nb_entries, $p_size,
-						  $p_offset, strlen($p_comment));
-
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
-
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privList()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privList(&$p_list)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privList", "list");
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Go to beginning of Central Dir
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Offset : ".$v_central_dir['offset']."'");
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position in file : ".ftell($this->zip_fd)."'");
-    @rewind($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position in file : ".ftell($this->zip_fd)."'");
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position in file : ".ftell($this->zip_fd)."'");
-
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-        return $v_result;
-      }
-      $v_header['index'] = $i;
-
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privConvertHeader2FileInfo()
-  // Description :
-  //   This function takes the file informations from the central directory
-  //   entries and extract the interesting parameters that will be given back.
-  //   The resulting file infos are set in the array $p_info
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
-  //                           extracted in the filesystem (extract).
-  //     $p_info['stored_filename'] : Stored filename in the archive.
-  //     $p_info['size'] = Size of the file.
-  //     $p_info['compressed_size'] = Compressed size of the file.
-  //     $p_info['mtime'] = Last modification date of the file.
-  //     $p_info['comment'] = Comment associated with the file.
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-  //     $p_info['status'] = status of the action on the file.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privConvertHeader2FileInfo($p_header, &$p_info)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privConvertHeader2FileInfo", "Filename='".$p_header['filename']."'");
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $p_info['filename'] = $p_header['filename'];
-    $p_info['stored_filename'] = $p_header['stored_filename'];
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractByRule()
-  // Description :
-  //   Extract a file or directory depending of rules (by index, by name, ...)
-  // Parameters :
-  //   $p_file_list : An array where will be placed the properties of each
-  //                  extracted file
-  //   $p_path : Path to add while writing the extracted files
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-  //                    extracted files. If the path does not match the file path,
-  //                    the file is extracted with its memorized path.
-  //                    $p_remove_path does not apply to 'list' mode.
-  //                    $p_path and $p_remove_path are commulative.
-  // Return Values :
-  //   1 on success,0 or less on error (see error code list)
-  // --------------------------------------------------------------------------------
-  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privExtractByRule", "path='$p_path', remove_path='$p_remove_path', remove_all_path='".($p_remove_all_path?'true':'false')."'");
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
-		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Destination path [$p_path] ends by '/'");
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Modified to [$p_path]");
-      }
-    }
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
-
-    // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Read next file header entry : '$i'");
-
-      // ----- Read next Central dir entry
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Position before rewind : ".ftell($this->zip_fd)."'");
-      @rewind($this->zip_fd);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Position after rewind : ".ftell($this->zip_fd)."'");
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-        // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-        return PclZip::errorCode();
-      }
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position after fseek : ".ftell($this->zip_fd)."'");
-
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-        return $v_result;
-      }
-
-      // ----- Store the index
-      $v_header['index'] = $i;
-
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->zip_fd);
-
-      // ----- Look for the specific extract rules
-      $v_extract = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByName'");
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Compare with file '".$p_options[PCLZIP_OPT_BY_NAME][$j]."'");
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The searched item is a directory");
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The directory is in the file path");
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The file is the right one.");
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'");
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression");
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByEreg'");
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression");
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByIndex'");
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Look if index '$i' is in [".$p_options[PCLZIP_OPT_BY_INDEX][$j]['start'].",".$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']."]");
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Found as part of an index range");
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Do not look this index range for next loop");
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Index range is greater than index, stop loop");
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with no rule (extract all)");
-          $v_extract = true;
-      }
-
-	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
-		      && ($v_header['compression'] != 0))) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unsupported compression method (".$v_header['compression'].")");
-          $v_header['status'] = 'unsupported_compression';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-			                       "Filename '".$v_header['stored_filename']."' is "
-				  	    	  	   ."compressed by an unsupported compression "
-				  	    	  	   ."method (".$v_header['compression'].") ");
-
-              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-              return PclZip::errorCode();
-		  }
-	  }
-
-	  // ----- Check encrypted files
-	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unsupported file encryption");
-          $v_header['status'] = 'unsupported_encryption';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-			                       "Unsupported encryption for "
-				  	    	  	   ." filename '".$v_header['stored_filename']
-								   ."'");
-
-              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-              return PclZip::errorCode();
-		  }
-    }
-
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "No need for extract");
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-		                                        $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-              return $v_result;
-          }
-
-          $v_extract = false;
-      }
-
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file '".$v_header['filename']."', index '$i'");
-
-        // ----- Go to the file position
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position before rewind : ".ftell($this->zip_fd)."'");
-        @rewind($this->zip_fd);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after rewind : ".ftell($this->zip_fd)."'");
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
-
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-          // ----- Return
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-          return PclZip::errorCode();
-        }
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after fseek : ".ftell($this->zip_fd)."'");
-
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
-
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result1);
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-            return $v_result;
-          }
-
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
-
-          // ----- Next extracted file
-          $v_nb_extracted++;
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result1);
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-		                                      $p_path, $p_remove_path,
-											  $p_remove_all_path,
-											  $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result1);
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-      }
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //
-  // 1 : ... ?
-  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
-  // --------------------------------------------------------------------------------
-  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFile', "path='$p_path', remove_path='$p_remove_path', remove_all_path='".($p_remove_all_path?'true':'false')."'");
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'");
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The entry is a folder : need to be filtered");
-
-            $p_entry['status'] = "filtered";
-
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-            return $v_result;
-        }
-
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "All path is removed");
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
-
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Look for some path to remove");
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The folder is the same as the removed path '".$p_entry['filename']."'");
-
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
-
-        // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-        return $v_result;
-      }
-
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file '".$p_entry['filename']."'");
-
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
-
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Resulting file is '".$p_entry['filename']."'");
-      }
-    }
-
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
-
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Check the extract directory restriction");
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']);
-      if ($v_inclusion == 0) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_EXTRACT_DIR_RESTRICTION is selected, file is outside restriction");
-
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
-
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A pre-callback '".$p_options[PCLZIP_CB_PRE_EXTRACT]."()') is defined for the extraction");
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction");
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New filename is '".$p_entry['filename']."'");
-    }
-
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file (with path) '".$p_entry['filename']."', size '$v_header[size]'");
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$p_entry['filename']."' already exists");
-
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is a directory");
-
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
-
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."already used by an existing directory");
-
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-		}
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is write protected");
-
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
-
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			                     "Filename '".$p_entry['filename']."' exists "
-								 ."and is write protected");
-
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-            return PclZip::errorCode();
-		}
-      }
-
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is newer (".date("l dS of F Y h:i:s A", filemtime($p_entry['filename'])).") than the extracted file (".date("l dS of F Y h:i:s A", $p_entry['mtime']).")");
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_REPLACE_NEWER is selected, file will be replaced");
-		}
-		else {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File will not be replaced");
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-                //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			             "Newer version of '".$p_entry['filename']."' exists "
-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-                return PclZip::errorCode();
-		    }
-		}
-      }
-      else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is older than the extrated one - will be replaced by the extracted one (".date("l dS of F Y h:i:s A", filemtime($p_entry['filename'])).") than the extracted file (".date("l dS of F Y h:i:s A", $p_entry['mtime']).")");
-      }
-    }
-
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-      if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to create path for '".$p_entry['filename']."'");
-
-        // ----- Change the file status
-        $p_entry['status'] = "path_creation_fail";
-
-        // ----- Return
-        ////--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-        //return $v_result;
-        $v_result = 1;
-      }
-    }
-    }
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting an un-compressed file");
-
-		  // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Error while opening '".$p_entry['filename']."' in write binary mode");
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-            return $v_result;
-          }
-
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Read '".$p_entry['size']."' bytes");
-
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Read $v_read_size bytes");
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
-            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
-            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
-            */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-          }
-
-          // ----- Closing the destination file
-          fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
-
-
-        }
-        else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting a compressed file (Compression method ".$p_entry['compression'].")");
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File is encrypted");
-            /*
-              // ----- Read the encryption header
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read 12 encryption header bytes");
-              $v_encryption_header = @fread($this->zip_fd, 12);
-
-              // ----- Read the encrypted & compressed file in a buffer
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read '".($p_entry['compressed_size']-12)."' compressed & encrypted bytes");
-              $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']-12);
-
-              // ----- Decrypt the buffer
-              $this->privDecrypt($v_encryption_header, $v_buffer,
-			                     $p_entry['compressed_size']-12, $p_entry['crc']);
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Buffer is '".$v_buffer."'");
-              */
-          }
-          else {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read '".$p_entry['compressed_size']."' compressed bytes");
-              // ----- Read the compressed file in a buffer (one shot)
-              $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-          }
-
-          // ----- Decompress the file
-          $v_file_content = @gzinflate($v_buffer);
-          unset($v_buffer);
-          if ($v_file_content === FALSE) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to inflate compressed file");
-
-            // ----- Change the file status
-            // TBC
-            $p_entry['status'] = "error";
-
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-            return $v_result;
-          }
-
-          // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Error while opening '".$p_entry['filename']."' in write binary mode");
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-            return $v_result;
-          }
-
-          // ----- Write the uncompressed data
-          @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-          unset($v_file_content);
-
-          // ----- Closing the destination file
-          @fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
-
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "chmod option activated '".$p_options[PCLZIP_OPT_SET_CHMOD]."'");
-
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
-
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extraction done");
-      }
-    }
-
-	// ----- Change abort status
-	if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
-	}
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A post-callback '".$p_options[PCLZIP_CB_POST_EXTRACT]."()') is defined for the extraction");
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction");
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileInOutput()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileInOutput(&$p_entry, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFileInOutput', "");
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'");
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A pre-callback '".$p_options[PCLZIP_CB_PRE_EXTRACT]."()') is defined for the extraction");
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction");
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New filename is '".$p_entry['filename']."'");
-    }
-
-    // ----- Trace
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file (with path) '".$p_entry['filename']."', size '$v_header[size]'");
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting an un-compressed file");
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Reading '".$p_entry['size']."' bytes");
-
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
-        }
-        else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting a compressed file");
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Reading '".$p_entry['size']."' bytes");
-
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
-
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
-        }
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extraction done");
-      }
-    }
-
-	// ----- Change abort status
-	if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
-	}
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A post-callback '".$p_options[PCLZIP_CB_POST_EXTRACT]."()') is defined for the extraction");
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction");
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileAsString(&$p_entry, &$p_string)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFileAsString', "p_entry['filename']='".$p_entry['filename']."'");
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'");
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file in string (with path) '".$p_entry['filename']."', size '$v_header[size]'");
-
-    // ----- Do the extraction (if not a folder)
-    if (!(($p_entry['external']&0x00000010)==0x00000010))
-    {
-      // ----- Look for not compressed file
-//      if ($p_entry['compressed_size'] == $p_entry['size'])
-      if ($p_entry['compression'] == 0) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting an un-compressed file");
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Reading '".$p_entry['size']."' bytes");
-
-        // ----- Reading the file
-        $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-      }
-      else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting a compressed file (compression method '".$p_entry['compression']."')");
-
-        // ----- Reading the file
-        $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-        // ----- Decompress the file
-        if (($p_string = @gzinflate($v_data)) === FALSE) {
-            // TBC
-        }
-      }
-
-      // ----- Trace
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extraction done");
-    }
-    else {
-        // TBC : error : can not extract a folder in a string
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadFileHeader(&$p_header)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privReadFileHeader", "");
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary data is : '".sprintf("%08x", $v_binary_data)."'");
-    $v_data = unpack('Vid', $v_binary_data);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary signature is : '".sprintf("0x%08x", $v_data['id'])."'");
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Invalid File header");
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Header : '".$v_binary_data."'");
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Header (Hex) : '".bin2hex($v_binary_data)."'");
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
-
-    // ----- Get filename
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "File name length : ".$v_data['filename_len']);
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Filename : \''.$p_header['filename'].'\'');
-
-    // ----- Get extra_fields
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extra field length : ".$v_data['extra_len']);
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Extra field : \''.bin2hex($p_header['extra']).'\'');
-
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version need to extract : ('.$p_header['version_extracted'].') \''.($p_header['version_extracted']/10).'.'.($p_header['version_extracted']%10).'\'');
-    $p_header['compression'] = $v_data['compression'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Compression method : \''.$p_header['compression'].'\'');
-    $p_header['size'] = $v_data['size'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Size : \''.$p_header['size'].'\'');
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Compressed Size : \''.$p_header['compressed_size'].'\'');
-    $p_header['crc'] = $v_data['crc'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'CRC : \''.sprintf("0x%X", $p_header['crc']).'\'');
-    $p_header['flag'] = $v_data['flag'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Flag : \''.$p_header['flag'].'\'');
-    $p_header['filename_len'] = $v_data['filename_len'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Filename_len : \''.$p_header['filename_len'].'\'');
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date is actual : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
-    }
-
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Attribut[$key] = ".$v_data[$key]);
-    //}
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set the status field
-    $p_header['status'] = "ok";
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadCentralFileHeader(&$p_header)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privReadCentralFileHeader", "");
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary data is : '".sprintf("%08x", $v_binary_data)."'");
-    $v_data = unpack('Vid', $v_binary_data);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary signature is : '".sprintf("0x%08x", $v_data['id'])."'");
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Invalid Central Dir File signature");
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header : '".$v_binary_data."'");
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header (Hex) : '".bin2hex($v_binary_data)."'");
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "File name length : ".$p_header['filename_len']);
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Filename : \''.$p_header['filename'].'\'');
-
-    // ----- Get extra
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Extra length : ".$p_header['extra_len']);
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Extra : \''.$p_header['extra'].'\'');
-
-    // ----- Get comment
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Comment length : ".$p_header['comment_len']);
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Comment : \''.$p_header['comment'].'\'');
-
-    // ----- Extract properties
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version : \''.($p_header['version']/10).'.'.($p_header['version']%10).'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version need to extract : \''.($p_header['version_extracted']/10).'.'.($p_header['version_extracted']%10).'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Size : \''.$p_header['size'].'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Compressed Size : \''.$p_header['compressed_size'].'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'CRC : \''.sprintf("0x%X", $p_header['crc']).'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Flag : \''.$p_header['flag'].'\'');
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Offset : \''.$p_header['offset'].'\'');
-
-    // ----- Recuperate date in UNIX format
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Date is actual : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
-    }
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
-
-    // ----- Look if it is a directory
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Internal (Hex) : '".sprintf("Ox%04X", $p_header['internal'])."'");
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "External (Hex) : '".sprintf("Ox%04X", $p_header['external'])."' (".(($p_header['external']&0x00000010)==0x00000010?'is a folder':'is a file').')');
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Force folder external : \''.sprintf("Ox%04X", $p_header['external']).'\'');
-    }
-
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Header of filename : \''.$p_header['filename'].'\'');
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFileHeaders()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success,
-  //   0 on error;
-  // --------------------------------------------------------------------------------
-  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCheckFileHeaders", "");
-    $v_result=1;
-
-	// ----- Check the static values
-	// TBC
-	if ($p_local_header['filename'] != $p_central_header['filename']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "filename" : TBC To Be Completed');
-	}
-	if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "version_extracted" : TBC To Be Completed');
-	}
-	if ($p_local_header['flag'] != $p_central_header['flag']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "flag" : TBC To Be Completed');
-	}
-	if ($p_local_header['compression'] != $p_central_header['compression']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "compression" : TBC To Be Completed');
-	}
-	if ($p_local_header['mtime'] != $p_central_header['mtime']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "mtime" : TBC To Be Completed');
-	}
-	if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "filename_len" : TBC To Be Completed');
-	}
-
-	// ----- Look for flag bit 3
-	if (($p_local_header['flag'] & 8) == 8) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Purpose bit flag bit 3 set !');
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'File size, compression size and crc found in central header');
-        $p_local_header['size'] = $p_central_header['size'];
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Size : \''.$p_local_header['size'].'\'');
-        $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Compressed Size : \''.$p_local_header['compressed_size'].'\'');
-        $p_local_header['crc'] = $p_central_header['crc'];
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'CRC : \''.sprintf("0x%X", $p_local_header['crc']).'\'');
-	}
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadEndCentralDir(&$p_central_dir)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privReadEndCentralDir", "");
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Size of the file :$v_size");
-    @fseek($this->zip_fd, $v_size);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Position at end of zip file : \''.ftell($this->zip_fd).'\'');
-    if (@ftell($this->zip_fd) != $v_size)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Look for central dir with no comment');
-      @fseek($this->zip_fd, $v_size-22);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Position after min central position : \''.ftell($this->zip_fd).'\'');
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-        return PclZip::errorCode();
-      }
-
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Binary data is : '".sprintf("%08x", $v_binary_data)."'");
-      $v_data = @unpack('Vid', $v_binary_data);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary signature is : '".sprintf("0x%08x", $v_data['id'])."'");
-
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found central dir at the default position.");
-        $v_found = 1;
-      }
-
-      $v_pos = ftell($this->zip_fd);
-    }
-
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Start extended search of end central dir');
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-        return PclZip::errorCode();
-      }
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Position after max central position : \''.ftell($this->zip_fd).'\'');
-
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-
-        // -----  Add the byte
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Found End Central Dir signature at position : \''.ftell($this->zip_fd).'\'');
-          $v_pos++;
-          break;
-        }
-
-        $v_pos++;
-      }
-
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to find End of Central Dir Record signature");
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
-
-        // ----- Return
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Central Dir Record : '".$v_binary_data."'");
-    ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Central Dir Record (Hex) : '".bin2hex($v_binary_data)."'");
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
-
-    // ----- Check the global size
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Comment length : ".$v_data['comment_size']);
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The central dir is not at the end of the archive. Some trailing bytes exists after the archive.");
-
-	  // ----- Removed in release 2.2 see readme file
-	  // The check of the file size is a little too strict.
-	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
-	  // While decrypted, zip has training 0 bytes
-	  if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-	                       'The central dir is not at the end of the archive.'
-						   .' Some trailing bytes exists after the archive.');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-	  }
-    }
-
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0)
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-    else
-      $p_central_dir['comment'] = '';
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Comment : \''.$p_central_dir['comment'].'\'');
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Nb of entries : \''.$p_central_dir['entries'].'\'');
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Nb of entries for this disk : \''.$p_central_dir['disk_entries'].'\'');
-    $p_central_dir['offset'] = $v_data['offset'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Offset of Central Dir : \''.$p_central_dir['offset'].'\'');
-    $p_central_dir['size'] = $v_data['size'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Size of Central Dir : \''.$p_central_dir['size'].'\'');
-    $p_central_dir['disk'] = $v_data['disk'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Disk number : \''.$p_central_dir['disk'].'\'');
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Start disk number : \''.$p_central_dir['disk_start'].'\'');
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "central_dir[$key] = ".$p_central_dir[$key]);
-    //}
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDeleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDeleteByRule(&$p_result_list, &$p_options)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privDeleteByRule", "");
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in file : ".ftell($this->zip_fd)."'");
-    @rewind($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in file : ".ftell($this->zip_fd)."'");
-
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position before rewind : ".ftell($this->zip_fd)."'");
-    @rewind($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after rewind : ".ftell($this->zip_fd)."'");
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after fseek : ".ftell($this->zip_fd)."'");
-
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Read next file header entry (index '$i')");
-
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-
-        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-        return $v_result;
-      }
-
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename (index '$i') : '".$v_header_list[$v_nb_extracted]['stored_filename']."'");
-
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByName'");
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Compare with file '".$p_options[PCLZIP_OPT_BY_NAME][$j]."'");
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The searched item is a directory");
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The directory is in the file path");
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The entry is the searched directory");
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The file is the right one.");
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'");
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression");
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByEreg'");
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression");
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByIndex'");
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
-              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Look if index '$i' is in [".$p_options[PCLZIP_OPT_BY_INDEX][$j]['start'].",".$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']."]");
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Found as part of an index range");
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Do not look this index range for next loop");
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Index range is greater than index, stop loop");
-                  break;
-              }
-          }
-      }
-      else {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "No argument mean remove all file");
-      	$v_found = true;
-      }
-
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$v_header_list[$v_nb_extracted]['stored_filename']."', index '$i' need to be deleted");
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$v_header_list[$v_nb_extracted]['stored_filename']."', index '$i' will not be deleted");
-        $v_nb_extracted++;
-      }
-    }
-
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary write mode");
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-            return $v_result;
-        }
-
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Keep entry index '$i' : '".$v_header_list[$i]['filename']."'");
-
-            // ----- Calculate the position of the header
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Offset='". $v_header_list[$i]['offset']."'");
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position before rewind : ".ftell($this->zip_fd)."'");
-            @rewind($this->zip_fd);
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after rewind : ".ftell($this->zip_fd)."'");
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-                // ----- Return
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-                return PclZip::errorCode();
-            }
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after fseek : ".ftell($this->zip_fd)."'");
-
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-                return $v_result;
-            }
-
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-			                                $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
-
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-                return $v_result;
-            }
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Offset for this file is '".$v_header_list[$i]['offset']."'");
-
-            // ----- Read/write the data block
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-                return $v_result;
-            }
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->zip_fd);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "New offset of central dir : $v_offset");
-
-        // ----- Re-Create the Central Dir files header
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Creates the new central directory");
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Offset of file : ".$v_header_list[$i]['offset']);
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-                return $v_result;
-            }
-
-            // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-        }
-
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Creates the central directory footer");
-
-        // ----- Zip file comment
-        $v_comment = '';
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-        }
-
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
-
-        // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
-
-            // ----- Return
-            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-            return $v_result;
-        }
-
-        // ----- Close
-        $v_temp_zip->privCloseFd();
-        $this->privCloseFd();
-
-        // ----- Delete the zip file
-        // TBC : I should test the result ...
-        @unlink($this->zipname);
-
-        // ----- Rename the temporary file
-        // TBC : I should test the result ...
-        //@rename($v_zip_temp_name, $this->zipname);
-        PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
-    }
-
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
-        $this->privCloseFd();
-
-        if (($v_result = $this->privOpenFd('wb')) != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-          return $v_result;
-        }
-
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-          return $v_result;
-        }
-
-        $this->privCloseFd();
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDirCheck()
-  // Description :
-  //   Check if a directory exists, if not it creates it and all the parents directory
-  //   which may be useful.
-  // Parameters :
-  //   $p_dir : Directory path to check.
-  // Return Values :
-  //    1 : OK
-  //   -1 : Unable to create directory
-  // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
-  {
-    $v_result = 1;
-
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privDirCheck", "entry='$p_dir', is_dir='".($p_is_dir?"true":"false")."'");
-
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
-    {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Looking for entry '$p_dir'");
-
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, "'$p_dir' is a directory");
-      return 1;
-    }
-
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Parent directory is '$p_parent_dir'");
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Create the directory
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Create directory '$p_dir'");
-    if (!@mkdir($p_dir, 0777))
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result, "Directory '$p_dir' created");
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privMerge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privMerge(&$p_archive_to_add)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privMerge", "archive='".$p_archive_to_add->zipname."'");
-    $v_result=1;
-
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Archive to add does not exist. End of merge.");
-
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Archive does not exist, duplicate the archive_to_add.");
-
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in zip : ".ftell($this->zip_fd)."'");
-    @rewind($this->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in zip : ".ftell($this->zip_fd)."'");
-
-    // ----- Open the archive_to_add file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open archive_to_add in binary read mode");
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in archive_to_add : ".ftell($p_archive_to_add->zip_fd)."'");
-    @rewind($p_archive_to_add->zip_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in archive_to_add : ".ftell($p_archive_to_add->zip_fd)."'");
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "New offset of central dir : $v_offset");
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
-
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
-
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDuplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDuplicate($p_archive_filename)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privDuplicate", "archive_filename='$p_archive_filename'");
-    $v_result=1;
-
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Archive to duplicate does not exist. End of duplicate.");
-
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-    }
-
-    // ----- Open the temporary file in write mode
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
-
-      // ----- Return
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read $v_read_size bytes");
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorLog()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorReset()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorReset()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDecrypt()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDecrypt($p_encryption_header, &$p_buffer, $p_size, $p_crc)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privDecrypt', "size=".$p_size."");
-    $v_result=1;
-
-    // ----- To Be Modified ;-)
-    $v_pwd = "test";
-
-    $p_buffer = PclZipUtilZipDecrypt($p_buffer, $p_size, $p_encryption_header,
-	                                 $p_crc, $v_pwd);
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDisableMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDisableMagicQuotes()
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privDisableMagicQuotes', "");
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Functions *et_magic_quotes_runtime are not supported");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-	}
-
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "magic_quote already disabled");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-	}
-
-	// ----- Get and memorize the magic_quote value
-	$this->magic_quotes_status = @get_magic_quotes_runtime();
-    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Current magic_quotes_runtime status is '".($this->magic_quotes_status==0?'disable':'enable')."'");
-
-	// ----- Disable magic_quotes
-	if ($this->magic_quotes_status == 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Disable magic_quotes");
-	  @set_magic_quotes_runtime(0);
-	}
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privSwapBackMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privSwapBackMagicQuotes()
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privSwapBackMagicQuotes', "");
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Functions *et_magic_quotes_runtime are not supported");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-	}
-
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "magic_quote not modified");
-      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-      return $v_result;
-	}
-
-	// ----- Swap back magic_quotes
-	if ($this->magic_quotes_status == 1) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Enable back magic_quotes");
-  	  @set_magic_quotes_runtime($this->magic_quotes_status);
-	}
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  }
-  // End of class
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathReduction($p_dir)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilPathReduction", "dir='$p_dir'");
-    $v_result = "";
-
-    // ----- Look for not empty path
-    if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
-
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
-		  $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
-		  // ----- First '/' i.e. root slash
-		  if ($i == 0) {
-            $v_result = "/".$v_result;
-		    if ($v_skip > 0) {
-		        // ----- It is an invalid path, so the path is not modified
-		        // TBC
-		        $v_result = $p_dir;
-                //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Invalid path is unchanged");
-                $v_skip = 0;
-		    }
-		  }
-		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
-		  }
-		  // ----- Double '/' inside the path
-		  else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
-		  }
-        }
-        else {
-		  // ----- Look for item to skip
-		  if ($v_skip > 0) {
-		    $v_skip--;
-		  }
-		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
-		  }
-        }
-      }
-
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
-        }
-      }
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathInclusion()
-  // Description :
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
-  //   $p_dir.
-  //   The function indicates also if the path is exactly the same as the dir.
-  //   This function supports path with duplicated '/' like '//', but does not
-  //   support '.' or '..' statements.
-  // Parameters :
-  // Return Values :
-  //   0 if $p_path is not inside directory $p_dir
-  //   1 if $p_path is inside directory $p_dir
-  //   2 if $p_path is exactly the same as $p_dir
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathInclusion($p_dir, $p_path)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilPathInclusion", "dir='$p_dir', path='$p_path'");
-    $v_result = 1;
-
-    // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Replacing ./ by full path in p_dir '".$p_dir."'");
-    }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Replacing ./ by full path in p_path '".$p_path."'");
-    }
-
-    // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
-    $v_list_path_size = sizeof($v_list_path);
-
-    // ----- Study directories paths
-    $i = 0;
-    $j = 0;
-    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Working on dir($i)='".$v_list_dir[$i]."' and path($j)='".$v_list_path[$j]."'");
-
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
-        $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
-        $j++;
-        continue;
-      }
-
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Items ($i,$j) are different");
-        $v_result = 0;
-      }
-
-      // ----- Next items
-      $i++;
-      $j++;
-    }
-
-    // ----- Look if everything seems to be the same
-    if ($v_result) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Look for tie break");
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Looking on dir($i)='".($i < $v_list_dir_size?$v_list_dir[$i]:'')."' and path($j)='".($j < $v_list_path_size?$v_list_path[$j]:'')."'");
-
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilCopyBlock()
-  // Description :
-  // Parameters :
-  //   $p_mode : read/write compression mode
-  //             0 : src & dest normal
-  //             1 : src gzip, dest normal
-  //             2 : src normal, dest gzip
-  //             3 : src & dest gzip
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilCopyBlock", "size=$p_size, mode=$p_mode");
-    $v_result = 1;
-
-    if ($p_mode==0)
-    {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Src offset before read :".(@ftell($p_src)));
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Dest offset before write :".(@ftell($p_dest)));
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Src offset after read :".(@ftell($p_src)));
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Dest offset after write :".(@ftell($p_dest)));
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilRename()
-  // Description :
-  //   This function tries to do a simple rename() function. If it fails, it
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
-  //   first one.
-  // Parameters :
-  //   $p_src : Old filename
-  //   $p_dest : New filename
-  // Return Values :
-  //   1 on success, 0 on failure.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilRename($p_src, $p_dest)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilRename", "source=$p_src, destination=$p_dest");
-    $v_result = 1;
-
-    // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
-      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Fail to rename file, try copy+unlink");
-
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Fail to copy file");
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Fail to unlink old filename");
-        $v_result = 0;
-      }
-    }
-
-    // ----- Return
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilOptionText()
-  // Description :
-  //   Translate option value in text. Mainly for debug purpose.
-  // Parameters :
-  //   $p_option : the option value.
-  // Return Values :
-  //   The option text value.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilOptionText($p_option)
-  {
-    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilOptionText", "option='".$p_option."'");
-
-    $v_list = get_defined_constants();
-    for (reset($v_list); $v_key = key($v_list); next($v_list)) {
-	  $v_prefix = substr($v_key, 0, 10);
-	  if ((   ($v_prefix == 'PCLZIP_OPT')
-         || ($v_prefix == 'PCLZIP_CB_')
-         || ($v_prefix == 'PCLZIP_ATT'))
-	      && ($v_list[$v_key] == $p_option)) {
-          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_key);
-          return $v_key;
-	    }
-    }
-
-    $v_result = 'Unknown';
-
-    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilTranslateWinPath()
-  // Description :
-  //   Translate windows path by replacing '\' by '/' and optionally removing
-  //   drive letter.
-  // Parameters :
-  //   $p_path : path to translate.
-  //   $p_remove_disk_letter : true | false
-  // Return Values :
-  //   The path translated.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
-  {
-    if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
-    }
-    return $p_path;
-  }
-  // --------------------------------------------------------------------------------
-
-
-?>
diff -uNr a/mp-wp/wp-admin/includes/class-wp-filesystem-base.php b/mp-wp/wp-admin/includes/class-wp-filesystem-base.php
--- a/mp-wp/wp-admin/includes/class-wp-filesystem-base.php 0a6e0e0180bd0bc43eb8949bc05729b34291a52aeed1f168e9af5970cec13405c224a020be59a0930cbf439c08b5f1f6f32e9eeb1ba8c54dec5af1119290d736
+++ b/mp-wp/wp-admin/includes/class-wp-filesystem-base.php false
@@ -1,316 +0,0 @@
-<?php
-/**
- * Base WordPress Filesystem.
- *
- * @package WordPress
- * @subpackage Filesystem
- */
-
-/**
- * Base WordPress Filesystem class for which Filesystem implementations extend
- *
- * @since 2.5
- */
-class WP_Filesystem_Base {
-	/**
-	 * Whether to display debug data for the connection or not.
-	 *
-	 * @since 2.5
-	 * @access public
-	 * @var bool
-	 */
-	var $verbose = false;
-	/**
-	 * Cached list of local filepaths to maped remote filepaths.
-	 *
-	 * @since 2.7
-	 * @access private
-	 * @var array
-	 */
-	var $cache = array();
-
-	/**
-	 * The Access method of the current connection, Set automatically.
-	 *
-	 * @since 2.5
-	 * @access public
-	 * @var string
-	 */
-	var $method = '';
-
-	/**
-	 * Returns the path on the remote filesystem of ABSPATH
-	 *
-	 * @since 2.7
-	 * @access public
-	 * @return string The location of the remote path.
-	 */
-	function abspath() {
-		if ( defined('FTP_BASE') && strpos($this->method, 'ftp') !== false )
-			return FTP_BASE;
-		$folder = $this->find_folder(ABSPATH);
-		//Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
-		if ( ! $folder && $this->is_dir('/wp-includes') )
-			$folder = '/';
-		return $folder;
-	}
-	/**
-	 * Returns the path on the remote filesystem of WP_CONTENT_DIR
-	 *
-	 * @since 2.7
-	 * @access public
-	 * @return string The location of the remote path.
-	 */
-	function wp_content_dir() {
-		if ( defined('FTP_CONTENT_DIR') && strpos($this->method, 'ftp') !== false )
-			return FTP_CONTENT_DIR;
-		return $this->find_folder(WP_CONTENT_DIR);
-	}
-	/**
-	 * Returns the path on the remote filesystem of WP_PLUGIN_DIR
-	 *
-	 * @since 2.7
-	 * @access public
-	 *
-	 * @return string The location of the remote path.
-	 */
-	function wp_plugins_dir() {
-		if ( defined('FTP_PLUGIN_DIR') && strpos($this->method, 'ftp') !== false )
-			return FTP_PLUGIN_DIR;
-		return $this->find_folder(WP_PLUGIN_DIR);
-	}
-	/**
-	 * Returns the path on the remote filesystem of the Themes Directory
-	 *
-	 * @since 2.7
-	 * @access public
-	 *
-	 * @return string The location of the remote path.
-	 */
-	function wp_themes_dir() {
-		return $this->wp_content_dir() . '/themes';
-	}
-
-	/**
-	 * Locates a folder on the remote filesystem.
-	 *
-	 * Deprecated; use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() methods instead.
-	 *
-	 * @since 2.5
-	 * @deprecated 2.7
-	 * @access public
-	 *
-	 * @param string $base The folder to start searching from
-	 * @param bool $echo True to display debug information
-	 * @return string The location of the remote path.
-	 */
-	function find_base_dir($base = '.', $echo = false) {
-		_deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
-		$this->verbose = $echo;
-		return $this->abspath();
-	}
-	/**
-	 * Locates a folder on the remote filesystem.
-	 *
-	 * Deprecated; use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() methods instead.
-	 *
-	 * @since 2.5
-	 * @deprecated 2.7
-	 * @access public
-	 *
-	 * @param string $base The folder to start searching from
-	 * @param bool $echo True to display debug information
-	 * @return string The location of the remote path.
-	 */
-	function get_base_dir($base = '.', $echo = false) {
-		_deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
-		$this->verbose = $echo;
-		return $this->abspath();
-	}
-
-	/**
-	 * Locates a folder on the remote filesystem.
-	 *
-	 * Assumes that on Windows systems, Stripping off the Drive letter is OK
-	 * Sanitizes \\ to / in windows filepaths.
-	 *
-	 * @since 2.7
-	 * @access public
-	 *
-	 * @param string $folder the folder to locate
-	 * @return string The location of the remote path.
-	 */
-	function find_folder($folder) {
-
-		$folder = preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows driveletter if its there.
-		$folder = str_replace('\\', '/', $folder); //Windows path sanitiation
-
-		if ( isset($this->cache[ $folder ] ) )
-			return $this->cache[ $folder ];
-
-		if ( $this->exists($folder) ) { //Folder exists at that absolute path.
-			$this->cache[ $folder ] = $folder;
-			return $folder;
-		}
-		if( $return = $this->search_for_folder($folder) )
-			$this->cache[ $folder ] = $return;
-		return $return;
-	}
-
-	/**
-	 * Locates a folder on the remote filesystem.
-	 *
-	 * Expects Windows sanitized path
-	 *
-	 * @since 2.7
-	 * @access private
-	 *
-	 * @param string $folder the folder to locate
-	 * @param string $base the folder to start searching from
-	 * @param bool $loop if the function has recursed, Internal use only
-	 * @return string The location of the remote path.
-	 */
-	function search_for_folder($folder, $base = '.', $loop = false ) {
-		if ( empty( $base ) || '.' == $base )
-			$base = trailingslashit($this->cwd());
-
-		$folder = untrailingslashit($folder);
-
-		$folder_parts = explode('/', $folder);
-		$last_path = $folder_parts[ count($folder_parts) - 1 ];
-
-		$files = $this->dirlist( $base );
-
-		foreach ( $folder_parts as $key ) {
-			if ( $key == $last_path )
-				continue; //We want this to be caught by the next code block.
-
-			//Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder,
-			// If its found, change into it and follow through looking for it.
-			// If it cant find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on.
-			// If it reaches the end, and still cant find it, it'll return false for the entire function.
-			if( isset($files[ $key ]) ){
-				//Lets try that folder:
-				$newdir = trailingslashit(path_join($base, $key));
-				if( $this->verbose )
-					printf( __('Changing to %s') . '<br/>', $newdir );
-				if( $ret = $this->search_for_folder( $folder, $newdir, $loop) )
-					return $ret;
-			}
-		}
-
-		//Only check this as a last resort, to prevent locating the incorrect install. All above proceeedures will fail quickly if this is the right branch to take.
-		if(isset( $files[ $last_path ] ) ) {
-			if( $this->verbose )
-				printf( __('Found %s') . '<br/>',  $base . $last_path );
-			return $base . $last_path;
-		}
-		if( $loop )
-			return false;//Prevent tihs function looping again.
-		//As an extra last resort, Change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups.
-		return $this->search_for_folder($folder, '/', true);
-
-	}
-
-	/**
-	 * Returns the *nix style file permissions for a file
-	 *
-	 * From the PHP documentation page for fileperms()
-	 *
-	 * @link http://docs.php.net/fileperms
-	 * @since 2.5
-	 * @access public
-	 *
-	 * @param string $file string filename
-	 * @return int octal representation of permissions
-	 */
-	function gethchmod($file){
-		$perms = $this->getchmod($file);
-		if (($perms & 0xC000) == 0xC000) // Socket
-			$info = 's';
-		elseif (($perms & 0xA000) == 0xA000) // Symbolic Link
-			$info = 'l';
-		elseif (($perms & 0x8000) == 0x8000) // Regular
-			$info = '-';
-		elseif (($perms & 0x6000) == 0x6000) // Block special
-			$info = 'b';
-		elseif (($perms & 0x4000) == 0x4000) // Directory
-			$info = 'd';
-		elseif (($perms & 0x2000) == 0x2000) // Character special
-			$info = 'c';
-		elseif (($perms & 0x1000) == 0x1000)// FIFO pipe
-			$info = 'p';
-		else // Unknown
-			$info = 'u';
-
-		// Owner
-		$info .= (($perms & 0x0100) ? 'r' : '-');
-		$info .= (($perms & 0x0080) ? 'w' : '-');
-		$info .= (($perms & 0x0040) ?
-					(($perms & 0x0800) ? 's' : 'x' ) :
-					(($perms & 0x0800) ? 'S' : '-'));
-
-		// Group
-		$info .= (($perms & 0x0020) ? 'r' : '-');
-		$info .= (($perms & 0x0010) ? 'w' : '-');
-		$info .= (($perms & 0x0008) ?
-					(($perms & 0x0400) ? 's' : 'x' ) :
-					(($perms & 0x0400) ? 'S' : '-'));
-
-		// World
-		$info .= (($perms & 0x0004) ? 'r' : '-');
-		$info .= (($perms & 0x0002) ? 'w' : '-');
-		$info .= (($perms & 0x0001) ?
-					(($perms & 0x0200) ? 't' : 'x' ) :
-					(($perms & 0x0200) ? 'T' : '-'));
-		return $info;
-	}
-
-	/**
-	 * Converts *nix style file permissions to a octal number.
-	 *
-	 * Converts '-rw-r--r--' to 0644
-	 * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod()
- 	 *
-	 * @link http://docs.php.net/manual/en/function.chmod.php#49614
-	 * @since 2.5
-	 * @access public
-	 *
-	 * @param string $mode string *nix style file permission
-	 * @return int octal representation
-	 */
-	function getnumchmodfromh($mode) {
-		$realmode = '';
-		$legal =  array('', 'w', 'r', 'x', '-');
-		$attarray = preg_split('//', $mode);
-
-		for($i=0; $i < count($attarray); $i++)
-		   if($key = array_search($attarray[$i], $legal))
-			   $realmode .= $legal[$key];
-
-		$mode = str_pad($realmode, 9, '-');
-		$trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1');
-		$mode = strtr($mode,$trans);
-
-		$newmode = '';
-		$newmode .= $mode[0] + $mode[1] + $mode[2];
-		$newmode .= $mode[3] + $mode[4] + $mode[5];
-		$newmode .= $mode[6] + $mode[7] + $mode[8];
-		return $newmode;
-	}
-
-	/**
-	 * Determines if the string provided contains binary characters.
-	 *
-	 * @since 2.7
-	 * @access private
-	 *
-	 * @param string $text String to test against
-	 * @return bool true if string is binary, false otherwise
-	 */
-	function is_binary( $text ) {
-		return (bool) preg_match('|[^\x20-\x7E]|', $text); //chr(32)..chr(127)
-	}
-}
-
-?>
diff -uNr a/mp-wp/wp-admin/includes/class-wp-filesystem-direct.php b/mp-wp/wp-admin/includes/class-wp-filesystem-direct.php
--- a/mp-wp/wp-admin/includes/class-wp-filesystem-direct.php 8166333e0573868651a1e9da3a9163177173f0a1115bddd25fd004ac88d856075b3573b9b8945661be9066014d4337be1b95416ee0662fe85c7a2b64a7fd4f5d
+++ b/mp-wp/wp-admin/includes/class-wp-filesystem-direct.php false
@@ -1,274 +0,0 @@
-<?php
-/**
- * WordPress Direct Filesystem.
- *
- * @package WordPress
- * @subpackage Filesystem
- */
-
-/**
- * WordPress Filesystem Class for direct PHP file and folder manipulation.
- *
- * @since 2.5
- * @package WordPress
- * @subpackage Filesystem
- * @uses WP_Filesystem_Base Extends class
- */
-class WP_Filesystem_Direct  extends WP_Filesystem_Base {
-	var $permission = null;
-	var $errors = array();
-	function WP_Filesystem_Direct($arg) {
-		$this->method = 'direct';
-		$this->errors = new WP_Error();
-		$this->permission = umask();
-	}
-	function connect() {
-		return true;
-	}
-	function setDefaultPermissions($perm) {
-		$this->permission = $perm;
-	}
-	function get_contents($file) {
-		return @file_get_contents($file);
-	}
-	function get_contents_array($file) {
-		return @file($file);
-	}
-	function put_contents($file, $contents, $mode = false, $type = '') {
-		if ( ! ($fp = @fopen($file, 'w' . $type)) )
-			return false;
-		@fwrite($fp, $contents);
-		@fclose($fp);
-		$this->chmod($file,$mode);
-		return true;
-	}
-	function cwd() {
-		return @getcwd();
-	}
-	function chdir($dir) {
-		return @chdir($dir);
-	}
-	function chgrp($file, $group, $recursive = false) {
-		if( ! $this->exists($file) )
-			return false;
-		if( ! $recursive )
-			return @chgrp($file, $group);
-		if( ! $this->is_dir($file) )
-			return @chgrp($file, $group);
-		//Is a directory, and we want recursive
-		$file = trailingslashit($file);
-		$filelist = $this->dirlist($file);
-		foreach($filelist as $filename)
-			$this->chgrp($file . $filename, $group, $recursive);
-
-		return true;
-	}
-	function chmod($file, $mode = false, $recursive = false) {
-		if( ! $mode )
-			$mode = $this->permission;
-		if( ! $this->exists($file) )
-			return false;
-		if( ! $recursive )
-			return @chmod($file,$mode);
-		if( ! $this->is_dir($file) )
-			return @chmod($file, $mode);
-		//Is a directory, and we want recursive
-		$file = trailingslashit($file);
-		$filelist = $this->dirlist($file);
-		foreach($filelist as $filename)
-			$this->chmod($file . $filename, $mode, $recursive);
-
-		return true;
-	}
-	function chown($file, $owner, $recursive = false) {
-		if( ! $this->exists($file) )
-			return false;
-		if( ! $recursive )
-			return @chown($file, $owner);
-		if( ! $this->is_dir($file) )
-			return @chown($file, $owner);
-		//Is a directory, and we want recursive
-		$filelist = $this->dirlist($file);
-		foreach($filelist as $filename){
-			$this->chown($file . '/' . $filename, $owner, $recursive);
-		}
-		return true;
-	}
-	function owner($file) {
-		$owneruid = @fileowner($file);
-		if( ! $owneruid )
-			return false;
-		if( ! function_exists('posix_getpwuid') )
-			return $owneruid;
-		$ownerarray = posix_getpwuid($owneruid);
-		return $ownerarray['name'];
-	}
-	function getchmod($file) {
-		return @fileperms($file);
-	}
-	function group($file) {
-		$gid = @filegroup($file);
-		if( ! $gid )
-			return false;
-		if( ! function_exists('posix_getgrgid') )
-			return $gid;
-		$grouparray = posix_getgrgid($gid);
-		return $grouparray['name'];
-	}
-
-	function copy($source, $destination, $overwrite = false) {
-		if( ! $overwrite && $this->exists($destination) )
-			return false;
-		return copy($source, $destination);
-	}
-
-	function move($source, $destination, $overwrite = false) {
-		//Possible to use rename()?
-		if( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ){
-			$this->delete($source);
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	function delete($file, $recursive = false) {
-		$file = str_replace('\\', '/', $file); //for win32, occasional problems deleteing files otherwise
-
-		if( $this->is_file($file) )
-			return @unlink($file);
-		if( ! $recursive && $this->is_dir($file) )
-			return @rmdir($file);
-
-		//At this point its a folder, and we're in recursive mode
-		$file = trailingslashit($file);
-		$filelist = $this->dirlist($file, true);
-
-		$retval = true;
-		if( is_array($filelist) ) //false if no files, So check first.
-			foreach($filelist as $filename => $fileinfo)
-				if( ! $this->delete($file . $filename, $recursive) )
-					$retval = false;
-
-		if( ! @rmdir($file) )
-			return false;
-		return $retval;
-	}
-
-	function exists($file) {
-		return @file_exists($file);
-	}
-
-	function is_file($file) {
-		return @is_file($file);
-	}
-
-	function is_dir($path) {
-		return @is_dir($path);
-	}
-
-	function is_readable($file) {
-		return @is_readable($file);
-	}
-
-	function is_writable($file) {
-		return @is_writable($file);
-	}
-
-	function atime($file) {
-		return @fileatime($file);
-	}
-
-	function mtime($file) {
-		return @filemtime($file);
-	}
-	function size($file) {
-		return @filesize($file);
-	}
-
-	function touch($file, $time = 0, $atime = 0){
-		if($time == 0)
-			$time = time();
-		if($atime == 0)
-			$atime = time();
-		return @touch($file, $time, $atime);
-	}
-
-	function mkdir($path, $chmod = false, $chown = false, $chgrp = false){
-		if( ! $chmod)
-			$chmod = $this->permission;
-
-		if( ! @mkdir($path, $chmod) )
-			return false;
-		if( $chown )
-			$this->chown($path, $chown);
-		if( $chgrp )
-			$this->chgrp($path, $chgrp);
-		return true;
-	}
-
-	function rmdir($path, $recursive = false) {
-		//Currently unused and untested, Use delete() instead.
-		if( ! $recursive )
-			return @rmdir($path);
-		//recursive:
-		$filelist = $this->dirlist($path);
-		foreach($filelist as $filename => $det) {
-			if ( '/' == substr($filename, -1, 1) )
-				$this->rmdir($path . '/' . $filename, $recursive);
-			@rmdir($filename);
-		}
-		return @rmdir($path);
-	}
-
-	function dirlist($path, $incdot = false, $recursive = false) {
-		if( $this->is_file($path) ) {
-			$limitFile = basename($path);
-			$path = dirname($path);
-		} else {
-			$limitFile = false;
-		}
-		if( ! $this->is_dir($path) )
-			return false;
-
-		$ret = array();
-		$dir = @dir($path);
-		if ( ! $dir )
-			return false;
-		while (false !== ($entry = $dir->read()) ) {
-			$struc = array();
-			$struc['name'] = $entry;
-
-			if( '.' == $struc['name'] || '..' == $struc['name'] )
-				continue; //Do not care about these folders.
-			if( '.' == $struc['name'][0] && !$incdot)
-				continue;
-			if( $limitFile && $struc['name'] != $limitFile)
-				continue;
-
-			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
-			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
-			$struc['number'] 	= false;
-			$struc['owner']    	= $this->owner($path.'/'.$entry);
-			$struc['group']    	= $this->group($path.'/'.$entry);
-			$struc['size']    	= $this->size($path.'/'.$entry);
-			$struc['lastmodunix']= $this->mtime($path.'/'.$entry);
-			$struc['lastmod']   = date('M j',$struc['lastmodunix']);
-			$struc['time']    	= date('h:i:s',$struc['lastmodunix']);
-			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
-
-			if ( 'd' == $struc['type'] ) {
-				if( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
-				else
-					$struc['files'] = array();
-			}
-
-			$ret[ $struc['name'] ] = $struc;
-		}
-		$dir->close();
-		unset($dir);
-		return $ret;
-	}
-}
-?>
diff -uNr a/mp-wp/wp-admin/includes/class-wp-filesystem-ftpext.php b/mp-wp/wp-admin/includes/class-wp-filesystem-ftpext.php
--- a/mp-wp/wp-admin/includes/class-wp-filesystem-ftpext.php 3129ade306ce07e1ff8f7cc0ea5755d709bc1fd927dd6c795f3de0d2fafdd5ceccd7462b075a74b289c93ce8fa43637007312d5b177b9755066f1979da80c92a
+++ b/mp-wp/wp-admin/includes/class-wp-filesystem-ftpext.php false
@@ -1,382 +0,0 @@
-<?php
-/**
- * WordPress FTP Filesystem.
- *
- * @package WordPress
- * @subpackage Filesystem
- */
-
-/**
- * WordPress Filesystem Class for implementing FTP.
- *
- * @since 2.5
- * @package WordPress
- * @subpackage Filesystem
- * @uses WP_Filesystem_Base Extends class
- */
-class WP_Filesystem_FTPext extends WP_Filesystem_Base {
-	var $link;
-	var $timeout = 5;
-	var $errors = array();
-	var $options = array();
-
-	var $permission = null;
-
-	function WP_Filesystem_FTPext($opt='') {
-		$this->method = 'ftpext';
-		$this->errors = new WP_Error();
-
-		//Check if possible to use ftp functions.
-		if ( ! extension_loaded('ftp') ) {
-			$this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available'));
-			return false;
-		}
-
-		// Set defaults:
-		if ( empty($opt['port']) )
-			$this->options['port'] = 21;
-		else
-			$this->options['port'] = $opt['port'];
-
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('FTP hostname is required'));
-		else
-			$this->options['hostname'] = $opt['hostname'];
-
-		if ( isset($opt['base']) && ! empty($opt['base']) )
-			$this->wp_base = $opt['base'];
-
-		// Check if the options provided are OK.
-		if ( empty ($opt['username']) )
-			$this->errors->add('empty_username', __('FTP username is required'));
-		else
-			$this->options['username'] = $opt['username'];
-
-		if ( empty ($opt['password']) )
-			$this->errors->add('empty_password', __('FTP password is required'));
-		else
-			$this->options['password'] = $opt['password'];
-
-		$this->options['ssl'] = false;
-		if ( isset($opt['ssl']) )
-			$this->options['ssl'] = ( !empty($opt['ssl']) );
-		elseif ( isset( $opt['connection_type']) )
-			$this->options['ssl'] = ( 'ftps' == $opt['connection_type'] );
-	}
-
-	function connect() {
-		if ( $this->options['ssl'] && function_exists('ftp_ssl_connect') )
-			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'],$this->timeout);
-		else
-			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'],$this->timeout);
-
-		if ( ! $this->link ) {
-			$this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
-			return false;
-		}
-
-		if ( ! @ftp_login($this->link,$this->options['username'], $this->options['password']) ) {
-			$this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
-			return false;
-		}
-
-		//Set the Connection to use Passive FTP
-		@ftp_pasv( $this->link, true );
-
-		return true;
-	}
-
-	function setDefaultPermissions($perm) {
-		$this->permission = $perm;
-	}
-
-	function get_contents($file, $type = '', $resumepos = 0 ){
-		if( empty($type) )
-			$type = FTP_BINARY;
-
-		$temp = tmpfile();
-		if ( ! $temp )
-			return false;
-
-		if( ! @ftp_fget($this->link, $temp, $file, $type, $resumepos) )
-			return false;
-
-		fseek($temp, 0); //Skip back to the start of the file being written to
-		$contents = '';
-
-		while ( ! feof($temp) )
-			$contents .= fread($temp, 8192);
-
-		fclose($temp);
-		return $contents;
-	}
-	function get_contents_array($file) {
-		return explode("\n", $this->get_contents($file));
-	}
-	function put_contents($file, $contents, $type = '' ) {
-		if( empty($type) )
-			$type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
-
-		$temp = tmpfile();
-		if ( ! $temp )
-			return false;
-
-		fwrite($temp, $contents);
-		fseek($temp, 0); //Skip back to the start of the file being written to
-
-		$ret = @ftp_fput($this->link, $file, $temp, $type);
-
-		fclose($temp);
-		return $ret;
-	}
-	function cwd() {
-		$cwd = @ftp_pwd($this->link);
-		if( $cwd )
-			$cwd = trailingslashit($cwd);
-		return $cwd;
-	}
-	function chdir($dir) {
-		return @ftp_chdir($dir);
-	}
-	function chgrp($file, $group, $recursive = false ) {
-		return false;
-	}
-	function chmod($file, $mode = false, $recursive = false) {
-		if( ! $mode )
-			$mode = $this->permission;
-		if( ! $mode )
-			return false;
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive || ! $this->is_dir($file) ) {
-			if ( ! function_exists('ftp_chmod') )
-				return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
-			return @ftp_chmod($this->link, $mode, $file);
-		}
-		//Is a directory, and we want recursive
-		$filelist = $this->dirlist($file);
-		foreach($filelist as $filename){
-			$this->chmod($file . '/' . $filename, $mode, $recursive);
-		}
-		return true;
-	}
-	function chown($file, $owner, $recursive = false ) {
-		return false;
-	}
-	function owner($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['owner'];
-	}
-	function getchmod($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['permsn'];
-	}
-	function group($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['group'];
-	}
-	function copy($source, $destination, $overwrite = false ) {
-		if( ! $overwrite && $this->exists($destination) )
-			return false;
-		$content = $this->get_contents($source);
-		if( false === $content)
-			return false;
-		return $this->put_contents($destination, $content);
-	}
-	function move($source, $destination, $overwrite = false) {
-		return ftp_rename($this->link, $source, $destination);
-	}
-
-	function delete($file,$recursive=false) {
-		if ( $this->is_file($file) )
-			return @ftp_delete($this->link, $file);
-		if ( !$recursive )
-			return @ftp_rmdir($this->link, $file);
-		$filelist = $this->dirlist($file);
-		foreach ((array) $filelist as $filename => $fileinfo) {
-			$this->delete($file . '/' . $filename, $recursive);
-		}
-		return @ftp_rmdir($this->link, $file);
-	}
-
-	function exists($file) {
-		$list = ftp_rawlist($this->link, $file, false);
-		if( ! $list )
-			return false;
-		return count($list) == 1 ? true : false;
-	}
-	function is_file($file) {
-		return $this->is_dir($file) ? false : true;
-	}
-	function is_dir($path) {
-		$cwd = $this->cwd();
-		$result = @ftp_chdir($this->link, $path);
-		if( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
-			@ftp_chdir($this->link, $cwd);
-			return true;
-		}
-		return false;
-	}
-	function is_readable($file) {
-		//Get dir list, Check if the file is writable by the current user??
-		return true;
-	}
-	function is_writable($file) {
-		//Get dir list, Check if the file is writable by the current user??
-		return true;
-	}
-	function atime($file) {
-		return false;
-	}
-	function mtime($file) {
-		return ftp_mdtm($this->link, $file);
-	}
-	function size($file) {
-		return ftp_size($this->link, $file);
-	}
-	function touch($file, $time = 0, $atime = 0) {
-		return false;
-	}
-	function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
-		if( !@ftp_mkdir($this->link, $path) )
-			return false;
-		if( $chmod )
-			$this->chmod($path, $chmod);
-		if( $chown )
-			$this->chown($path, $chown);
-		if( $chgrp )
-			$this->chgrp($path, $chgrp);
-		return true;
-	}
-	function rmdir($path, $recursive = false) {
-		if( ! $recursive )
-			return @ftp_rmdir($this->link, $path);
-
-		//TODO: Recursive Directory delete, Have to delete files from the folder first.
-		//$dir = $this->dirlist($path);
-		//foreach($dir as $file)
-
-	}
-
-	function parselisting($line) {
-		$is_windows = ($this->OS_remote == FTP_OS_Windows);
-		if ($is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/", $line, $lucifer)) {
-			$b = array();
-			if ($lucifer[3]<70) { $lucifer[3] +=2000; } else { $lucifer[3]+=1900; } // 4digit year fix
-			$b['isdir'] = ($lucifer[7]=="<DIR>");
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			else
-				$b['type'] = 'f';
-			$b['size'] = $lucifer[7];
-			$b['month'] = $lucifer[1];
-			$b['day'] = $lucifer[2];
-			$b['year'] = $lucifer[3];
-			$b['hour'] = $lucifer[4];
-			$b['minute'] = $lucifer[5];
-			$b['time'] = @mktime($lucifer[4]+(strcasecmp($lucifer[6],"PM")==0?12:0),$lucifer[5],0,$lucifer[1],$lucifer[2],$lucifer[3]);
-			$b['am/pm'] = $lucifer[6];
-			$b['name'] = $lucifer[8];
-		} else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
-			//echo $line."\n";
-			$lcount=count($lucifer);
-			if ($lcount<8) return '';
-			$b = array();
-			$b['isdir'] = $lucifer[0]{0} === "d";
-			$b['islink'] = $lucifer[0]{0} === "l";
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			elseif ( $b['islink'] )
-				$b['type'] = 'l';
-			else
-				$b['type'] = 'f';
-			$b['perms'] = $lucifer[0];
-			$b['number'] = $lucifer[1];
-			$b['owner'] = $lucifer[2];
-			$b['group'] = $lucifer[3];
-			$b['size'] = $lucifer[4];
-			if ($lcount==8) {
-				sscanf($lucifer[5],"%d-%d-%d",$b['year'],$b['month'],$b['day']);
-				sscanf($lucifer[6],"%d:%d",$b['hour'],$b['minute']);
-				$b['time'] = @mktime($b['hour'],$b['minute'],0,$b['month'],$b['day'],$b['year']);
-				$b['name'] = $lucifer[7];
-			} else {
-				$b['month'] = $lucifer[5];
-				$b['day'] = $lucifer[6];
-				if (preg_match("/([0-9]{2}):([0-9]{2})/",$lucifer[7],$l2)) {
-					$b['year'] = date("Y");
-					$b['hour'] = $l2[1];
-					$b['minute'] = $l2[2];
-				} else {
-					$b['year'] = $lucifer[7];
-					$b['hour'] = 0;
-					$b['minute'] = 0;
-				}
-				$b['time'] = strtotime(sprintf("%d %s %d %02d:%02d",$b['day'],$b['month'],$b['year'],$b['hour'],$b['minute']));
-				$b['name'] = $lucifer[8];
-			}
-		}
-
-		return $b;
-	}
-
-	function dirlist($path = '.', $incdot = false, $recursive = false) {
-		if( $this->is_file($path) ) {
-			$limitFile = basename($path);
-			$path = dirname($path) . '/';
-		} else {
-			$limitFile = false;
-		}
-
-		$list = @ftp_rawlist($this->link, '-a ' . $path, false);
-
-		if ( $list === false )
-			return false;
-
-		$dirlist = array();
-		foreach ( $list as $k => $v ) {
-			$entry = $this->parselisting($v);
-			if ( empty($entry) )
-				continue;
-
-			if ( '.' == $entry["name"] || '..' == $entry["name"] )
-				continue;
-
-			$dirlist[ $entry['name'] ] = $entry;
-		}
-
-		if ( ! $dirlist )
-			return false;
-		if ( empty($dirlist) )
-			return array();
-
-		$ret = array();
-		foreach ( $dirlist as $struc ) {
-
-			if ( 'd' == $struc['type'] ) {
-				$struc['files'] = array();
-
-				if ( $incdot ){
-					//We're including the doted starts
-					if( '.' != $struc['name'] && '..' != $struc['name'] ){ //Ok, It isnt a special folder
-						if ($recursive)
-							$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
-					}
-				} else { //No dots
-					if ($recursive)
-						$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
-				}
-			}
-			//File
-			$ret[$struc['name']] = $struc;
-		}
-		return $ret;
-	}
-
-	function __destruct(){
-		if( $this->link )
-			ftp_close($this->link);
-	}
-}
-
-?>
diff -uNr a/mp-wp/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/mp-wp/wp-admin/includes/class-wp-filesystem-ftpsockets.php
--- a/mp-wp/wp-admin/includes/class-wp-filesystem-ftpsockets.php 4b7fab2cadf7c6b81efce687e49d6eeeca0d07a582d58c121ae6aaa03b3cb9f3970a6708bcf676c921da2a0c264a34d5e22b94ce2727665ab1a0c1989336f618
+++ b/mp-wp/wp-admin/includes/class-wp-filesystem-ftpsockets.php false
@@ -1,325 +0,0 @@
-<?php
-/**
- * WordPress FTP Sockets Filesystem.
- *
- * @package WordPress
- * @subpackage Filesystem
- */
-
-/**
- * WordPress Filesystem Class for implementing FTP Sockets.
- *
- * @since 2.5
- * @package WordPress
- * @subpackage Filesystem
- * @uses WP_Filesystem_Base Extends class
- */
-class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
-	var $ftp = false;
-	var $timeout = 5;
-	var $errors;
-	var $options = array();
-
-	var $permission = null;
-
-	function WP_Filesystem_ftpsockets($opt = '') {
-		$this->method = 'ftpsockets';
-		$this->errors = new WP_Error();
-
-		//Check if possible to use ftp functions.
-		if( ! @include_once ABSPATH . 'wp-admin/includes/class-ftp.php' )
-				return false;
-		$this->ftp = new ftp();
-
-		//Set defaults:
-		if ( empty($opt['port']) )
-			$this->options['port'] = 21;
-		else
-			$this->options['port'] = $opt['port'];
-
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('FTP hostname is required'));
-		else
-			$this->options['hostname'] = $opt['hostname'];
-
-		if ( isset($opt['base']) && ! empty($opt['base']) )
-			$this->wp_base = $opt['base'];
-
-		// Check if the options provided are OK.
-		if ( empty ($opt['username']) )
-			$this->errors->add('empty_username', __('FTP username is required'));
-		else
-			$this->options['username'] = $opt['username'];
-
-		if ( empty ($opt['password']) )
-			$this->errors->add('empty_password', __('FTP password is required'));
-		else
-			$this->options['password'] = $opt['password'];
-	}
-
-	function connect() {
-		if ( ! $this->ftp )
-			return false;
-
-		//$this->ftp->Verbose = true;
-
-		if ( ! $this->ftp->SetServer($this->options['hostname'], $this->options['port']) ) {
-			$this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
-			return false;
-		}
-		if ( ! $this->ftp->connect() ) {
-			$this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
-			return false;
-		}
-
-		if ( ! $this->ftp->login($this->options['username'], $this->options['password']) ) {
-			$this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
-			return false;
-		}
-
-		$this->ftp->SetType(FTP_AUTOASCII);
-		$this->ftp->Passive(true);
-		return true;
-	}
-
-	function setDefaultPermissions($perm) {
-		$this->permission = $perm;
-	}
-
-	function get_contents($file, $type = '', $resumepos = 0) {
-		if( ! $this->exists($file) )
-			return false;
-
-		if( empty($type) )
-			$type = FTP_AUTOASCII;
-		$this->ftp->SetType($type);
-
-		$temp = wp_tempnam( $file );
-
-		if ( ! $temphandle = fopen($temp, 'w+') )
-			return false;
-
-		if ( ! $this->ftp->fget($temphandle, $file) ) {
-			fclose($temphandle);
-			unlink($temp);
-			return ''; //Blank document, File does exist, Its just blank.
-		}
-
-		fseek($temphandle, 0); //Skip back to the start of the file being written to
-		$contents = '';
-
-		while ( ! feof($temphandle) )
-			$contents .= fread($temphandle, 8192);
-
-		fclose($temphandle);
-		unlink($temp);
-		return $contents;
-	}
-
-	function get_contents_array($file) {
-		return explode("\n", $this->get_contents($file) );
-	}
-
-	function put_contents($file, $contents, $type = '' ) {
-		if( empty($type) )
-			$type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
-
-		$this->ftp->SetType($type);
-
-		$temp = wp_tempnam( $file );
-		if ( ! $temphandle = fopen($temp, 'w+') ){
-			unlink($temp);
-			return false;
-		}
-
-		fwrite($temphandle, $contents);
-		fseek($temphandle, 0); //Skip back to the start of the file being written to
-
-		$ret = $this->ftp->fput($file, $temphandle);
-
-		fclose($temphandle);
-		unlink($temp);
-		return $ret;
-	}
-
-	function cwd() {
-		$cwd = $this->ftp->pwd();
-		if( $cwd )
-			$cwd = trailingslashit($cwd);
-		return $cwd;
-	}
-
-	function chdir($file) {
-		return $this->ftp->chdir($file);
-	}
-
-	function chgrp($file, $group, $recursive = false ) {
-		return false;
-	}
-
-	function chmod($file, $mode = false, $recursive = false ) {
-		if( ! $mode )
-			$mode = $this->permission;
-		if( ! $mode )
-			return false;
-		//if( ! $this->exists($file) )
-		//	return false;
-		if( ! $recursive || ! $this->is_dir($file) ) {
-			return $this->ftp->chmod($file,$mode);
-		}
-		//Is a directory, and we want recursive
-		$filelist = $this->dirlist($file);
-		foreach($filelist as $filename){
-			$this->chmod($file . '/' . $filename, $mode, $recursive);
-		}
-		return true;
-	}
-
-	function chown($file, $owner, $recursive = false ) {
-		return false;
-	}
-
-	function owner($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['owner'];
-	}
-
-	function getchmod($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['permsn'];
-	}
-
-	function group($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['group'];
-	}
-
-	function copy($source, $destination, $overwrite = false ) {
-		if( ! $overwrite && $this->exists($destination) )
-			return false;
-
-		$content = $this->get_contents($source);
-		if ( false === $content )
-			return false;
-
-		return $this->put_contents($destination, $content);
-	}
-
-	function move($source, $destination, $overwrite = false ) {
-		return $this->ftp->rename($source, $destination);
-	}
-
-	function delete($file, $recursive = false ) {
-		if ( $this->is_file($file) )
-			return $this->ftp->delete($file);
-		if ( !$recursive )
-			return $this->ftp->rmdir($file);
-
-		return $this->ftp->mdel($file);
-	}
-
-	function exists($file) {
-		return $this->ftp->is_exists($file);
-	}
-
-	function is_file($file) {
-		return $this->is_dir($file) ? false : true;
-	}
-
-	function is_dir($path) {
-		$cwd = $this->cwd();
-		if ( $this->chdir($path) ) {
-			$this->chdir($cwd);
-			return true;
-		}
-		return false;
-	}
-
-	function is_readable($file) {
-		//Get dir list, Check if the file is writable by the current user??
-		return true;
-	}
-
-	function is_writable($file) {
-		//Get dir list, Check if the file is writable by the current user??
-		return true;
-	}
-
-	function atime($file) {
-		return false;
-	}
-
-	function mtime($file) {
-		return $this->ftp->mdtm($file);
-	}
-
-	function size($file) {
-		return $this->ftp->filesize($file);
-	}
-
-	function touch($file, $time = 0, $atime = 0 ) {
-		return false;
-	}
-
-	function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
-		if( ! $this->ftp->mkdir($path) )
-			return false;
-		if( $chmod )
-			$this->chmod($path, $chmod);
-		if( $chown )
-			$this->chown($path, $chown);
-		if( $chgrp )
-			$this->chgrp($path, $chgrp);
-		return true;
-	}
-
-	function rmdir($path, $recursive = false ) {
-		if( ! $recursive )
-			return $this->ftp->rmdir($path);
-
-		return $this->ftp->mdel($path);
-	}
-
-	function dirlist($path = '.', $incdot = false, $recursive = false ) {
-		if( $this->is_file($path) ) {
-			$limitFile = basename($path);
-			$path = dirname($path) . '/';
-		} else {
-			$limitFile = false;
-		}
-
-		$list = $this->ftp->dirlist($path);
-		if( ! $list )
-			return false;
-		if( empty($list) )
-			return array();
-
-		$ret = array();
-		foreach ( $list as $struc ) {
-
-			if ( 'd' == $struc['type'] ) {
-				$struc['files'] = array();
-
-				if ( $incdot ){
-					//We're including the doted starts
-					if( '.' != $struc['name'] && '..' != $struc['name'] ){ //Ok, It isnt a special folder
-						if ($recursive)
-							$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
-					}
-				} else { //No dots
-					if ($recursive)
-						$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
-				}
-			}
-			//File
-			$ret[$struc['name']] = $struc;
-		}
-		return $ret;
-	}
-
-	function __destruct() {
-		$this->ftp->quit();
-	}
-}
-
-?>
diff -uNr a/mp-wp/wp-admin/includes/class-wp-filesystem-ssh2.php b/mp-wp/wp-admin/includes/class-wp-filesystem-ssh2.php
--- a/mp-wp/wp-admin/includes/class-wp-filesystem-ssh2.php 793e8a50c47ebca2824dd8b2ca9e681f8670286b499ee169b2ddd10ced61322bd86279a8376725483bad2d4d42d499fbfe860eafe505fcd25c32f930f44d9d01
+++ b/mp-wp/wp-admin/includes/class-wp-filesystem-ssh2.php false
@@ -1,507 +0,0 @@
-<?php
-/**
- * WordPress SSH2 Filesystem.
- *
- * @package WordPress
- * @subpackage Filesystem
- */
-
-/**
- * WordPress Filesystem Class for implementing SSH2.
- *
- * To use this class you must follow these steps for PHP 5.2.6+
- *
- * @contrib http://kevin.vanzonneveld.net/techblog/article/make_ssh_connections_with_php/ - Installation Notes
- *
- * Complie libssh2 (Note: Only 0.14 is officaly working with PHP 5.2.6+ right now.)
- *
- * cd /usr/src
- * wget http://surfnet.dl.sourceforge.net/sourceforge/libssh2/libssh2-0.14.tar.gz
- * tar -zxvf libssh2-0.14.tar.gz
- * cd libssh2-0.14/
- * ./configure
- * make all install
- *
- * Note: No not leave the directory yet!
- *
- * Enter: pecl install -f ssh2
- *
- * Copy the ssh.so file it creates to your PHP Module Directory.
- * Open up your PHP.INI file and look for where extensions are placed.
- * Add in your PHP.ini file: extension=ssh2.so
- *
- * Restart Apache!
- * Check phpinfo() streams to confirm that: ssh2.shell, ssh2.exec, ssh2.tunnel, ssh2.scp, ssh2.sftp  exist.
- *
- *
- * @since 2.7
- * @package WordPress
- * @subpackage Filesystem
- * @uses WP_Filesystem_Base Extends class
- */
-class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
-
-	var $debugtest = false;	//	set this to true only if your a debuging your connection
-
-	var $link = null;
-	var $sftp_link = null;
-	var $keys = false;
-	/*
-	 * This is the timeout value for ssh results to comeback.
-	 * Slower servers might need this incressed, but this number otherwise should not change.
-	 *
-	 * @parm $timeout int
-	 *
-	 */
-	var $timeout = 15;
-	var $errors = array();
-	var $options = array();
-
-	var $permission = 0644;
-
-	function WP_Filesystem_SSH2($opt='') {
-		$this->method = 'ssh2';
-		$this->errors = new WP_Error();
-
-		//Check if possible to use ssh2 functions.
-		if ( ! extension_loaded('ssh2') ) {
-			$this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
-			return false;
-		}
-
-		// Set defaults:
-		if ( empty($opt['port']) )
-			$this->options['port'] = 22;
-		else
-			$this->options['port'] = $opt['port'];
-
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('SSH2 hostname is required'));
-		else
-			$this->options['hostname'] = $opt['hostname'];
-
-		if ( isset($opt['base']) && ! empty($opt['base']) )
-			$this->wp_base = $opt['base'];
-
-		// Check if the options provided are OK.
-		if ( empty ($opt['username']) )
-			$this->errors->add('empty_username', __('SSH2 username is required'));
-		else
-			$this->options['username'] = $opt['username'];
-
-		if ( ( !empty ($opt['public_key']) ) && ( !empty ($opt['private_key']) ) ) {
-			$this->options['public_key'] = $opt['public_key'];
-			$this->options['private_key'] = $opt['private_key'];
-
-			$this->options['hostkey'] = array("hostkey" => "ssh-rsa");
-
-			$this->keys = true;
-		}
-
-
-		if ( empty ($opt['password']) ) {
-			if ( !$this->keys )	//	 password can be blank if we are using keys
-				$this->errors->add('empty_password', __('SSH2 password is required'));
-		} else {
-			$this->options['password'] = $opt['password'];
-		}
-
-	}
-
-	function connect() {
-		$this->debug("connect();");
-
-		if ( ! $this->keys ) {
-			$this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
-		} else {
-			$this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']);
-		}
-
-		if ( ! $this->link ) {
-			$this->errors->add('connect', sprintf(__('Failed to connect to SSH2 Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
-			return false;
-		}
-
-		if ( !$this->keys ) {
-			if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password']) ) {
-				$this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
-				return false;
-			}
-		} else {
-			if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
-				$this->errors->add('auth', sprintf(__('Public and Private keys incorrent for %s'), $this->options['username']));
-				return false;
-			}
-		}
-
-		$this->sftp_link = ssh2_sftp($this->link);
-
-		return true;
-	}
-
-	function run_command($link, $command, $returnbool = false) {
-		$this->debug("run_command();");
-		if(!($stream = @ssh2_exec( $link, $command . "; echo \"__COMMAND_FINISHED__\";"))) {
-			$this->errors->add('command', sprintf(__('Unable to perform command: %s'), $command));
-		} else {
-			stream_set_blocking( $stream, true );
-			$time_start = time();
-			$data = null;
-			while( true ) {
-				if (strpos($data,"__COMMAND_FINISHED__") !== false){
-					break;	//	the command has finshed!
-				}
-				if( (time()-$time_start) > $this->timeout ){
-					$this->errors->add('command', sprintf(__('Connection to the server has timeout after %s seconds.'), $this->timeout));
-					unset($this->link);
-					unset($this->sftp_link); //	close connections
-					return false;
-				}
-				while( $buf = fread( $stream, strlen($stream) ) )
-					$data .= $buf;
-			}
-			fclose($stream);
-			$data = trim(str_replace("__COMMAND_FINISHED__", "", $data));
-			if (($returnbool) && ( (int) $data )) {
-				return true;
-			} elseif (($returnbool) && (! (int) $data )) {
-				return false;
-			} else {
-				return $data;
-			}
-		}
-		return false;
-	}
-
-	function debug($text)
-	{
-		if ($this->debugtest)
-		{
-			echo "<br/>" . $text . "<br/>";
-		}
-	}
-
-	function setDefaultPermissions($perm) {
-		$this->debug("setDefaultPermissions();");
-		if ( $perm )
-			$this->permission = $perm;
-	}
-
-	function get_contents($file, $type = '', $resumepos = 0 ) {
-		$this->debug("get_contents();");
-		$tempfile = wp_tempnam( $file );
-		if ( ! $tempfile )
-			return false;
-		if( ! ssh2_scp_recv($this->link, $file, $tempfile) )
-			return false;
-		$contents = file_get_contents($tempfile);
-		unlink($tempfile);
-		return $contents;
-	}
-
-	function get_contents_array($file) {
-		$this->debug("get_contents_array();");
-		return explode("\n", $this->get_contents($file));
-	}
-
-	function put_contents($file, $contents, $type = '' ) {
-		$this->debug("put_contents($file);");
-		$tempfile = wp_tempnam( $file );
-		$temp = fopen($tempfile, 'w');
-		if ( ! $temp )
-			return false;
-		fwrite($temp, $contents);
-		fclose($temp);
-		$ret = ssh2_scp_send($this->link, $tempfile, $file, $this->permission);
-		unlink($tempfile);
-		return $ret;
-	}
-
-	function cwd() {
-		$this->debug("cwd();");
-		$cwd = $this->run_command($this->link, 'pwd');
-		if( $cwd )
-			$cwd = trailingslashit($cwd);
-		return $cwd;
-	}
-
-	function chdir($dir) {
-		$this->debug("chdir();");
-		return $this->run_command($this->link, 'cd ' . $dir, true);
-	}
-
-	function chgrp($file, $group, $recursive = false ) {
-		$this->debug("chgrp();");
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command($this->link, sprintf('chgrp %o %s', $mode, $file), true);
-		return $this->run_command($this->link, sprintf('chgrp -R %o %s', $mode, $file), true);
-	}
-
-	function chmod($file, $mode = false, $recursive = false) {
-		$this->debug("chmod();");
-		if( ! $mode )
-			$mode = $this->permission;
-		if( ! $mode )
-			return false;
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command($this->link, sprintf('chmod %o %s', $mode, $file), true);
-		return $this->run_command($this->link, sprintf('chmod -R %o %s', $mode, $file), true);
-	}
-
-	function chown($file, $owner, $recursive = false ) {
-		$this->debug("chown();");
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command($this->link, sprintf('chown %o %s', $mode, $file), true);
-		return $this->run_command($this->link, sprintf('chown -R %o %s', $mode, $file), true);
-	}
-
-	function owner($file) {
-		$this->debug("owner();");
-		$dir = $this->dirlist($file);
-		return $dir[$file]['owner'];
-	}
-
-	function getchmod($file) {
-		$this->debug("getchmod();");
-		$dir = $this->dirlist($file);
-		return $dir[$file]['permsn'];
-	}
-
-	function group($file) {
-		$this->debug("group();");
-		$dir = $this->dirlist($file);
-		return $dir[$file]['group'];
-	}
-
-	function copy($source, $destination, $overwrite = false ) {
-		$this->debug("copy();");
-		if( ! $overwrite && $this->exists($destination) )
-			return false;
-		$content = $this->get_contents($source);
-		if( false === $content)
-			return false;
-		return $this->put_contents($destination, $content);
-	}
-
-	function move($source, $destination, $overwrite = false) {
-		$this->debug("move();");
-		return @ssh2_sftp_rename($this->link, $source, $destination);
-	}
-
-	function delete($file, $recursive = false) {
-		$this->debug("delete();");
-		if ( $this->is_file($file) )
-			return ssh2_sftp_unlink($this->sftp_link, $file);
-		if ( ! $recursive )
-			 return ssh2_sftp_rmdir($this->sftp_link, $file);
-		$filelist = $this->dirlist($file);
-		if ( is_array($filelist) ) {
-			foreach ( $filelist as $filename => $fileinfo) {
-				$this->delete($file . '/' . $filename, $recursive);
-			}
-		}
-		return ssh2_sftp_rmdir($this->sftp_link, $file);
-	}
-
-	function exists($file) {
-		$this->debug("exists();");
-		return $this->run_command($this->link, sprintf('ls -lad %s', $file), true);
-	}
-
-	function is_file($file) {
-		$this->debug("is_file();");
-		//DO NOT RELY ON dirlist()!
-		$list = $this->run_command($this->link, sprintf('ls -lad %s', $file));
-		$list = $this->parselisting($list);
-		if ( ! $list )
-			return false;
-		else
-			return ( !$list['isdir'] && !$list['islink'] ); //ie. not a file or link, yet exists, must be file.
-	}
-
-	function is_dir($path) {
-		$this->debug("is_dir();");
-		//DO NOT RELY ON dirlist()!
-		$list = $this->parselisting($this->run_command($this->link, sprintf('ls -lad %s', untrailingslashit($path))));
-		if ( ! $list )
-			return false;
-		else
-			return $list['isdir'];
-	}
-
-	function is_readable($file) {
-		//Not implmented.
-	}
-
-	function is_writable($file) {
-		//Not implmented.
-	}
-
-	function atime($file) {
-		//Not implmented.
-	}
-
-	function mtime($file) {
-		//Not implmented.
-	}
-
-	function size($file) {
-		//Not implmented.
-	}
-
-	function touch($file, $time = 0, $atime = 0) {
-		//Not implmented.
-	}
-
-	function mkdir($path, $chmod = null, $chown = false, $chgrp = false) {
-		$this->debug("mkdir();");
-		$path = untrailingslashit($path);
-		if( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
-			return false;
-		if( $chown )
-			$this->chown($path, $chown);
-		if( $chgrp )
-			$this->chgrp($path, $chgrp);
-		return true;
-	}
-
-	function rmdir($path, $recursive = false) {
-		$this->debug("rmdir();");
-		return $this->delete($path, $recursive);
-	}
-
-	function parselisting($line) {
-	$this->debug("parselisting();");
-		$is_windows = ($this->OS_remote == FTP_OS_Windows);
-		if ($is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/", $line, $lucifer)) {
-			$b = array();
-			if ($lucifer[3]<70) { $lucifer[3] +=2000; } else { $lucifer[3]+=1900; } // 4digit year fix
-			$b['isdir'] = ($lucifer[7]=="<DIR>");
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			else
-				$b['type'] = 'f';
-			$b['size'] = $lucifer[7];
-			$b['month'] = $lucifer[1];
-			$b['day'] = $lucifer[2];
-			$b['year'] = $lucifer[3];
-			$b['hour'] = $lucifer[4];
-			$b['minute'] = $lucifer[5];
-			$b['time'] = @mktime($lucifer[4]+(strcasecmp($lucifer[6],"PM")==0?12:0),$lucifer[5],0,$lucifer[1],$lucifer[2],$lucifer[3]);
-			$b['am/pm'] = $lucifer[6];
-			$b['name'] = $lucifer[8];
-		} else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
-			//echo $line."\n";
-			$lcount=count($lucifer);
-			if ($lcount<8) return '';
-			$b = array();
-			$b['isdir'] = $lucifer[0]{0} === "d";
-			$b['islink'] = $lucifer[0]{0} === "l";
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			elseif ( $b['islink'] )
-				$b['type'] = 'l';
-			else
-				$b['type'] = 'f';
-			$b['perms'] = $lucifer[0];
-			$b['number'] = $lucifer[1];
-			$b['owner'] = $lucifer[2];
-			$b['group'] = $lucifer[3];
-			$b['size'] = $lucifer[4];
-			if ($lcount==8) {
-				sscanf($lucifer[5],"%d-%d-%d",$b['year'],$b['month'],$b['day']);
-				sscanf($lucifer[6],"%d:%d",$b['hour'],$b['minute']);
-				$b['time'] = @mktime($b['hour'],$b['minute'],0,$b['month'],$b['day'],$b['year']);
-				$b['name'] = $lucifer[7];
-			} else {
-				$b['month'] = $lucifer[5];
-				$b['day'] = $lucifer[6];
-				if (preg_match("/([0-9]{2}):([0-9]{2})/",$lucifer[7],$l2)) {
-					$b['year'] = date("Y");
-					$b['hour'] = $l2[1];
-					$b['minute'] = $l2[2];
-				} else {
-					$b['year'] = $lucifer[7];
-					$b['hour'] = 0;
-					$b['minute'] = 0;
-				}
-				$b['time'] = strtotime(sprintf("%d %s %d %02d:%02d",$b['day'],$b['month'],$b['year'],$b['hour'],$b['minute']));
-				$b['name'] = $lucifer[8];
-			}
-		}
-
-		return $b;
-	}
-
-	function dirlist($path = '.', $incdot = false, $recursive = false) {
-		$this->debug("dirlist();");
-		if( $this->is_file($path) ) {
-			$limitFile = basename($path);
-			$path = trailingslashit(dirname($path));
-		} else {
-			$limitFile = false;
-		}
-
-		$list = $this->run_command($this->link, sprintf('ls -la %s', $path));
-
-		if ( $list === false )
-			return false;
-
-		$list = explode("\n", $list);
-
-		$dirlist = array();
-		foreach ( (array)$list as $k => $v ) {
-			$entry = $this->parselisting($v);
-			if ( empty($entry) )
-				continue;
-
-			if ( '.' == $entry['name'] || '..' == $entry['name'] )
-				continue;
-
-			$dirlist[ $entry['name'] ] = $entry;
-		}
-
-		if ( ! $dirlist )
-			return false;
-
-		if ( empty($dirlist) )
-			return array();
-
-		$ret = array();
-		foreach ( $dirlist as $struc ) {
-
-			if ( 'd' == $struc['type'] ) {
-				$struc['files'] = array();
-
-				if ( $incdot ){
-					//We're including the doted starts
-					if( '.' != $struc['name'] && '..' != $struc['name'] ){ //Ok, It isnt a special folder
-						if ($recursive)
-							$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
-					}
-				} else { //No dots
-					if ( $recursive )
-						$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
-				}
-			}
-			//File
-			$ret[$struc['name']] = $struc;
-		}
-		return $ret;
-	}
-	function __destruct() {
-		$this->debug("__destruct();");
-		if ( $this->link )
-			unset($this->link);
-		if ( $this->sftp_link )
-			unset($this->sftp_link);
-	}
-}
-
-?>
diff -uNr a/mp-wp/wp-admin/includes/comment.php b/mp-wp/wp-admin/includes/comment.php
--- a/mp-wp/wp-admin/includes/comment.php 925fc35aefe98838cec79236f68eb0b305662566c2944b261a4ffa150619116b6f6e1add761f1acf461656742447b64e72bd255ae7d505cbfde2972d4debfbbc
+++ b/mp-wp/wp-admin/includes/comment.php 0ba39a3444470d82a52e70f2f321d3f86874891a76b1678f37d8000d3f22ae948528ad8c6a047e8dfb27538e888c251926ed2c7b294ba0a345c3304126abc9a1
@@ -151,11 +151,6 @@
 	return "$avatar $name";
 }
 
-function enqueue_comment_hotkeys_js() {
-	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
-		wp_enqueue_script( 'jquery-table-hotkeys' );
-}
-
 if ( is_admin() && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
 	if ( get_option('show_avatars') )
 		add_filter( 'comment_author', 'floated_admin_avatar' );
diff -uNr a/mp-wp/wp-admin/includes/dashboard.php b/mp-wp/wp-admin/includes/dashboard.php
--- a/mp-wp/wp-admin/includes/dashboard.php 237b6b3c050348cbbd984c97b5030637a17a3c98c6252e4be8d68fbb82ae327b2dc90de81f4bd99c081361e65359f9adf00c1d6f2fa330d94bef05e3959e9f91
+++ b/mp-wp/wp-admin/includes/dashboard.php 2c6f9fd702518c4606dae01232495e2abe75c6c3147c7a9af2eab3193ac23fbfd8ab862d72f91cf36871bae341b6263ffb720d9c91a3e543911e3b709b9133fb
@@ -31,58 +31,10 @@
 	$recent_comments_title = __( 'Recent Comments' );
 	wp_add_dashboard_widget( 'dashboard_recent_comments', $recent_comments_title, 'wp_dashboard_recent_comments' );
 
-	// Incoming Links Widget
-	if ( !isset( $widget_options['dashboard_incoming_links'] ) || !isset( $widget_options['dashboard_incoming_links']['home'] ) || $widget_options['dashboard_incoming_links']['home'] != get_option('home') ) {
-		$update = true;
-		$widget_options['dashboard_incoming_links'] = array(
-			'home' => get_option('home'),
-			'link' => apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?hl=en&scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
-			'url' => apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&ie=utf-8&num=10&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
-			'items' => isset($widget_options['dashboard_incoming_links']['items']) ? $widget_options['dashboard_incoming_links']['items'] : 10,
-			'show_date' => isset($widget_options['dashboard_incoming_links']['show_date']) ? $widget_options['dashboard_incoming_links']['show_date'] : false
-		);
-	}
-	wp_add_dashboard_widget( 'dashboard_incoming_links', __( 'Incoming Links' ), 'wp_dashboard_incoming_links', 'wp_dashboard_incoming_links_control' );
-
-	// WP Plugins Widget
-	if ( current_user_can( 'activate_plugins' ) )
-		wp_add_dashboard_widget( 'dashboard_plugins', __( 'Plugins' ), 'wp_dashboard_plugins' );
-
-	// QuickPress Widget
-	if ( current_user_can('edit_posts') )
-		wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press' );
-
 	// Recent Drafts
 	if ( current_user_can('edit_posts') )
 		wp_add_dashboard_widget( 'dashboard_recent_drafts', __('Recent Drafts'), 'wp_dashboard_recent_drafts' );
 
-	// Primary feed (Dev Blog) Widget
-	if ( !isset( $widget_options['dashboard_primary'] ) ) {
-		$update = true;
-		$widget_options['dashboard_primary'] = array(
-			'link' => apply_filters( 'dashboard_primary_link',  __( 'http://wordpress.org/development/' ) ),
-			'url' => apply_filters( 'dashboard_primary_feed',  __( 'http://wordpress.org/development/feed/' ) ),
-			'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress Development Blog' ) ),
-			'items' => 2,
-			'show_summary' => 1,
-			'show_author' => 0,
-			'show_date' => 1
-		);
-	}
-	wp_add_dashboard_widget( 'dashboard_primary', $widget_options['dashboard_primary']['title'], 'wp_dashboard_primary', 'wp_dashboard_primary_control' );
-
-	// Secondary Feed (Planet) Widget
-	if ( !isset( $widget_options['dashboard_secondary'] ) ) {
-		$update = true;
-		$widget_options['dashboard_secondary'] = array(
-			'link' => apply_filters( 'dashboard_secondary_link',  __( 'http://planet.wordpress.org/' ) ),
-			'url' => apply_filters( 'dashboard_secondary_feed',  __( 'http://planet.wordpress.org/feed/' ) ),
-			'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
-			'items' => 5
-		);
-	}
-	wp_add_dashboard_widget( 'dashboard_secondary', $widget_options['dashboard_secondary']['title'], 'wp_dashboard_secondary', 'wp_dashboard_secondary_control' );
-
 	// Hook to register new widgets
 	do_action( 'wp_dashboard_setup' );
 
@@ -175,7 +127,6 @@
 
 	$num_comm = wp_count_comments( );
 
-	echo "\n\t".'<p class="sub">' . __('At a Glance') . '</p>';
 	echo "\n\t".'<div class="table">'."\n\t".'<table>';
 	echo "\n\t".'<tr class="first">';
 
@@ -278,91 +229,11 @@
 	}
 
 	echo '</p>';
-
-	echo sprintf('<span id="wp-version-message">You are using <span class="b">WordPress %s</span></span>', $GLOBALS['wp_version']);
-
 	echo "\n\t".'</div>';
 	do_action( 'rightnow_end' );
 	do_action( 'activity_box_end' );
 }
 
-function wp_dashboard_quick_press() {
-	$drafts = false;
-	if ( 'post' === strtolower( $_SERVER['REQUEST_METHOD'] ) && isset( $_POST['action'] ) && 0 === strpos( $_POST['action'], 'post-quickpress' ) && (int) $_POST['post_ID'] ) {
-		$view = get_permalink( $_POST['post_ID'] );
-		$edit = clean_url( get_edit_post_link( $_POST['post_ID'] ) );
-		if ( 'post-quickpress-publish' == $_POST['action'] ) {
-			if ( current_user_can('publish_posts') )
-				printf( '<div class="message"><p>' . __( 'Post Published. <a href="%s">View post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', clean_url( $view ), $edit );
-			else
-				printf( '<div class="message"><p>' . __( 'Post submitted. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', clean_url( add_query_arg( 'preview', 1, $view ) ), $edit );
-		} else {
-			printf( '<div class="message"><p>' . __( 'Draft Saved. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', clean_url( add_query_arg( 'preview', 1, $view ) ), $edit );
-			$drafts_query = new WP_Query( array(
-				'post_type' => 'post',
-				'what_to_show' => 'posts',
-				'post_status' => 'draft',
-				'author' => $GLOBALS['current_user']->ID,
-				'posts_per_page' => 1,
-				'orderby' => 'modified',
-				'order' => 'DESC'
-			) );
-
-			if ( $drafts_query->posts )
-				$drafts =& $drafts_query->posts;
-		}
-		printf('<p class="textright">' . __('You can also try %s, easy blogging from anywhere on the Web.') . '</p>', '<a href="tools.php">' . __('Press This') . '</a>' );
-		$_REQUEST = array(); // hack for get_default_post_to_edit()
-	}
-
-	$post = get_default_post_to_edit();
-?>
-
-	<form name="post" action="<?php echo clean_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press">
-		<h4 id="quick-post-title"><label for="title"><?php _e('Title') ?></label></h4>
-		<div class="input-text-wrap">
-			<input type="text" name="post_title" id="title" tabindex="1" autocomplete="off" value="<?php echo attribute_escape( $post->post_title ); ?>" />
-		</div>
-
-		<?php if ( current_user_can( 'upload_files' ) ) : ?>
-		<div id="media-buttons" class="hide-if-no-js">
-			<?php do_action( 'media_buttons' ); ?>
-		</div>
-		<?php endif; ?>
-
-		<h4 id="content-label"><label for="content"><?php _e('Content') ?></label></h4>
-		<div class="textarea-wrap">
-			<textarea name="content" id="content" rows="3" cols="15" tabindex="2"><?php echo $post->post_content; ?></textarea>
-		</div>
-
-		<script type="text/javascript">edCanvas = document.getElementById('content');edInsertContent = null;</script>
-
-		<h4><label for="tags-input"><?php _e('Tags') ?></label></h4>
-		<div class="input-text-wrap">
-			<input type="text" name="tags_input" id="tags-input" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" />
-		</div>
-
-		<p class="submit">
-			<input type="hidden" name="action" id="quickpost-action" value="post-quickpress-save" />
-			<input type="hidden" name="quickpress_post_ID" value="<?php echo (int) $post->ID; ?>" />
-			<?php wp_nonce_field('add-post'); ?>
-			<input type="submit" name="save" id="save-post" class="button" tabindex="4" value="<?php _e('Save Draft'); ?>" />
-			<input type="reset" value="<?php _e( 'Cancel' ); ?>" class="cancel" />
-			<?php if ( current_user_can('publish_posts') ) { ?>
-			<input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php _e('Publish'); ?>" />
-			<?php } else { ?>
-			<input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php _e('Submit for Review'); ?>" />
-			<?php } ?>
-			<br class="clear" />
-		</p>
-
-	</form>
-
-<?php
-	if ( $drafts )
-		wp_dashboard_recent_drafts( $drafts );
-}
-
 function wp_dashboard_recent_drafts( $drafts = false ) {
 	if ( !$drafts ) {
 		$drafts_query = new WP_Query( array(
@@ -474,8 +345,6 @@
 		$actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
 		$actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
 		$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
-		//$actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
-		$actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
 		$actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . _c( 'Spam|verb' ) . '</a>';
 		$actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
 
@@ -486,10 +355,6 @@
 			++$i;
 			( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
 
-			// Reply and quickedit need a hide-if-no-js span
-			if ( 'reply' == $action || 'quickedit' == $action )
-				$action .= ' hide-if-no-js';
-
 			$actions_string .= "<span class='$action'>$sep$link</span>";
 		}
 	}
@@ -668,66 +533,6 @@
 	echo "</div>";
 }
 
-function wp_dashboard_plugins() {
-	wp_dashboard_cached_rss_widget( 'dashboard_plugins', 'wp_dashboard_plugins_output', array(
-		'http://wordpress.org/extend/plugins/rss/browse/popular/',
-		'http://wordpress.org/extend/plugins/rss/browse/new/',
-		'http://wordpress.org/extend/plugins/rss/browse/updated/'
-	) );
-}
-
-/**
- * Display plugins most popular, newest plugins, and recently updated widget text.
- *
- * @since unknown
- */
-function wp_dashboard_plugins_output() {
-	$popular = @fetch_rss( 'http://wordpress.org/extend/plugins/rss/browse/popular/' );
-	$new     = @fetch_rss( 'http://wordpress.org/extend/plugins/rss/browse/new/' );
-	$updated = @fetch_rss( 'http://wordpress.org/extend/plugins/rss/browse/updated/' );
-
-	foreach ( array( 'popular' => __('Most Popular'), 'new' => __('Newest Plugins'), 'updated' => __('Recently Updated') ) as $feed => $label ) {
-		if ( !isset($$feed->items) || 0 == count($$feed->items) )
-			continue;
-
-		$$feed->items = array_slice($$feed->items, 0, 5);
-		$item_key = array_rand($$feed->items);
-
-		// Eliminate some common badly formed plugin descriptions
-		while ( ( null !== $item_key = array_rand($$feed->items) ) && false !== strpos( $$feed->items[$item_key]['description'], 'Plugin Name:' ) )
-			unset($$feed->items[$item_key]);
-
-		if ( !isset($$feed->items[$item_key]) )
-			continue;
-
-		$item = $$feed->items[$item_key];
-
-		// current bbPress feed item titles are: user on "topic title"
-		if ( preg_match( '/"(.*)"/s', $item['title'], $matches ) )
-			$title = $matches[1];
-		else // but let's make it forward compatible if things change
-			$title = $item['title'];
-		$title = wp_specialchars( $title );
-
-		$description = wp_specialchars( strip_tags(html_entity_decode($item['description'], ENT_QUOTES)) );
-
-		list($link, $frag) = explode( '#', $item['link'] );
-
-		$link = clean_url($link);
-		if( preg_match('|/([^/]+?)/?$|', $link, $matches) )
-			$slug = $matches[1];
-		else
-			$slug = '';
-
-		$ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) .
-							'&amp;TB_iframe=true&amp;width=600&amp;height=800';
-
-		echo "<h4>$label</h4>\n";
-		echo "<h5><a href='$link'>$title</a></h5>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span>\n";
-		echo "<p>$description</p>\n";
-	}
-}
-
 /**
  * Checks to see if all of the feed url in $check_urls are cached.
  *
diff -uNr a/mp-wp/wp-admin/includes/file.php b/mp-wp/wp-admin/includes/file.php
--- a/mp-wp/wp-admin/includes/file.php d15748396bc55befc5382493a14277183743bdfbdac539adf53761ff46f57f90e2edd86ed3231afb0d0f6981e51a1ba1f04756c59ccd4cd100ebebb737d412b8
+++ b/mp-wp/wp-admin/includes/file.php 21d106bb4cd0fc4fa5adbb52a7d10ce57bc8c2c1bd9cb7b47797f337774acbbe735fd8aa63946ed841d9a05961976a90fe6afc2ade47392fe9b2e02730448575
@@ -40,29 +40,6 @@
  *
  * @since unknown
  *
- * @param unknown_type $file
- * @return unknown
- */
-function get_file_description( $file ) {
-	global $wp_file_descriptions;
-
-	if ( isset( $wp_file_descriptions[basename( $file )] ) ) {
-		return $wp_file_descriptions[basename( $file )];
-	}
-	elseif ( file_exists( WP_CONTENT_DIR . $file ) && is_file( WP_CONTENT_DIR . $file ) ) {
-		$template_data = implode( '', file( WP_CONTENT_DIR . $file ) );
-		if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ))
-			return $name[1] . ' Page Template';
-	}
-
-	return basename( $file );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
  * @return unknown
  */
 function get_home_path() {
@@ -84,60 +61,6 @@
  *
  * @since unknown
  *
- * @param unknown_type $file
- * @return unknown
- */
-function get_real_file_to_edit( $file ) {
-	if ('index.php' == $file || '.htaccess' == $file ) {
-		$real_file = get_home_path() . $file;
-	} else {
-		$real_file = WP_CONTENT_DIR . $file;
-	}
-
-	return $real_file;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param string $folder Optional. Full path to folder
- * @param int $levels Optional. Levels of folders to follow, Default: 100 (PHP Loop limit).
- * @return bool|array
- */
-function list_files( $folder = '', $levels = 100 ) {
-	if( empty($folder) )
-		return false;
-
-	if( ! $levels )
-		return false;
-
-	$files = array();
-	if ( $dir = @opendir( $folder ) ) {
-		while (($file = readdir( $dir ) ) !== false ) {
-			if ( in_array($file, array('.', '..') ) )
-				continue;
-			if ( is_dir( $folder . '/' . $file ) ) {
-				$files2 = list_files( $folder . '/' . $file, $levels - 1);
-				if( $files2 )
-					$files = array_merge($files, $files2 );
-				else
-					$files[] = $folder . '/' . $file . '/';
-			} else {
-				$files[] = $folder . '/' . $file;
-			}
-		}
-	}
-	@closedir( $dir );
-	return $files;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
  * @return unknown
  */
 function get_temp_dir() {
@@ -180,35 +103,6 @@
  *
  * @since unknown
  *
- * @param unknown_type $file
- * @param unknown_type $allowed_files
- * @return unknown
- */
-function validate_file_to_edit( $file, $allowed_files = '' ) {
-	$file = stripslashes( $file );
-
-	$code = validate_file( $file, $allowed_files );
-
-	if (!$code )
-		return $file;
-
-	switch ( $code ) {
-		case 1 :
-			wp_die( __('Sorry, can&#8217;t edit files with ".." in the name. If you are trying to edit a file in your WordPress home directory, you can just type the name of the file in.' ));
-
-		case 2 :
-			wp_die( __('Sorry, can&#8217;t call files with their real path.' ));
-
-		case 3 :
-			wp_die( __('Sorry, that file cannot be edited.' ));
-	}
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
  * @param array $file Reference to a single element of $_FILES. Call the function once for each uploaded file.
  * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ).
  * @return array On success, returns an associative array of file attributes. On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
@@ -309,461 +203,4 @@
 	return $return;
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * Pass this function an array similar to that of a $_FILES POST array.
- *
- * @since unknown
- *
- * @param unknown_type $file
- * @param unknown_type $overrides
- * @return unknown
- */
-function wp_handle_sideload( &$file, $overrides = false ) {
-	// The default error handler.
-	if (! function_exists( 'wp_handle_upload_error' ) ) {
-		function wp_handle_upload_error( &$file, $message ) {
-			return array( 'error'=>$message );
-		}
-	}
-
-	// You may define your own function and pass the name in $overrides['upload_error_handler']
-	$upload_error_handler = 'wp_handle_upload_error';
-
-	// You may define your own function and pass the name in $overrides['unique_filename_callback']
-	$unique_filename_callback = null;
-
-	// $_POST['action'] must be set and its value must equal $overrides['action'] or this:
-	$action = 'wp_handle_sideload';
-
-	// Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error'].
-	$upload_error_strings = array( false,
-		__( "The file exceeds the <code>upload_max_filesize</code> directive in <code>php.ini</code>." ),
-		__( "The file exceeds the <em>MAX_FILE_SIZE</em> directive that was specified in the HTML form." ),
-		__( "The file was only partially uploaded." ),
-		__( "No file was sent." ),
-		__( "Missing a temporary folder." ),
-		__( "Failed to write file to disk." ));
-
-	// All tests are on by default. Most can be turned off by $override[{test_name}] = false;
-	$test_form = true;
-	$test_size = true;
-
-	// If you override this, you must provide $ext and $type!!!!
-	$test_type = true;
-	$mimes = false;
-
-	// Install user overrides. Did we mention that this voids your warranty?
-	if ( is_array( $overrides ) )
-		extract( $overrides, EXTR_OVERWRITE );
-
-	// A correct form post will pass this test.
-	if ( $test_form && (!isset( $_POST['action'] ) || ($_POST['action'] != $action ) ) )
-		return $upload_error_handler( $file, __( 'Invalid form submission.' ));
-
-	// A successful upload will pass this test. It makes no sense to override this one.
-	if ( $file['error'] > 0 )
-		return $upload_error_handler( $file, $upload_error_strings[$file['error']] );
-
-	// A non-empty file will pass this test.
-	if ( $test_size && !(filesize($file['tmp_name']) > 0 ) )
-		return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini.' ));
-
-	// A properly uploaded file will pass this test. There should be no reason to override this one.
-	if (! @ is_file( $file['tmp_name'] ) )
-		return $upload_error_handler( $file, __( 'Specified file does not exist.' ));
-
-	// A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
-	if ( $test_type ) {
-		$wp_filetype = wp_check_filetype( $file['name'], $mimes );
-
-		extract( $wp_filetype );
-
-		if ( ( !$type || !$ext ) && !current_user_can( 'unfiltered_upload' ) )
-			return $upload_error_handler( $file, __( 'File type does not meet security guidelines. Try another.' ));
-
-		if ( !$ext )
-			$ext = ltrim(strrchr($file['name'], '.'), '.');
-
-		if ( !$type )
-			$type = $file['type'];
-	}
-
-	// A writable uploads dir will pass this test. Again, there's no point overriding this one.
-	if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
-		return $upload_error_handler( $file, $uploads['error'] );
-
-	$filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
-
-	// Strip the query strings.
-	$filename = str_replace('?','-', $filename);
-	$filename = str_replace('&','-', $filename);
-
-	// Move the file to the uploads dir
-	$new_file = $uploads['path'] . "/$filename";
-	if ( false === @ rename( $file['tmp_name'], $new_file ) ) {
-		return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) );
-	}
-
-	// Set correct file permissions
-	$stat = stat( dirname( $new_file ));
-	$perms = $stat['mode'] & 0000666;
-	@ chmod( $new_file, $perms );
-
-	// Compute the URL
-	$url = $uploads['url'] . "/$filename";
-
-	$return = apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ) );
-
-	return $return;
-}
-
-/**
- * Downloads a url to a local file using the Snoopy HTTP Class.
- *
- * @since unknown
- * @todo Transition over to using the new HTTP Request API (jacob).
- *
- * @param string $url the URL of the file to download
- * @return mixed WP_Error on failure, string Filename on success.
- */
-function download_url( $url ) {
-	//WARNING: The file is not automatically deleted, The script must unlink() the file.
-	if ( ! $url )
-		return new WP_Error('http_no_url', __('Invalid URL Provided'));
-
-	$tmpfname = wp_tempnam($url);
-	if ( ! $tmpfname )
-		return new WP_Error('http_no_file', __('Could not create Temporary file'));
-
-	$handle = @fopen($tmpfname, 'wb');
-	if ( ! $handle )
-		return new WP_Error('http_no_file', __('Could not create Temporary file'));
-
-	$response = wp_remote_get($url, array('timeout' => 30));
-
-	if ( is_wp_error($response) ) {
-		fclose($handle);
-		unlink($tmpfname);
-		return $response;
-	}
-
-	if ( $response['response']['code'] != '200' ){
-		fclose($handle);
-		unlink($tmpfname);
-		return new WP_Error('http_404', trim($response['response']['message']));
-	}
-
-	fwrite($handle, $response['body']);
-	fclose($handle);
-
-	return $tmpfname;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $file
- * @param unknown_type $to
- * @return unknown
- */
-function unzip_file($file, $to) {
-	global $wp_filesystem;
-
-	if ( ! $wp_filesystem || !is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
-
-	// Unzip uses a lot of memory
-	@ini_set('memory_limit', '256M');
-
-	$fs =& $wp_filesystem;
-
-	require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
-
-	$archive = new PclZip($file);
-
-	// Is the archive valid?
-	if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
-		return new WP_Error('incompatible_archive', __('Incompatible archive'), $archive->errorInfo(true));
-
-	if ( 0 == count($archive_files) )
-		return new WP_Error('empty_archive', __('Empty archive'));
-
-	$path = explode('/', untrailingslashit($to));
-	for ( $i = count($path); $i > 0; $i-- ) { //>0 = first element is empty allways for paths starting with '/'
-		$tmppath = implode('/', array_slice($path, 0, $i) );
-		if ( $fs->is_dir($tmppath) ) { //Found the highest folder that exists, Create from here(ie +1)
-			for ( $i = $i + 1; $i <= count($path); $i++ ) {
-				$tmppath = implode('/', array_slice($path, 0, $i) );
-				if ( ! $fs->mkdir($tmppath, FS_CHMOD_DIR) )
-					return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
-			}
-			break; //Exit main for loop
-		}
-	}
-
-	$to = trailingslashit($to);
-	foreach ($archive_files as $file) {
-		$path = $file['folder'] ? $file['filename'] : dirname($file['filename']);
-		$path = explode('/', $path);
-		for ( $i = count($path); $i >= 0; $i-- ) { //>=0 as the first element contains data
-			if ( empty($path[$i]) )
-				continue;
-			$tmppath = $to . implode('/', array_slice($path, 0, $i) );
-			if ( $fs->is_dir($tmppath) ) {//Found the highest folder that exists, Create from here
-				for ( $i = $i + 1; $i <= count($path); $i++ ) { //< count() no file component please.
-					$tmppath = $to . implode('/', array_slice($path, 0, $i) );
-					if ( ! $fs->is_dir($tmppath) && ! $fs->mkdir($tmppath, FS_CHMOD_DIR) )
-						return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
-				}
-				break; //Exit main for loop
-			}
-		}
-
-		// We've made sure the folders are there, so let's extract the file now:
-		if ( ! $file['folder'] ) {
-			if ( !$fs->put_contents( $to . $file['filename'], $file['content']) )
-				return new WP_Error('copy_failed', __('Could not copy file'), $to . $file['filename']);
-			$fs->chmod($to . $file['filename'], FS_CHMOD_FILE);
-		}
-	}
-	return true;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $from
- * @param unknown_type $to
- * @return unknown
- */
-function copy_dir($from, $to) {
-	global $wp_filesystem;
-
-	$dirlist = $wp_filesystem->dirlist($from);
-
-	$from = trailingslashit($from);
-	$to = trailingslashit($to);
-
-	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( 'f' == $fileinfo['type'] ) {
-			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) ) {
-				// If copy failed, chmod file to 0644 and try again.
-				$wp_filesystem->chmod($to . $filename, 0644);
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) )
-					return new WP_Error('copy_failed', __('Could not copy file'), $to . $filename);
-			}
-			$wp_filesystem->chmod($to . $filename, FS_CHMOD_FILE);
-		} elseif ( 'd' == $fileinfo['type'] ) {
-			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-					return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $filename);
-			}
-			$result = copy_dir($from . $filename, $to . $filename);
-			if ( is_wp_error($result) )
-				return $result;
-		}
-	}
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $args
- * @return unknown
- */
-function WP_Filesystem( $args = false ) {
-	global $wp_filesystem;
-
-	require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
-
-	$method = get_filesystem_method($args);
-
-	if ( ! $method )
-		return false;
-
-	$abstraction_file = apply_filters('filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method);
-	if( ! file_exists($abstraction_file) )
-		return;
-
-	require_once($abstraction_file);
-	$method = "WP_Filesystem_$method";
-
-	$wp_filesystem = new $method($args);
-
-	if ( $wp_filesystem->errors->get_error_code() )
-		return false;
-
-	if ( !$wp_filesystem->connect() )
-		return false; //There was an erorr connecting to the server.
-
-	// Set the permission constants if not already set.
-	if ( ! defined('FS_CHMOD_DIR') )
-		define('FS_CHMOD_DIR', 0755 );
-	if ( ! defined('FS_CHMOD_FILE') )
-		define('FS_CHMOD_FILE', 0644 );
-
-	return true;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $args
- * @return unknown
- */
-function get_filesystem_method($args = array()) {
-	$method = false;
-	if( function_exists('getmyuid') && function_exists('fileowner') ){
-		$temp_file = wp_tempnam();
-		if ( getmyuid() == fileowner($temp_file) )
-			$method = 'direct';
-		unlink($temp_file);
-	}
-
-	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') ) $method = 'ssh2';
-	if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
-	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
-	return apply_filters('filesystem_method', $method);
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $form_post
- * @param unknown_type $type
- * @param unknown_type $error
- * @return unknown
- */
-function request_filesystem_credentials($form_post, $type = '', $error = false) {
-	$req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error);
-	if ( '' !== $req_cred )
-		return $req_cred;
-
-	if ( empty($type) )
-		$type = get_filesystem_method();
-
-	if ( 'direct' == $type )
-		return true;
-
-	$credentials = get_option('ftp_credentials', array());
-	// If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option)
-	$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? $_POST['hostname'] : $credentials['hostname']);
-	$credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
-	$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']);
-
-	// Check to see if we are setting the public/private keys for ssh
-	$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? $_POST['public_key'] : $credentials['public_key']);
-	$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? $_POST['private_key'] : $credentials['private_key']);
-
-	if ( strpos($credentials['hostname'], ':') )
-		list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
-
-	if ( defined('FTP_SSH') || (isset($_POST['connection_type']) && 'ssh' == $_POST['connection_type']) )
-		$credentials['connection_type'] = 'ssh';
-	else if ( defined('FTP_SSL') || (isset($_POST['connection_type']) && 'ftps' == $_POST['connection_type']) )
-		$credentials['connection_type'] = 'ftps';
-	else if ( !isset($credentials['connection_type']) || (isset($_POST['connection_type']) && 'ftp' == $_POST['connection_type']) )
-		$credentials['connection_type'] = 'ftp';
-
-	if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) {
-		$stored_credentials = $credentials;
-		unset($stored_credentials['password'], $stored_credentials['private_key'], $stored_credentials['public_key']);
-		update_option('ftp_credentials', $stored_credentials);
-		return $credentials;
-	}
-	$hostname = '';
-	$username = '';
-	$password = '';
-	$connection_type = '';
-	if ( !empty($credentials) )
-		extract($credentials, EXTR_OVERWRITE);
-	if ( $error ) {
-		$error_string = __('<strong>Error:</strong> There was an error connecting to the server, Please verify the settings are correct.');
-		if ( is_wp_error($error) )
-			$error_string = $error->get_error_message();
-		echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
-	}
-?>
-<script type="text/javascript">
-<!--
-jQuery(function($){
-	jQuery("#ssh").click(function () {
-		jQuery("#ssh_keys").show();
-	});
-	jQuery("#ftp, #ftps").click(function () {
-		jQuery("#ssh_keys").hide();
-	});
-});
--->
-</script>
-<form action="<?php echo $form_post ?>" method="post">
-<div class="wrap">
-<h2><?php _e('Connection Information') ?></h2>
-<p><?php _e('To perform the requested action, connection information is required.') ?></p>
-
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="hostname"><?php _e('Hostname') ?></label></th>
-<td><input name="hostname" type="text" id="hostname" value="<?php echo attribute_escape($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php if( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td>
-</tr>
-
-<tr valign="top">
-<th scope="row"><label for="username"><?php _e('Username') ?></label></th>
-<td><input name="username" type="text" id="username" value="<?php echo attribute_escape($username) ?>"<?php if( defined('FTP_USER') ) echo ' disabled="disabled"' ?> size="40" /></td>
-</tr>
-
-<tr valign="top">
-<th scope="row"><label for="password"><?php _e('Password') ?></label></th>
-<td><input name="password" type="password" id="password" value=""<?php if( defined('FTP_PASS') ) echo ' disabled="disabled"' ?> size="40" /><?php if( defined('FTP_PASS') && !empty($password) ) echo '<em>'.__('(Password not shown)').'</em>'; ?></td>
-</tr>
-
-<tr id="ssh_keys" valign="top" style="<?php if ( 'ssh' != $connection_type ) echo 'display:none' ?>">
-<th scope="row"><?php _e('Authentication Keys') ?>
-<div class="key-labels textright">
-<label for="public_key"><?php _e('Public Key:') ?></label ><br />
-<label for="private_key"><?php _e('Private Key:') ?></label>
-</div></th>
-<td><br /><input name="public_key" type="text" id="public_key" value=""<?php if( defined('FTP_PUBKEY') ) echo ' disabled="disabled"' ?> size="40" /><br /><input name="private_key" type="text" id="private_key" value=""<?php if( defined('FTP_PRIKEY') ) echo ' disabled="disabled"' ?> size="40" />
-<div><?php _e('Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above.') ?></div></td>
-</tr>
-
-<tr valign="top">
-<th scope="row"><?php _e('Connection Type') ?></th>
-<td>
-<fieldset><legend class="hidden"><?php _e('Connection Type') ?></legend>
-<label><input id="ftp" name="connection_type"  type="radio" value="ftp" <?php checked('ftp', $connection_type); if ( defined('FTP_SSL') || defined('FTP_SSH') ) echo ' disabled="disabled"'; ?>/> <?php _e('FTP') ?></label><br />
-<label><input id="ftps" name="connection_type" type="radio" value="ftps" <?php checked('ftps', $connection_type); if ( defined('FTP_SSH') || defined('FTP_SSH') ) echo ' disabled="disabled"';  ?>/> <?php _e('FTPS (SSL)') ?></label><br />
-<?php if ( extension_loaded('ssh2') ) { ?><label><input id="ssh" name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type);  if ( defined('FTP_SSL') || defined('FTP_SSH') ) echo ' disabled="disabled"'; ?>/> <?php _e('SSH') ?></label><?php } ?>
-</fieldset>
-</td>
-</tr>
-</table>
-
-<?php if ( isset( $_POST['version'] ) ) : ?>
-<input type="hidden" name="version" value="<?php echo attribute_escape($_POST['version']) ?>" />
-<?php endif; ?>
-<?php if ( isset( $_POST['locale'] ) ) : ?>
-<input type="hidden" name="locale" value="<?php echo attribute_escape($_POST['locale']) ?>" />
-<?php endif; ?>
-<p class="submit">
-<input id="upgrade" name="upgrade" type="submit" class="button" value="<?php _e('Proceed'); ?>" />
-</p>
-</div>
-</form>
-<?php
-	return false;
-}
-
 ?>
diff -uNr a/mp-wp/wp-admin/includes/media.php b/mp-wp/wp-admin/includes/media.php
--- a/mp-wp/wp-admin/includes/media.php aa48e94b3b4b8efc548628161409c2bb1abde5025797ad4645f5b43cbfe9f979be3879427302f2f2593b050264413363af383826b5d1cfe40d287205766fce57
+++ b/mp-wp/wp-admin/includes/media.php 424aa85cb23d44ece062add5c6f19aeb86fb59aa27b042db49fdbbdeddc366673b57eb3cf22800873b587d719bcadeca19634ed65bff1d58b2809cf6f0f10fae
@@ -9,169 +9,6 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
- *
- * @return unknown
- */
-function media_upload_tabs() {
-	$_default_tabs = array(
-		'type' => __('From Computer'), // handler action suffix => tab text
-		'type_url' => __('From URL'),
-		'gallery' => __('Gallery'),
-		'library' => __('Media Library')
-	);
-
-	return apply_filters('media_upload_tabs', $_default_tabs);
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $tabs
- * @return unknown
- */
-function update_gallery_tab($tabs) {
-	global $wpdb;
-
-	if ( !isset($_REQUEST['post_id']) ) {
-		unset($tabs['gallery']);
-		return $tabs;
-	}
-
-	if ( intval($_REQUEST['post_id']) )
-		$attachments = intval($wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $_REQUEST['post_id'])));
-
-	if ( empty($attachments) ) {
-		unset($tabs['gallery']);
-		return $tabs;
-	}
-
-	$tabs['gallery'] = sprintf(__('Gallery (%s)'), "<span id='attachments-count'>$attachments</span>");
-
-	return $tabs;
-}
-add_filter('media_upload_tabs', 'update_gallery_tab');
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- */
-function the_media_upload_tabs() {
-	global $redir_tab;
-	$tabs = media_upload_tabs();
-
-	if ( !empty($tabs) ) {
-		echo "<ul id='sidemenu'>\n";
-		if ( isset($redir_tab) && array_key_exists($redir_tab, $tabs) )
-			$current = $redir_tab;
-		elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
-			$current = $_GET['tab'];
-		else {
-			$keys = array_keys($tabs);
-			$current = array_shift($keys);
-		}
-		foreach ( $tabs as $callback => $text ) {
-			$class = '';
-			if ( $current == $callback )
-				$class = " class='current'";
-			$href = add_query_arg(array('tab'=>$callback, 's'=>false, 'paged'=>false, 'post_mime_type'=>false, 'm'=>false));
-			$link = "<a href='" . clean_url($href) . "'$class>$text</a>";
-			echo "\t<li id='" . attribute_escape("tab-$callback") . "'>$link</li>\n";
-		}
-		echo "</ul>\n";
-	}
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $id
- * @param unknown_type $alt
- * @param unknown_type $title
- * @param unknown_type $align
- * @param unknown_type $url
- * @param unknown_type $rel
- * @param unknown_type $size
- * @return unknown
- */
-function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = false, $size='medium') {
-
-	$htmlalt = ( empty($alt) ) ? $title : $alt;
-
-	$html = get_image_tag($id, $htmlalt, $title, $align, $size);
-
-	$rel = $rel ? ' rel="attachment wp-att-'.attribute_escape($id).'"' : '';
-
-	if ( $url )
-		$html = '<a href="' . clean_url($url) . "\"$rel>$html</a>";
-
-	$html = apply_filters( 'image_send_to_editor', $html, $id, $alt, $title, $align, $url, $size );
-
-	return $html;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $html
- * @param unknown_type $id
- * @param unknown_type $alt
- * @param unknown_type $title
- * @param unknown_type $align
- * @param unknown_type $url
- * @param unknown_type $size
- * @return unknown
- */
-function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
-
-	if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html;
-	$id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
-
-	preg_match( '/width="([0-9]+)/', $html, $matches );
-	if ( ! isset($matches[1]) ) return $html;
-	$width = $matches[1];
-
-	$html = preg_replace( '/align[^\s\'"]+\s?/', '', $html );
-	if ( empty($align) ) $align = 'none';
-
-	$alt = ! empty($alt) ? addslashes($alt) : '';
-
-	$shcode = '[caption id="' . $id . '" align="align' . $align
-	. '" width="' . $width . '" caption="' . $alt . '"]' . $html . '[/caption]';
-
-	return apply_filters( 'image_add_caption_shortcode', $shcode, $html );
-}
-add_filter( 'image_send_to_editor', 'image_add_caption', 20, 7 );
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $html
- */
-function media_send_to_editor($html) {
-?>
-<script type="text/javascript">
-/* <![CDATA[ */
-var win = window.dialogArguments || opener || parent || top;
-win.send_to_editor('<?php echo addslashes($html); ?>');
-/* ]]> */
-</script>
-	<?php
-	exit;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
  * This handles the file upload POST itself, creating the attachment post.
  *
  * @since unknown
@@ -233,137 +70,6 @@
  *
  * @since unknown
  *
- * @param unknown_type $file_array
- * @param unknown_type $post_id
- * @param unknown_type $desc
- * @param unknown_type $post_data
- * @return unknown
- */
-function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
-	$overrides = array('test_form'=>false);
-	$file = wp_handle_sideload($file_array, $overrides);
-
-	if ( isset($file['error']) )
-		return new WP_Error( 'upload_error', $file['error'] );
-
-	$url = $file['url'];
-	$type = $file['type'];
-	$file = $file['file'];
-	$title = preg_replace('/\.[^.]+$/', '', basename($file));
-	$content = '';
-
-	// use image exif/iptc data for title and caption defaults if possible
-	if ( $image_meta = @wp_read_image_metadata($file) ) {
-		if ( trim($image_meta['title']) )
-			$title = $image_meta['title'];
-		if ( trim($image_meta['caption']) )
-			$content = $image_meta['caption'];
-	}
-
-	$title = @$desc;
-
-	// Construct the attachment array
-	$attachment = array_merge( array(
-		'post_mime_type' => $type,
-		'guid' => $url,
-		'post_parent' => $post_id,
-		'post_title' => $title,
-		'post_content' => $content,
-	), $post_data );
-
-	// Save the data
-	$id = wp_insert_attachment($attachment, $file, $post_id);
-	if ( !is_wp_error($id) ) {
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-		return $url;
-	}
-	return $id;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * Wrap iframe content (produced by $content_func) in a doctype, html head/body
- * etc any additional function args will be passed to content_func.
- *
- * @since unknown
- *
- * @param unknown_type $content_func
- */
-function wp_iframe($content_func /* ... */) {
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
-<head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title>
-<?php
-wp_enqueue_style( 'global' );
-wp_enqueue_style( 'wp-admin' );
-wp_enqueue_style( 'colors' );
-if ( 0 === strpos( $content_func, 'media' ) )
-	wp_enqueue_style( 'media' );
-
-?>
-<script type="text/javascript">
-//<![CDATA[
-function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}else{ var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}}
-//]]>
-</script>
-<?php
-do_action('admin_print_styles');
-do_action('admin_print_scripts');
-do_action('admin_head');
-if ( is_string($content_func) )
-	do_action( "admin_head_{$content_func}" );
-?>
-</head>
-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>>
-<?php
-	$args = func_get_args();
-	$args = array_slice($args, 1);
-	call_user_func_array($content_func, $args);
-?>
-</body>
-</html>
-<?php
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- */
-function media_buttons() {
-	global $post_ID, $temp_ID;
-	$uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
-	$context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
-	$media_upload_iframe_src = "media-upload.php?post_id=$uploading_iframe_ID";
-	$media_title = __('Add Media');
-	$image_upload_iframe_src = apply_filters('image_upload_iframe_src', "$media_upload_iframe_src&amp;type=image");
-	$image_title = __('Add an Image');
-	$video_upload_iframe_src = apply_filters('video_upload_iframe_src', "$media_upload_iframe_src&amp;type=video");
-	$video_title = __('Add Video');
-	$audio_upload_iframe_src = apply_filters('audio_upload_iframe_src', "$media_upload_iframe_src&amp;type=audio");
-	$audio_title = __('Add Audio');
-	$out = <<<EOF
-
-	<a href="{$image_upload_iframe_src}&amp;TB_iframe=true" id="add_image" class="thickbox" title='$image_title'><img src='images/media-button-image.svg' alt='$image_title' /></a>
-	<a href="{$video_upload_iframe_src}&amp;TB_iframe=true" id="add_video" class="thickbox" title='$video_title'><img src='images/media-button-video.svg' alt='$video_title' /></a>
-	<a href="{$audio_upload_iframe_src}&amp;TB_iframe=true" id="add_audio" class="thickbox" title='$audio_title'><img src='images/media-button-music.svg' alt='$audio_title' /></a>
-	<a href="{$media_upload_iframe_src}&amp;TB_iframe=true" id="add_media" class="thickbox" title='$media_title'><img src='images/media-button-other.svg' alt='$media_title' /></a>
-
-EOF;
-	printf($context, $out);
-}
-add_action( 'media_buttons', 'media_buttons' );
-add_action('media_upload_media', 'media_upload_handler');
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
  * @return unknown
  */
 function media_upload_form_handler() {
@@ -397,31 +103,6 @@
 				wp_set_object_terms($attachment_id, array_map('trim', preg_split('/,+/', $attachment[$t])), $t, false);
 	}
 
-	if ( isset($_POST['insert-gallery']) || isset($_POST['update-gallery']) ) { ?>
-		<script type="text/javascript">
-		/* <![CDATA[ */
-		var win = window.dialogArguments || opener || parent || top;
-		win.tb_remove();
-		/* ]]> */
-		</script>
-		<?php
-		exit;
-	}
-
-	if ( isset($_POST['send']) ) {
-		$keys = array_keys($_POST['send']);
-		$send_id = (int) array_shift($keys);
-		$attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
-		$html = $attachment['post_title'];
-		if ( !empty($attachment['url']) ) {
-			if ( strpos($attachment['url'], 'attachment_id') || false !== strpos($attachment['url'], get_permalink($_POST['post_id'])) )
-				$rel = " rel='attachment wp-att-".attribute_escape($send_id)."'";
-			$html = "<a href='{$attachment['url']}'$rel>$html</a>";
-		}
-		$html = apply_filters('media_send_to_editor', $html, $send_id, $attachment);
-		return media_send_to_editor($html);
-	}
-
 	return $errors;
 }
 
@@ -430,431 +111,6 @@
  *
  * @since unknown
  *
- * @return unknown
- */
-function media_upload_image() {
-	$errors = array();
-	$id = 0;
-
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-		// Upload File button was clicked
-		$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-		unset($_FILES);
-		if ( is_wp_error($id) ) {
-			$errors['upload_error'] = $id;
-			$id = false;
-		}
-	}
-
-	if ( !empty($_POST['insertonlybutton']) ) {
-		$src = $_POST['insertonly']['src'];
-		if ( !empty($src) && !strpos($src, '://') )
-			$src = "http://$src";
-		$alt = attribute_escape($_POST['insertonly']['alt']);
-		if ( isset($_POST['insertonly']['align']) ) {
-			$align = attribute_escape($_POST['insertonly']['align']);
-			$class = " class='align$align'";
-		}
-		if ( !empty($src) )
-			$html = "<img src='$src' alt='$alt'$class />";
-		return media_send_to_editor($html);
-	}
-
-	if ( !empty($_POST) ) {
-		$return = media_upload_form_handler();
-
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
-	}
-
-	if ( isset($_POST['save']) ) {
-		$errors['upload_notice'] = __('Saved.');
-		return media_upload_gallery();
-	}
-
-	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-		return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id );
-
-	return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $file
- * @param unknown_type $post_id
- * @param unknown_type $desc
- * @return unknown
- */
-function media_sideload_image($file, $post_id, $desc = null) {
-	if (!empty($file) ) {
-		$file_array['name'] = basename($file);
-		$tmp = download_url($file);
-		$file_array['tmp_name'] = $tmp;
-		$desc = @$desc;
-
-		if ( is_wp_error($tmp) ) {
-			@unlink($file_array['tmp_name']);
-			$file_array['tmp_name'] = '';
-		}
-
-		$id = media_handle_sideload($file_array, $post_id, $desc);
-		$src = $id;
-
-		if ( is_wp_error($id) ) {
-			@unlink($file_array['tmp_name']);
-			return $id;
-		}
-	}
-
-	if ( !empty($src) ) {
-		$alt = @$desc;
-		$html = "<img src='$src' alt='$alt' />";
-		return $html;
-	}
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function media_upload_audio() {
-	$errors = array();
-	$id = 0;
-
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-		// Upload File button was clicked
-		$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-		unset($_FILES);
-		if ( is_wp_error($id) ) {
-			$errors['upload_error'] = $id;
-			$id = false;
-		}
-	}
-
-	if ( !empty($_POST['insertonlybutton']) ) {
-		$href = $_POST['insertonly']['href'];
-		if ( !empty($href) && !strpos($href, '://') )
-			$href = "http://$href";
-		$title = attribute_escape($_POST['insertonly']['title']);
-		if ( empty($title) )
-			$title = basename($href);
-		if ( !empty($title) && !empty($href) )
-			$html = "<a href='$href' >$title</a>";
-		return media_send_to_editor($html);
-	}
-
-	if ( !empty($_POST) ) {
-		$return = media_upload_form_handler();
-
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
-	}
-
-	if ( isset($_POST['save']) ) {
-		$errors['upload_notice'] = __('Saved.');
-		return media_upload_gallery();
-	}
-
-	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-		return wp_iframe( 'media_upload_type_url_form', 'audio', $errors, $id );
-
-	return wp_iframe( 'media_upload_type_form', 'audio', $errors, $id );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function media_upload_video() {
-	$errors = array();
-	$id = 0;
-
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-		// Upload File button was clicked
-		$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-		unset($_FILES);
-		if ( is_wp_error($id) ) {
-			$errors['upload_error'] = $id;
-			$id = false;
-		}
-	}
-
-	if ( !empty($_POST['insertonlybutton']) ) {
-		$href = $_POST['insertonly']['href'];
-		if ( !empty($href) && !strpos($href, '://') )
-			$href = "http://$href";
-		$title = attribute_escape($_POST['insertonly']['title']);
-		if ( empty($title) )
-			$title = basename($href);
-		if ( !empty($title) && !empty($href) )
-			$html = "<a href='$href' >$title</a>";
-		return media_send_to_editor($html);
-	}
-
-	if ( !empty($_POST) ) {
-		$return = media_upload_form_handler();
-
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
-	}
-
-	if ( isset($_POST['save']) ) {
-		$errors['upload_notice'] = __('Saved.');
-		return media_upload_gallery();
-	}
-
-	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-		return wp_iframe( 'media_upload_type_url_form', 'video', $errors, $id );
-
-	return wp_iframe( 'media_upload_type_form', 'video', $errors, $id );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function media_upload_file() {
-	$errors = array();
-	$id = 0;
-
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-		// Upload File button was clicked
-		$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-		unset($_FILES);
-		if ( is_wp_error($id) ) {
-			$errors['upload_error'] = $id;
-			$id = false;
-		}
-	}
-
-	if ( !empty($_POST['insertonlybutton']) ) {
-		$href = $_POST['insertonly']['href'];
-		if ( !empty($href) && !strpos($href, '://') )
-			$href = "http://$href";
-		$title = attribute_escape($_POST['insertonly']['title']);
-		if ( empty($title) )
-			$title = basename($href);
-		if ( !empty($title) && !empty($href) )
-			$html = "<a href='$href' >$title</a>";
-		return media_send_to_editor($html);
-	}
-
-	if ( !empty($_POST) ) {
-		$return = media_upload_form_handler();
-
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
-	}
-
-	if ( isset($_POST['save']) ) {
-		$errors['upload_notice'] = __('Saved.');
-		return media_upload_gallery();
-	}
-
-	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-		return wp_iframe( 'media_upload_type_url_form', 'file', $errors, $id );
-
-	return wp_iframe( 'media_upload_type_form', 'file', $errors, $id );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function media_upload_gallery() {
-	$errors = array();
-
-	if ( !empty($_POST) ) {
-		$return = media_upload_form_handler();
-
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
-	}
-
-	wp_enqueue_script('admin-gallery');
-	return wp_iframe( 'media_upload_gallery_form', $errors );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function media_upload_library() {
-	$errors = array();
-	if ( !empty($_POST) ) {
-		$return = media_upload_form_handler();
-
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
-	}
-
-	return wp_iframe( 'media_upload_library_form', $errors );
-}
-
-/**
- * Retrieve HTML for the image alignment radio buttons with the specified one checked.
- *
- * @since unknown
- *
- * @param unknown_type $post
- * @param unknown_type $checked
- * @return unknown
- */
-function image_align_input_fields($post, $checked='') {
-
-	$alignments = array('none' => 'None', 'left' => 'Left', 'center' => 'Center', 'right' => 'Right');
-	if ( !array_key_exists($checked, $alignments) )
-		$checked = 'none';
-
-	$out = array();
-	foreach ($alignments as $name => $label) {
-
-		$out[] = "<input type='radio' name='attachments[{$post->ID}][align]' id='image-align-{$name}-{$post->ID}' value='$name'".
-		 	( $checked == $name ? " checked='checked'" : "" ) .
-			" /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>" . __($label) . "</label>";
-	}
-	return join("\n", $out);
-}
-
-/**
- * Retrieve HTML for the size radio buttons with the specified one checked.
- *
- * @since unknown
- *
- * @param unknown_type $post
- * @param unknown_type $checked
- * @return unknown
- */
-function image_size_input_fields($post, $checked='') {
-
-		// get a list of the actual pixel dimensions of each possible intermediate version of this image
-		$size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full size'));
-
-		foreach ( $size_names as $size => $name) {
-			$downsize = image_downsize($post->ID, $size);
-
-			// is this size selectable?
-			$enabled = ( $downsize[3] || 'full' == $size );
-			$css_id = "image-size-{$size}-{$post->ID}";
-			// if this size is the default but that's not available, don't select it
-			if ( $checked && !$enabled )
-				$checked = '';
-			// if $checked was not specified, default to the first available size that's bigger than a thumbnail
-			if ( !$checked && $enabled && 'thumbnail' != $size )
-				$checked = $size;
-
-			$html = "<div class='image-size-item'><input type='radio' ".( $enabled ? '' : "disabled='disabled'")."name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'".( $checked == $size ? " checked='checked'" : '') ." />";
-
-			$html .= "<label for='{$css_id}'>" . __($name). "</label>";
-			// only show the dimensions if that choice is available
-			if ( $enabled )
-				$html .= " <label for='{$css_id}' class='help'>" . sprintf( __("(%d&nbsp;&times;&nbsp;%d)"), $downsize[1], $downsize[2] ). "</label>";
-
-			$html .= '</div>';
-
-			$out[] = $html;
-		}
-
-		return array(
-			'label' => __('Size'),
-			'input' => 'html',
-			'html'  => join("\n", $out),
-		);
-}
-
-/**
- * Retrieve HTML for the Link URL buttons with the default link type as specified.
- *
- * @since unknown
- *
- * @param unknown_type $post
- * @param unknown_type $url_type
- * @return unknown
- */
-function image_link_input_fields($post, $url_type='') {
-
-	$file = wp_get_attachment_url($post->ID);
-	$link = get_attachment_link($post->ID);
-
-	$url = '';
-	if ( $url_type == 'file' )
-		$url = $file;
-	elseif ( $url_type == 'post' )
-		$url = $link;
-
-	return "<input type='text' class='urlfield' name='attachments[$post->ID][url]' value='" . attribute_escape($url) . "' /><br />
-				<button type='button' class='button urlnone' title=''>" . __('None') . "</button>
-				<button type='button' class='button urlfile' title='" . attribute_escape($file) . "'>" . __('File URL') . "</button>
-				<button type='button' class='button urlpost' title='" . attribute_escape($link) . "'>" . __('Post URL') . "</button>
-";
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $form_fields
- * @param unknown_type $post
- * @return unknown
- */
-function image_attachment_fields_to_edit($form_fields, $post) {
-	if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
-		$form_fields['post_title']['required'] = true;
-
-		$form_fields['post_excerpt']['label'] = __('Caption');
-		$form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
-
-		$form_fields['post_content']['label'] = __('Description');
-
-		$form_fields['align'] = array(
-			'label' => __('Alignment'),
-			'input' => 'html',
-			'html'  => image_align_input_fields($post, get_option('image_default_align')),
-		);
-
-		$form_fields['image-size'] = image_size_input_fields($post, get_option('image_default_size'));
-	}
-	return $form_fields;
-}
-
-add_filter('attachment_fields_to_edit', 'image_attachment_fields_to_edit', 10, 2);
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
  * @param unknown_type $form_fields
  * @param unknown_type $post
  * @return unknown
@@ -891,41 +147,6 @@
  *
  * @since unknown
  *
- * @param unknown_type $html
- * @param unknown_type $attachment_id
- * @param unknown_type $attachment
- * @return unknown
- */
-function image_media_send_to_editor($html, $attachment_id, $attachment) {
-	$post =& get_post($attachment_id);
-	if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
-		$url = $attachment['url'];
-
-		if ( isset($attachment['align']) )
-			$align = $attachment['align'];
-		else
-			$align = 'none';
-
-		if ( !empty($attachment['image-size']) )
-			$size = $attachment['image-size'];
-		else
-			$size = 'medium';
-
-		$rel = ( $url == get_attachment_link($attachment_id) );
-
-		return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size);
-	}
-
-	return $html;
-}
-
-add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3);
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
  * @param unknown_type $post
  * @param unknown_type $errors
  * @return unknown
@@ -952,12 +173,6 @@
 			'value'      => $edit_post->post_content,
 			'input'      => 'textarea',
 		),
-		'url'          => array(
-			'label'      => __('Link URL'),
-			'input'      => 'html',
-			'html'       => image_link_input_fields($post, get_option('image_default_link_type')),
-			'helps'      => __('Enter a link URL or click above for presets.'),
-		),
 		'menu_order'   => array(
 			'label'      => __('Order'),
 			'value'      => $edit_post->menu_order
@@ -993,39 +208,6 @@
 	return $form_fields;
 }
 
-/**
- * Retrieve HTML for media items of post gallery.
- *
- * The HTML markup retrieved will be created for the progress of SWF Upload
- * component. Will also create link for showing and hiding the form to modify
- * the image attachment.
- *
- * @since unknown
- *
- * @param int $post_id Optional. Post ID.
- * @param array $errors Errors for attachment, if any.
- * @return string
- */
-function get_media_items( $post_id, $errors ) {
-	if ( $post_id ) {
-		$post = get_post($post_id);
-		if ( $post && $post->post_type == 'attachment' )
-			$attachments = array($post->ID => $post);
-		else
-			$attachments = get_children( array( 'post_parent' => $post_id, 'post_type' => 'attachment', 'orderby' => 'menu_order ASC, ID', 'order' => 'DESC') );
-	} else {
-		if ( is_array($GLOBALS['wp_the_query']->posts) )
-			foreach ( $GLOBALS['wp_the_query']->posts as $attachment )
-				$attachments[$attachment->ID] = $attachment;
-	}
-
-	$output = '';
-	foreach ( (array) $attachments as $id => $attachment )
-		if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) )
-			$output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress'><div class='bar'></div></div><div id='media-upload-error-$id'></div><div class='filename'></div>$item\n</div>";
-
-	return $output;
-}
 
 /**
  * Retrieve HTML form for modifying the image attachment.
@@ -1039,7 +221,7 @@
 function get_media_item( $attachment_id, $args = null ) {
 	global $redir_tab;
 
-	$default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true, 'show_title' => true );
+	$default_args = array( 'errors' => null, 'delete' => true, 'toggle' => true, 'show_title' => true );
 	$args = wp_parse_args( $args, $default_args );
 	extract( $args, EXTR_SKIP );
 
@@ -1124,16 +306,6 @@
 		'extra_rows' => array(),
 	);
 
-	$delete_href = wp_nonce_url("post.php?action=delete-post&amp;post=$attachment_id", 'delete-post_' . $attachment_id);
-	if ( $send )
-		$send = "<input type='submit' class='button' name='send[$attachment_id]' value='" . attribute_escape( __( 'Insert into Post' ) ) . "' />";
-	if ( $delete )
-		$delete = "<a href=\"#\" class=\"del-link\" onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __('Delete') . "</a>";
-	if ( ( $send || $delete ) && !isset($form_fields['buttons']) )
-		$form_fields['buttons'] = array('tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>$send $delete
-		<div id=\"del_attachment_$attachment_id\" class=\"del-attachment\" style=\"display:none;\">" . sprintf(__("You are about to delete <strong>%s</strong>."), $filename) . " <a href=\"$delete_href\" id=\"del[$attachment_id]\" class=\"delete\">" . __('Continue') . "</a>
-		<a href=\"#\" class=\"del-link\" onclick=\"this.parentNode.style.display='none';return false;\">" . __('Cancel') . "</a></div></td></tr>\n");
-
 	$hidden_fields = array();
 
 	foreach ( $form_fields as $id => $field ) {
@@ -1211,7 +383,6 @@
  */
 function media_upload_header() {
 	?>
-	<script type="text/javascript">post_id = <?php echo intval($_REQUEST['post_id']); ?>;</script>
 	<div id="media-upload-header">
 	<?php the_media_upload_tabs(); ?>
 	</div>
@@ -1252,65 +423,10 @@
 
 <?php do_action('pre-upload-ui'); ?>
 
-<?php if ( $flash ) : ?>
-<script type="text/javascript">
-<!--
-SWFUpload.onload = function() {
-	swfu = new SWFUpload({
-			button_text: '<span class="button"><?php _e('Select Files'); ?></span>',
-			button_text_style: '.button { text-align: center; font-weight: bold; font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif; }',
-			button_height: "24",
-			button_width: "132",
-			button_image_url: '<?php echo includes_url('images/upload.svg'); ?>',
-			button_placeholder_id: "flash-browse-button",
-			upload_url : "<?php echo attribute_escape( $flash_action_url ); ?>",
-			flash_url : "<?php echo includes_url('js/swfupload/swfupload.swf'); ?>",
-			file_post_name: "async-upload",
-			file_types: "<?php echo apply_filters('upload_file_glob', '*.*'); ?>",
-			post_params : {
-				"post_id" : "<?php echo $post_id; ?>",
-				"auth_cookie" : "<?php if ( is_ssl() ) echo $_COOKIE[SECURE_AUTH_COOKIE]; else echo $_COOKIE[AUTH_COOKIE]; ?>",
-				"_wpnonce" : "<?php echo wp_create_nonce('media-form'); ?>",
-				"type" : "<?php echo $type; ?>",
-				"tab" : "<?php echo $tab; ?>",
-				"short" : "1"
-			},
-			file_size_limit : "<?php echo wp_max_upload_size(); ?>b",
-			file_dialog_start_handler : fileDialogStart,
-			file_queued_handler : fileQueued,
-			upload_start_handler : uploadStart,
-			upload_progress_handler : uploadProgress,
-			upload_error_handler : uploadError,
-			upload_success_handler : uploadSuccess,
-			upload_complete_handler : uploadComplete,
-			file_queue_error_handler : fileQueueError,
-			file_dialog_complete_handler : fileDialogComplete,
-			swfupload_pre_load_handler: swfuploadPreLoad,
-			swfupload_load_failed_handler: swfuploadLoadFailed,
-			custom_settings : {
-				degraded_element_id : "html-upload-ui", // id of the element displayed when swfupload is unavailable
-				swfupload_element_id : "flash-upload-ui" // id of the element displayed when swfupload is available
-			},
-			debug: false
-		});
-};
-//-->
-</script>
-
-<div id="flash-upload-ui">
-<?php do_action('pre-flash-upload-ui'); ?>
-
-	<div><?php _e( 'Choose files to upload' ); ?> <div id="flash-browse-button"></div></div>
-<?php do_action('post-flash-upload-ui'); ?>
-	<p class="howto"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
-</div>
-
-<?php endif; // $flash ?>
-
 <div id="html-upload-ui">
 <?php do_action('pre-html-upload-ui'); ?>
 	<p id="async-upload-wrap">
-	<input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php echo attribute_escape(__('Upload')); ?>" /> <a href="#" onclick="return top.tb_remove();"><?php _e('Cancel'); ?></a>
+	<input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php echo attribute_escape(__('Upload')); ?>" /> <a href="upload.php"><?php _e('Cancel'); ?></a>
 	</p>
 
 	<br class="clear" />
@@ -1323,725 +439,4 @@
 <?php
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $type
- * @param unknown_type $errors
- * @param unknown_type $id
- */
-function media_upload_type_form($type = 'file', $errors = null, $id = null) {
-	media_upload_header();
-
-	$post_id = intval($_REQUEST['post_id']);
-
-	$form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
-	$form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
-?>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form">
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-<?php wp_nonce_field('media-form'); ?>
-
-<h3 class="media-title"><?php _e('Add media files from your computer'); ?></h3>
-
-<?php media_upload_form( $errors ); ?>
-
-<script type="text/javascript">
-<!--
-jQuery(function($){
-	var preloaded = $(".media-item.preloaded");
-	if ( preloaded.length > 0 ) {
-		preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-	}
-	updateMediaForm();
-});
--->
-</script>
-<div id="media-items">
-<?php
-if ( $id ) {
-	if ( !is_wp_error($id) ) {
-		echo get_media_items( $id, $errors );
-	} else {
-		echo '<div id="media-upload-error">'.wp_specialchars($id->get_error_message()).'</div>';
-		exit;
-	}
-}
-?>
-</div>
-<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
-<?php
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $type
- * @param unknown_type $errors
- * @param unknown_type $id
- */
-function media_upload_type_url_form($type = 'file', $errors = null, $id = null) {
-	media_upload_header();
-
-	$post_id = intval($_REQUEST['post_id']);
-
-	$form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
-	$form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
-
-	$callback = "type_url_form_$type";
-?>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form">
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-<?php wp_nonce_field('media-form'); ?>
-
-<?php if ( is_callable($callback) ) { ?>
-
-<h3 class="media-title"><?php _e('Add media file from URL'); ?></h3>
-
-<script type="text/javascript">
-//<![CDATA[
-var addExtImage = {
-
-	width : '',
-	height : '',
-	align : 'alignnone',
-
-	insert : function() {
-		var t = this, html, f = document.forms[0], cls, title = '', alt = '', caption = null;
-
-		if ( '' == f.src.value || '' == t.width ) return false;
-
-		if ( f.title.value ) {
-			title = f.title.value.replace(/['"<>]+/g, '');
-			title = ' title="'+title+'"';
-		}
-
-		if ( f.alt.value ) {
-			alt = f.alt.value.replace(/['"<>]+/g, '');
-<?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>
-			caption = f.alt.value.replace(/'/g, '&#39;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-<?php } ?>
-		}
-
-		cls = caption ? '' : ' class="'+t.align+'"';
-
-		html = '<img alt="'+alt+'" src="'+f.src.value+'"'+title+cls+' width="'+t.width+'" height="'+t.height+'" />';
-
-		if ( f.url.value )
-			html = '<a href="'+f.url.value+'">'+html+'</a>';
-
-		if ( caption )
-			html = '[caption id="" align="'+t.align+'" width="'+t.width+'" caption="'+caption+'"]'+html+'[/caption]';
-
-		var win = window.dialogArguments || opener || parent || top;
-		win.send_to_editor(html);
-	},
-
-	resetImageData : function() {
-		var t = addExtImage;
-
-		t.width = t.height = '';
-		document.getElementById('go_button').style.color = '#bbb';
-		if ( ! document.forms[0].src.value )
-			document.getElementById('status_img').src = 'images/required.svg';
-		else document.getElementById('status_img').src = 'images/no.svg';
-	},
-
-	updateImageData : function() {
-		var t = addExtImage;
-
-		t.width = t.preloadImg.width;
-		t.height = t.preloadImg.height;
-		document.getElementById('go_button').style.color = '#333';
-		document.getElementById('status_img').src = 'images/yes.svg';
-	},
-
-	getImageData : function() {
-		var t = addExtImage, src = document.forms[0].src.value;
-
-		if ( ! src ) {
-			t.resetImageData();
-			return false;
-		}
-		document.getElementById('status_img').src = 'images/loading.svg';
-		t.preloadImg = new Image();
-		t.preloadImg.onload = t.updateImageData;
-		t.preloadImg.onerror = t.resetImageData;
-		t.preloadImg.src = src;
-	}
-}
-//]]>
-</script>
-
-<div id="media-items">
-<div class="media-item media-blank">
-<?php echo call_user_func($callback); ?>
-</div>
-</div>
-</form>
-<?php
-	} else {
-		wp_die( __('Unknown action.') );
-	}
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $errors
- */
-function media_upload_gallery_form($errors) {
-	global $redir_tab;
-
-	$redir_tab = 'gallery';
-	media_upload_header();
-
-	$post_id = intval($_REQUEST['post_id']);
-	$form_action_url = admin_url("media-upload.php?type={$GLOBALS['type']}&tab=gallery&post_id=$post_id");
-?>
-
-<script type="text/javascript">
-<!--
-jQuery(function($){
-	var preloaded = $(".media-item.preloaded");
-	if ( preloaded.length > 0 ) {
-		preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-		updateMediaForm();
-	}
-});
--->
-</script>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form validate" id="gallery-form">
-<?php wp_nonce_field('media-form'); ?>
-<?php //media_upload_form( $errors ); ?>
-<table class="widefat" cellspacing="0">
-<thead><tr>
-<th><?php _e('Media'); ?></th>
-<th class="order-head"><?php _e('Order'); ?></th>
-</tr></thead>
-</table>
-<div id="media-items">
-<?php echo get_media_items($post_id, $errors); ?>
-</div>
-
-<p class="ml-submit">
-<input type="submit" class="button savebutton" style="display:none;" name="save" id="save-all" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="type" value="<?php echo attribute_escape( $GLOBALS['type'] ); ?>" />
-<input type="hidden" name="tab" value="<?php echo attribute_escape( $GLOBALS['tab'] ); ?>" />
-</p>
-
-<div id="gallery-settings" style="display:none;">
-<div class="title"><?php _e('Gallery Settings'); ?></div>
-<table id="basic" class="describe"><tbody>
-	<tr>
-	<th scope="row" class="label">
-		<label>
-		<span class="alignleft"><?php _e('Link thumbnails to:'); ?></span>
-		</label>
-	</th>
-	<td class="field">
-		<input type="radio" name="linkto" id="linkto-file" value="file" />
-		<label for="linkto-file" class="radio"><?php _e('Image File'); ?></label>
-
-		<input type="radio" checked="checked" name="linkto" id="linkto-post" value="post" />
-		<label for="linkto-post" class="radio"><?php _e('Attachment Page'); ?></label>
-	</td>
-	</tr>
-
-	<tr>
-	<th scope="row" class="label">
-		<label>
-		<span class="alignleft"><?php _e('Order images by:'); ?></span>
-		</label>
-	</th>
-	<td class="field">
-		<select id="orderby" name="orderby">
-			<option value="menu_order" selected="selected"><?php _e('Menu order'); ?></option>
-			<option value="post_name"><?php _e('Name'); ?></option>
-			<option value="ID"><?php _e('Date/Time'); ?></option>
-		</select>
-	</td>
-	</tr>
-
-	<tr>
-	<th scope="row" class="label">
-		<label>
-		<span class="alignleft"><?php _e('Order:'); ?></span>
-		</label>
-	</th>
-	<td class="field">
-		<input type="radio" checked="checked" name="order" id="order-asc" value="asc" />
-		<label for="order-asc" class="radio"><?php _e('Ascending'); ?></label>
-
-		<input type="radio" name="order" id="order-desc" value="desc" />
-		<label for="order-desc" class="radio"><?php _e('Descending'); ?></label>
-	</td>
-	</tr>
-
-	<tr>
-	<th scope="row" class="label">
-		<label>
-		<span class="alignleft"><?php _e('Gallery columns:'); ?></span>
-		</label>
-	</th>
-	<td class="field">
-		<select id="columns" name="columns">
-			<option value="2"><?php _e('2'); ?></option>
-			<option value="3" selected="selected"><?php _e('3'); ?></option>
-			<option value="4"><?php _e('4'); ?></option>
-			<option value="5"><?php _e('5'); ?></option>
-			<option value="6"><?php _e('6'); ?></option>
-			<option value="7"><?php _e('7'); ?></option>
-			<option value="8"><?php _e('8'); ?></option>
-			<option value="9"><?php _e('9'); ?></option>
-		</select>
-	</td>
-	</tr>
-</tbody></table>
-
-<p class="ml-submit">
-<input type="button" class="button" style="display:none;" onmousedown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php echo attribute_escape( __( 'Insert gallery' ) ); ?>" />
-<input type="button" class="button" style="display:none;" onmousedown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php echo attribute_escape( __( 'Update gallery settings' ) ); ?>" />
-</p>
-</div>
-</form>
-<?php
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $errors
- */
-function media_upload_library_form($errors) {
-	global $wpdb, $wp_query, $wp_locale, $type, $tab, $post_mime_types;
-
-	media_upload_header();
-
-	$post_id = intval($_REQUEST['post_id']);
-
-	$form_action_url = admin_url("media-upload.php?type={$GLOBALS['type']}&tab=library&post_id=$post_id");
-
-	$_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
-	if ( $_GET['paged'] < 1 )
-		$_GET['paged'] = 1;
-	$start = ( $_GET['paged'] - 1 ) * 10;
-	if ( $start < 1 )
-		$start = 0;
-	add_filter( 'post_limits', $limit_filter = create_function( '$a', "return 'LIMIT $start, 10';" ) );
-
-	list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
-
-?>
-
-<form id="filter" action="" method="get">
-<input type="hidden" name="type" value="<?php echo attribute_escape( $type ); ?>" />
-<input type="hidden" name="tab" value="<?php echo attribute_escape( $tab ); ?>" />
-<input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="post_mime_type" value="<?php echo attribute_escape( $_GET['post_mime_type'] ); ?>" />
-
-<p id="media-search" class="search-box">
-	<label class="hidden" for="media-search-input"><?php _e('Search Media');?>:</label>
-	<input type="text" id="media-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
-	<input type="submit" value="<?php echo attribute_escape( __( 'Search Media' ) ); ?>" class="button" />
-</p>
-
-<ul class="subsubsub">
-<?php
-$type_links = array();
-$_num_posts = (array) wp_count_attachments();
-$matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
-foreach ( $matches as $_type => $reals )
-	foreach ( $reals as $real )
-		$num_posts[$_type] += $_num_posts[$real];
-// If available type specified by media button clicked, filter by that type
-if ( empty($_GET['post_mime_type']) && !empty($num_posts[$type]) ) {
-	$_GET['post_mime_type'] = $type;
-	list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
-}
-if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' )
-	$class = ' class="current"';
-$type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))) . "'$class>".__('All Types')."</a>";
-foreach ( $post_mime_types as $mime_type => $label ) {
-	$class = '';
-
-	if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
-		continue;
-
-	if ( wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
-		$class = ' class="current"';
-
-	$type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(__ngettext($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
-}
-echo implode(' | </li>', $type_links) . '</li>';
-unset($type_links);
-?>
-</ul>
-
-<div class="tablenav">
-
-<?php
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'paged', '%#%' ),
-	'format' => '',
-	'prev_text' => __('&laquo;'),
-	'next_text' => __('&raquo;'),
-	'total' => ceil($wp_query->found_posts / 10),
-	'current' => $_GET['paged']
-));
-
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft actions">
-<?php
-
-$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
-
-$arc_result = $wpdb->get_results( $arc_query );
-
-$month_count = count($arc_result);
-
-if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?>
-<select name='m'>
-<option<?php selected( @$_GET['m'], 0 ); ?> value='0'><?php _e('Show all dates'); ?></option>
-<?php
-foreach ($arc_result as $arc_row) {
-	if ( $arc_row->yyear == 0 )
-		continue;
-	$arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
-
-	if ( $arc_row->yyear . $arc_row->mmonth == $_GET['m'] )
-		$default = ' selected="selected"';
-	else
-		$default = '';
-
-	echo "<option$default value='" . attribute_escape( $arc_row->yyear . $arc_row->mmonth ) . "'>";
-	echo wp_specialchars( $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear" );
-	echo "</option>\n";
-}
-?>
-</select>
-<?php } ?>
-
-<input type="submit" id="post-query-submit" value="<?php echo attribute_escape( __( 'Filter &#187;' ) ); ?>" class="button-secondary" />
-
-</div>
-
-<br class="clear" />
-</div>
-</form>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form validate" id="library-form">
-
-<?php wp_nonce_field('media-form'); ?>
-<?php //media_upload_form( $errors ); ?>
-
-<script type="text/javascript">
-<!--
-jQuery(function($){
-	var preloaded = $(".media-item.preloaded");
-	if ( preloaded.length > 0 ) {
-		preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-		updateMediaForm();
-	}
-});
--->
-</script>
-
-<div id="media-items">
-<?php echo get_media_items(null, $errors); ?>
-</div>
-<p class="ml-submit">
-<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-</p>
-</form>
-<?php
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function type_url_form_image() {
-
-	if ( apply_filters( 'disable_captions', '' ) ) {
-		$alt = __('Alternate Text');
-		$alt_help = __('Alt text for the image, e.g. "The Mona Lisa"');
-	} else {
-		$alt = __('Image Caption');
-		$alt_help = __('Also used as alternate text for the image');
-	}
-
-	$default_align = get_option('image_default_align');
-	if ( empty($default_align) )
-		$default_align = 'none';
-
-	return '
-	<table class="describe"><tbody>
-		<tr>
-			<th valign="top" scope="row" class="label" style="width:120px;">
-				<span class="alignleft"><label for="src">' . __('Image URL') . '</label></span>
-				<span class="alignright"><img id="status_img" src="images/required.svg" title="required" alt="required" /></span>
-			</th>
-			<td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td>
-		</tr>
-
-		<tr>
-			<th valign="top" scope="row" class="label">
-				<span class="alignleft"><label for="title">' . __('Image Title') . '</label></span>
-				<span class="alignright"><abbr title="required" class="required">*</abbr></span>
-			</th>
-			<td class="field"><p><input id="title" name="title" value="" type="text" aria-required="true" /></p></td>
-		</tr>
-
-		<tr>
-			<th valign="top" scope="row" class="label">
-				<span class="alignleft"><label for="alt">' . $alt . '</label></span>
-			</th>
-			<td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
-			<p class="help">' . $alt_help . '</p></td>
-		</tr>
-
-		<tr class="align">
-			<th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
-			<td class="field">
-				<input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'none' ? ' checked="checked"' : '').' />
-				<label for="align-none" class="align image-align-none-label">' . __('None') . '</label>
-				<input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'left' ? ' checked="checked"' : '').' />
-				<label for="align-left" class="align image-align-left-label">' . __('Left') . '</label>
-				<input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'center' ? ' checked="checked"' : '').' />
-				<label for="align-center" class="align image-align-center-label">' . __('Center') . '</label>
-				<input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'right' ? ' checked="checked"' : '').' />
-				<label for="align-right" class="align image-align-right-label">' . __('Right') . '</label>
-			</td>
-		</tr>
-
-		<tr>
-			<th valign="top" scope="row" class="label">
-				<span class="alignleft"><label for="url">' . __('Link Image To:') . '</label></span>
-			</th>
-			<td class="field"><input id="url" name="url" value="" type="text" /><br />
-
-			<button type="button" class="button" value="" onclick="document.forms[0].url.value=null">' . __('None') . '</button>
-			<button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
-			<p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
-		</tr>
-
-		<tr>
-			<td></td>
-			<td>
-				<input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . attribute_escape(__('Insert into Post')) . '" />
-			</td>
-		</tr>
-	</tbody></table>
-';
-
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function type_url_form_audio() {
-	return '
-	<table class="describe"><tbody>
-		<tr>
-			<th valign="top" scope="row" class="label">
-				<span class="alignleft"><label for="insertonly[href]">' . __('Audio File URL') . '</label></span>
-				<span class="alignright"><abbr title="required" class="required">*</abbr></span>
-			</th>
-			<td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></td>
-		</tr>
-		<tr>
-			<th valign="top" scope="row" class="label">
-				<span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
-				<span class="alignright"><abbr title="required" class="required">*</abbr></span>
-			</th>
-			<td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
-		</tr>
-		<tr><td></td><td class="help">' . __('Link text, e.g. "Still Alive by Jonathan Coulton"') . '</td></tr>
-		<tr>
-			<td></td>
-			<td>
-				<input type="submit" class="button" name="insertonlybutton" value="' . attribute_escape(__('Insert into Post')) . '" />
-			</td>
-		</tr>
-	</tbody></table>
-';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function type_url_form_video() {
-	return '
-	<table class="describe"><tbody>
-		<tr>
-			<th valign="top" scope="row" class="label">
-				<span class="alignleft"><label for="insertonly[href]">' . __('Video URL') . '</label></span>
-				<span class="alignright"><abbr title="required" class="required">*</abbr></span>
-			</th>
-			<td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></td>
-		</tr>
-		<tr>
-			<th valign="top" scope="row" class="label">
-				<span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
-				<span class="alignright"><abbr title="required" class="required">*</abbr></span>
-			</th>
-			<td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
-		</tr>
-		<tr><td></td><td class="help">' . __('Link text, e.g. "Lucy on YouTube"') . '</td></tr>
-		<tr>
-			<td></td>
-			<td>
-				<input type="submit" class="button" name="insertonlybutton" value="' . attribute_escape(__('Insert into Post')) . '" />
-			</td>
-		</tr>
-	</tbody></table>
-';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function type_url_form_file() {
-	return '
-	<table class="describe"><tbody>
-		<tr>
-			<th valign="top" scope="row" class="label">
-				<span class="alignleft"><label for="insertonly[href]">' . __('URL') . '</label></span>
-				<span class="alignright"><abbr title="required" class="required">*</abbr></span>
-			</th>
-			<td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></td>
-		</tr>
-		<tr>
-			<th valign="top" scope="row" class="label">
-				<span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
-				<span class="alignright"><abbr title="required" class="required">*</abbr></span>
-			</th>
-			<td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
-		</tr>
-		<tr><td></td><td class="help">' . __('Link text, e.g. "Ransom Demands (PDF)"') . '</td></tr>
-		<tr>
-			<td></td>
-			<td>
-				<input type="submit" class="button" name="insertonlybutton" value="' . attribute_escape(__('Insert into Post')) . '" />
-			</td>
-		</tr>
-	</tbody></table>
-';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * Support a GET parameter for disabling the flash uploader.
- *
- * @since unknown
- *
- * @param unknown_type $flash
- * @return unknown
- */
-function media_upload_use_flash($flash) {
-	if ( array_key_exists('flash', $_REQUEST) )
-		$flash = !empty($_REQUEST['flash']);
-	return $flash;
-}
-
-add_filter('flash_uploader', 'media_upload_use_flash');
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- */
-function media_upload_flash_bypass() {
-	echo '<p class="upload-flash-bypass">';
-	printf( __('You are using the Flash uploader.  Problems?  Try the <a href="%s">Browser uploader</a> instead.'), clean_url(add_query_arg('flash', 0)) );
-	echo '</p>';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- */
-function media_upload_html_bypass() {
-	echo '<p class="upload-html-bypass">';
-	if ( array_key_exists('flash', $_REQUEST) )
-		// the user manually selected the browser uploader, so let them switch back to Flash
-		printf( __('You are using the Browser uploader.  Try the <a href="%s">Flash uploader</a> instead.'), clean_url(add_query_arg('flash', 1)) );
-	else
-		// the user probably doesn't have Flash
-		printf( __('You are using the Browser uploader.') );
-
-	echo '</p>';
-}
-
-add_action('post-flash-upload-ui', 'media_upload_flash_bypass');
-add_action('post-html-upload-ui', 'media_upload_html_bypass');
-
-/**
- * {@internal Missing Short Description}}
- *
- * Make sure the GET parameter sticks when we submit a form.
- *
- * @since unknown
- *
- * @param unknown_type $url
- * @return unknown
- */
-function media_upload_bypass_url($url) {
-	if ( array_key_exists('flash', $_REQUEST) )
-		$url = add_query_arg('flash', intval($_REQUEST['flash']));
-	return $url;
-}
-
-add_filter('media_upload_form_url', 'media_upload_bypass_url');
-
-
-
-add_filter('async_upload_image', 'get_media_item', 10, 2);
-add_filter('async_upload_audio', 'get_media_item', 10, 2);
-add_filter('async_upload_video', 'get_media_item', 10, 2);
-add_filter('async_upload_file', 'get_media_item', 10, 2);
-
-add_action('media_upload_image', 'media_upload_image');
-add_action('media_upload_audio', 'media_upload_audio');
-add_action('media_upload_video', 'media_upload_video');
-add_action('media_upload_file', 'media_upload_file');
-
-add_filter('media_upload_gallery', 'media_upload_gallery');
-
-add_filter('media_upload_library', 'media_upload_library');
-
 ?>
diff -uNr a/mp-wp/wp-admin/includes/plugin-install.php b/mp-wp/wp-admin/includes/plugin-install.php
--- a/mp-wp/wp-admin/includes/plugin-install.php b7bb881a25fd047b984ebf4df073b5b1662f8287f33a756484f0afae46bbd3f03008996c7ec4c93a4ce90f5db2e79d9a6d3d9b7dc955c6927df9951043e05b57
+++ b/mp-wp/wp-admin/includes/plugin-install.php false
@@ -1,889 +0,0 @@
-<?php
-/**
- * WordPress Plugin Install Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/**
- * Retrieve plugin installer pages from WordPress Plugins API.
- *
- * It is possible for a plugin to override the Plugin API result with three
- * filters. Assume this is for plugins, which can extend on the Plugin Info to
- * offer more choices. This is very powerful and must be used with care, when
- * overridding the filters.
- *
- * The first filter, 'plugins_api_args', is for the args and gives the action as
- * the second parameter. The hook for 'plugins_api_args' must ensure that an
- * object is returned.
- *
- * The second filter, 'plugins_api', is the result that would be returned.
- *
- * @since 2.7.0
- *
- * @param string $action
- * @param array|object $args Optional. Arguments to serialize for the Plugin Info API.
- * @return mixed
- */
-function plugins_api($action, $args = null) {
-
-	if( is_array($args) )
-		$args = (object)$args;
-
-	if ( !isset($args->per_page) )
-		$args->per_page = 24;
-
-	$args = apply_filters('plugins_api_args', $args, $action); //NOTE: Ensure that an object is returned via this filter.
-	$res = apply_filters('plugins_api', false, $action, $args); //NOTE: Allows a plugin to completely override the builtin WordPress.org API.
-
-	if ( ! $res ) {
-		$request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
-		if ( is_wp_error($request) ) {
-			$res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occured during the API request.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() );
-		} else {
-			$res = unserialize($request['body']);
-			if ( ! $res )
-				$res = new WP_Error('plugins_api_failed', __('An unknown error occured'), $request['body']);
-		}
-	}
-
-	return apply_filters('plugins_api_result', $res, $action, $args);
-}
-
-/**
- * Retrieve popular WordPress plugin tags.
- *
- * @since 2.7.0
- *
- * @param array $args
- * @return array
- */
-function install_popular_tags( $args = array() ) {
-	if ( ! ($cache = wp_cache_get('popular_tags', 'api')) && ! ($cache = get_option('wporg_popular_tags')) )
-		add_option('wporg_popular_tags', array(), '', 'no'); ///No autoload.
-
-	if ( $cache && $cache->timeout + 3 * 60 * 60 > time() )
-		return $cache->cached;
-
-	$tags = plugins_api('hot_tags', $args);
-
-	if ( is_wp_error($tags) )
-		return $tags;
-
-	$cache = (object) array('timeout' => time(), 'cached' => $tags);
-
-	update_option('wporg_popular_tags', $cache);
-	wp_cache_set('popular_tags', $cache, 'api');
-
-	return $tags;
-}
-add_action('install_plugins_search', 'install_search', 10, 1);
-
-/**
- * Display search results and display as tag cloud.
- *
- * @since 2.7.0
- *
- * @param string $page
- */
-function install_search($page) {
-	$type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
-	$term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
-
-	$args = array();
-
-	switch( $type ){
-		case 'tag':
-			$args['tag'] = sanitize_title_with_dashes($term);
-			break;
-		case 'term':
-			$args['search'] = $term;
-			break;
-		case 'author':
-			$args['author'] = $term;
-			break;
-	}
-
-	$args['page'] = $page;
-
-	$api = plugins_api('query_plugins', $args);
-
-	if ( is_wp_error($api) )
-		wp_die($api);
-
-	add_action('install_plugins_table_header', 'install_search_form');
-
-	display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-
-	return;
-}
-
-add_action('install_plugins_dashboard', 'install_dashboard');
-function install_dashboard() {
-	?>
-	<p><?php _e('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> or upload a plugin in .zip format via this page.') ?></p>
-
-	<h4><?php _e('Search') ?></h4>
-	<?php install_search_form('<a href="' . add_query_arg('show-help', !isset($_REQUEST['show-help'])) .'" onclick="jQuery(\'#search-help\').toggle(); return false;">' . __('[need help?]') . '</a>') ?>
-	<div id="search-help" style="display: <?php echo isset($_REQUEST['show-help']) ? 'block' : 'none'; ?>;">
-	<p>	<?php _e('You may search based on 3 criteria:') ?><br />
-		<?php _e('<strong>Term:</strong> Searches plugins names and descriptions for the specified term') ?><br />
-		<?php _e('<strong>Tag:</strong> Searches for plugins tagged as such') ?><br />
-		<?php _e('<strong>Author:</strong> Searches for plugins created by the Author, or which the Author contributed to.') ?></p>
-	</div>
-
-	<h4><?php _e('Install a plugin in .zip format') ?></h4>
-	<p><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p>
-	<form method="post" enctype="multipart/form-data" action="<?php echo admin_url('plugin-install.php?tab=upload') ?>">
-		<?php wp_nonce_field( 'plugin-upload') ?>
-		<input type="file" name="pluginzip" />
-		<input type="submit" class="button" value="<?php _e('Install Now') ?>" />
-	</form>
-
-	<h4><?php _e('Popular tags') ?></h4>
-	<p><?php _e('You may also browse based on the most popular tags in the Plugin Directory:') ?></p>
-	<?php
-
-	$api_tags = install_popular_tags();
-
-	//Set up the tags in a way which can be interprated by wp_generate_tag_cloud()
-	$tags = array();
-	foreach ( (array)$api_tags as $tag )
-		$tags[ $tag['name'] ] = (object) array(
-								'link' => clean_url( admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ),
-								'name' => $tag['name'],
-								'id' => sanitize_title_with_dashes($tag['name']),
-								'count' => $tag['count'] );
-	echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d plugin'), 'multiple_text' => __('%d plugins') ) );
-}
-
-/**
- * Display search form for searching plugins.
- *
- * @since 2.7.0
- */
-function install_search_form(){
-	$type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
-	$term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
-
-	?><form id="search-plugins" method="post" action="<?php echo admin_url('plugin-install.php?tab=search') ?>">
-		<select name="type" id="typeselector">
-			<option value="term"<?php selected('term', $type) ?>><?php _e('Term') ?></option>
-			<option value="author"<?php selected('author', $type) ?>><?php _e('Author') ?></option>
-			<option value="tag"<?php selected('tag', $type) ?>><?php _e('Tag') ?></option>
-		</select>
-		<input type="text" name="s" id="search-field" value="<?php echo attribute_escape($term) ?>" />
-		<input type="submit" name="search" value="<?php echo attribute_escape(__('Search')) ?>" class="button" />
-	</form><?php
-}
-
-add_action('install_plugins_featured', 'install_featured', 10, 1);
-/**
- * Display featured plugins.
- *
- * @since 2.7.0
- *
- * @param string $page
- */
-function install_featured($page = 1) {
-	$args = array('browse' => 'featured', 'page' => $page);
-	$api = plugins_api('query_plugins', $args);
-	if ( is_wp_error($api) )
-		wp_die($api);
-	display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-}
-
-add_action('install_plugins_popular', 'install_popular', 10, 1);
-/**
- * Display popular plugins.
- *
- * @since 2.7.0
- *
- * @param string $page
- */
-function install_popular($page = 1) {
-	$args = array('browse' => 'popular', 'page' => $page);
-	$api = plugins_api('query_plugins', $args);
-	display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-}
-
-add_action('install_plugins_new', 'install_new', 10, 1);
-/**
- * Display new plugins.
- *
- * @since 2.7.0
- *
- * @param string $page
- */
-function install_new($page = 1) {
-	$args = array('browse' => 'new', 'page' => $page);
-	$api = plugins_api('query_plugins', $args);
-	if ( is_wp_error($api) )
-		wp_die($api);
-	display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-}
-add_action('install_plugins_updated', 'install_updated', 10, 1);
-
-
-/**
- * Display recently updated plugins.
- *
- * @since 2.7.0
- *
- * @param string $page
- */
-function install_updated($page = 1) {
-	$args = array('browse' => 'updated', 'page' => $page);
-	$api = plugins_api('query_plugins', $args);
-	display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-}
-
-/**
- * Display plugin content based on plugin list.
- *
- * @since 2.7.0
- *
- * @param array $plugins List of plugins.
- * @param string $page
- * @param int $totalpages Number of pages.
- */
-function display_plugins_table($plugins, $page = 1, $totalpages = 1){
-	$type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
-	$term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
-
-	$plugins_allowedtags = array('a' => array('href' => array(),'title' => array(), 'target' => array()),
-								'abbr' => array('title' => array()),'acronym' => array('title' => array()),
-								'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array());
-
-?>
-	<div class="tablenav">
-		<div class="alignleft actions">
-		<?php do_action('install_plugins_table_header'); ?>
-		</div>
-		<?php
-			$url = clean_url($_SERVER['REQUEST_URI']);
-			if ( ! empty($term) )
-				$url = add_query_arg('s', $term, $url);
-			if ( ! empty($type) )
-				$url = add_query_arg('type', $type, $url);
-
-			$page_links = paginate_links( array(
-				'base' => add_query_arg('paged', '%#%', $url),
-				'format' => '',
-				'prev_text' => __('&laquo;'),
-				'next_text' => __('&raquo;'),
-				'total' => $totalpages,
-				'current' => $page
-			));
-
-			if ( $page_links )
-				echo "\t\t<div class='tablenav-pages'>$page_links</div>";
-?>
-		<br class="clear" />
-	</div>
-	<table class="widefat" id="install-plugins" cellspacing="0">
-		<thead>
-			<tr>
-				<th scope="col" class="name"><?php _e('Name'); ?></th>
-				<th scope="col" class="num"><?php _e('Version'); ?></th>
-				<th scope="col" class="num"><?php _e('Rating'); ?></th>
-				<th scope="col" class="desc"><?php _e('Description'); ?></th>
-				<th scope="col" class="action-links"><?php _e('Actions'); ?></th>
-			</tr>
-		</thead>
-
-		<tfoot>
-			<tr>
-				<th scope="col" class="name"><?php _e('Name'); ?></th>
-				<th scope="col" class="num"><?php _e('Version'); ?></th>
-				<th scope="col" class="num"><?php _e('Rating'); ?></th>
-				<th scope="col" class="desc"><?php _e('Description'); ?></th>
-				<th scope="col" class="action-links"><?php _e('Actions'); ?></th>
-			</tr>
-		</tfoot>
-
-		<tbody class="plugins">
-		<?php
-			if( empty($plugins) )
-				echo '<tr><td colspan="5">', __('No plugins match your request.'), '</td></tr>';
-
-			foreach( (array) $plugins as $plugin ){
-				if ( is_object($plugin) )
-					$plugin = (array) $plugin;
-
-				$title = wp_kses($plugin['name'], $plugins_allowedtags);
-				$description = wp_kses($plugin['description'], $plugins_allowedtags);
-				$version = wp_kses($plugin['version'], $plugins_allowedtags);
-
-				$name = strip_tags($title . ' ' . $version);
-
-				$author = $plugin['author'];
-				if( ! empty($plugin['author']) )
-					$author = ' <cite>' . sprintf( __('By %s'), $author ) . '.</cite>';
-
-				$author = wp_kses($author, $plugins_allowedtags);
-
-				if( isset($plugin['homepage']) )
-					$title = '<a target="_blank" href="' . attribute_escape($plugin['homepage']) . '">' . $title . '</a>';
-
-				$action_links = array();
-				$action_links[] = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
-									'&amp;TB_iframe=true&amp;width=600&amp;height=800') . '" class="thickbox onclick" title="' .
-									attribute_escape($name) . '">' . __('Install') . '</a>';
-
-				$action_links = apply_filters('plugin_install_action_links', $action_links, $plugin);
-			?>
-			<tr>
-				<td class="name"><?php echo $title; ?></td>
-				<td class="vers"><?php echo $version; ?></td>
-				<td class="vers">
-					<div class="star-holder" title="<?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $plugin['num_ratings']), number_format_i18n($plugin['num_ratings'])) ?>">
-						<div class="star star-rating" style="width: <?php echo attribute_escape($plugin['rating']) ?>px"></div>
-						<div class="star star5"><img src="<?php echo admin_url('images/star.svg'); ?>" alt="<?php _e('5 stars') ?>" /></div>
-						<div class="star star4"><img src="<?php echo admin_url('images/star.svg'); ?>" alt="<?php _e('4 stars') ?>" /></div>
-						<div class="star star3"><img src="<?php echo admin_url('images/star.svg'); ?>" alt="<?php _e('3 stars') ?>" /></div>
-						<div class="star star2"><img src="<?php echo admin_url('images/star.svg'); ?>" alt="<?php _e('2 stars') ?>" /></div>
-						<div class="star star1"><img src="<?php echo admin_url('images/star.svg'); ?>" alt="<?php _e('1 star') ?>" /></div>
-					</div>
-				</td>
-				<td class="desc"><p><?php echo $description, $author; ?></p></td>
-				<td class="action-links"><?php if ( !empty($action_links) )	echo implode(' | ', $action_links); ?></td>
-			</tr>
-			<?php
-			}
-			?>
-		</tbody>
-	</table>
-
-	<div class="tablenav">
-		<?php if ( $page_links )
-				echo "\t\t<div class='tablenav-pages'>$page_links</div>"; ?>
-		<br class="clear" />
-	</div>
-
-<?php
-}
-
-add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
-
-/**
- * Display plugin information in dialog box form.
- *
- * @since 2.7.0
- */
-function install_plugin_information() {
-	global $tab;
-
-	$api = plugins_api('plugin_information', array('slug' => stripslashes( $_REQUEST['plugin'] ) ));
-
-	if ( is_wp_error($api) )
-		wp_die($api);
-
-	$plugins_allowedtags = array('a' => array('href' => array(), 'title' => array(), 'target' => array()),
-								'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
-								'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
-								'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
-								'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
-								'img' => array('src' => array(), 'class' => array(), 'alt' => array()));
-	//Sanitize HTML
-	foreach ( (array)$api->sections as $section_name => $content )
-		$api->sections[$section_name] = wp_kses($content, $plugins_allowedtags);
-	foreach ( array('version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug') as $key )
-		$api->$key = wp_kses($api->$key, $plugins_allowedtags);
-
-	$section = isset($_REQUEST['section']) ? stripslashes( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English.
-	if( empty($section) || ! isset($api->sections[ $section ]) )
-		$section = array_shift( $section_titles = array_keys((array)$api->sections) );
-
-	iframe_header( __('Plugin Install') );
-	echo "<div id='$tab-header'>\n";
-	echo "<ul id='sidemenu'>\n";
-	foreach ( (array)$api->sections as $section_name => $content ) {
-
-		$title = $section_name;
-		$title = ucwords(str_replace('_', ' ', $title));
-
-		$class = ( $section_name == $section ) ? ' class="current"' : '';
-		$href = add_query_arg( array('tab' => $tab, 'section' => $section_name) );
-		$href = clean_url($href);
-		$san_title = attribute_escape(sanitize_title_with_dashes($title));
-		echo "\t<li><a name='$san_title' target='' href='$href'$class>$title</a></li>\n";
-	}
-	echo "</ul>\n";
-	echo "</div>\n";
-	?>
-	<div class="alignright fyi">
-		<?php if ( ! empty($api->download_link) ) : ?>
-		<p class="action-button">
-		<?php
-			//Default to a "new" plugin
-			$type = 'install';
-			//Check to see if this plugin is known to be installed, and has an update awaiting it.
-			$update_plugins = get_option('update_plugins');
-			foreach ( (array)$update_plugins->response as $file => $plugin ) {
-				if ( $plugin->slug === $api->slug ) {
-					$type = 'update_available';
-					$update_file = $file;
-					break;
-				}
-			}
-			if ( 'install' == $type && is_dir( WP_PLUGIN_DIR  . '/' . $api->slug ) ) {
-				$installed_plugin = get_plugins('/' . $api->slug);
-				if ( ! empty($installed_plugin) ) {
-					$key = array_shift( $key = array_keys($installed_plugin) ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
-					if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '>') ){
-						$type = 'latest_installed';
-					} elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
-						$type = 'newer_installed';
-						$newer_version = $installed_plugin[ $key ]['Version'];
-					} else {
-						//If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh
-						delete_option('update_plugins');
-						$update_file = $api->slug . '/' . $key; //This code branch only deals with a plugin which is in a folder the same name as its slug, Doesnt support plugins which have 'non-standard' names
-						$type = 'update_available';
-					}
-				}
-			}
-
-			switch ( $type ) :
-				default:
-				case 'install':
-					if ( current_user_can('install_plugins') ) :
-				?><a href="<?php echo wp_nonce_url(admin_url('plugin-install.php?tab=install&plugin=' . $api->slug), 'install-plugin_' . $api->slug) ?>" target="_parent"><?php _e('Install Now') ?></a><?php
-					endif;
-				break;
-				case 'newer_installed':
-					if ( current_user_can('install_plugins') || current_user_can('update_plugins') ) :
-					?><a><?php printf(__('Newer Version (%s) Installed'), $newer_version) ?></a><?php
-					endif;
-				break;
-				case 'latest_installed':
-					if ( current_user_can('install_plugins') || current_user_can('update_plugins') ) :
-					?><a><?php _e('Latest Version Installed') ?></a><?php
-					endif;
-				break;
-			endswitch; ?>
-		</p>
-		<?php endif; ?>
-		<h2 class="mainheader"><?php _e('FYI') ?></h2>
-		<ul>
-<?php if ( ! empty($api->version) ) : ?>
-			<li><strong><?php _e('Version:') ?></strong> <?php echo $api->version ?></li>
-<?php endif; if ( ! empty($api->author) ) : ?>
-			<li><strong><?php _e('Author:') ?></strong> <?php echo links_add_target($api->author, '_blank') ?></li>
-<?php endif; if ( ! empty($api->last_updated) ) : ?>
-			<li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php
-							printf( __('%s ago'), human_time_diff(strtotime($api->last_updated)) ) ?></span></li>
-<?php endif; if ( ! empty($api->requires) ) : ?>
-			<li><strong><?php _e('Requires WordPress Version:') ?></strong> <?php printf(__('%s or higher'), $api->requires) ?></li>
-<?php endif; if ( ! empty($api->tested) ) : ?>
-			<li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li>
-<?php endif; if ( ! empty($api->downloaded) ) : ?>
-			<li><strong><?php _e('Downloaded:') ?></strong> <?php printf(__ngettext('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
-<?php endif; if ( ! empty($api->slug) ) : ?>
-			<li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
-<?php endif; if ( ! empty($api->homepage) ) : ?>
-			<li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage  &#187;') ?></a></li>
-<?php endif; ?>
-		</ul>
-		<h2><?php _e('Average Rating') ?></h2>
-		<div class="star-holder" title="<?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?>">
-			<div class="star star-rating" style="width: <?php echo attribute_escape($api->rating) ?>px"></div>
-			<div class="star star5"><img src="<?php echo admin_url('images/star.svg'); ?>" alt="<?php _e('5 stars') ?>" /></div>
-			<div class="star star4"><img src="<?php echo admin_url('images/star.svg'); ?>" alt="<?php _e('4 stars') ?>" /></div>
-			<div class="star star3"><img src="<?php echo admin_url('images/star.svg'); ?>" alt="<?php _e('3 stars') ?>" /></div>
-			<div class="star star2"><img src="<?php echo admin_url('images/star.svg'); ?>" alt="<?php _e('2 stars') ?>" /></div>
-			<div class="star star1"><img src="<?php echo admin_url('images/star.svg'); ?>" alt="<?php _e('1 star') ?>" /></div>
-		</div>
-		<small><?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small>
-	</div>
-	<div id="section-holder" class="wrap">
-	<?php
-		if ( version_compare($GLOBALS['wp_version'], $api->tested, '>') )
-			echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';
-		else if ( version_compare($GLOBALS['wp_version'], $api->requires, '<') )
-			echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has not been marked as <strong>compatible</strong> with your version of WordPress.') . '</p></div>';
-		foreach ( (array)$api->sections as $section_name => $content ) {
-			$title = $section_name;
-			$title[0] = strtoupper($title[0]);
-			$title = str_replace('_', ' ', $title);
-
-			$content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/');
-			$content = links_add_target($content, '_blank');
-
-			$san_title = attribute_escape(sanitize_title_with_dashes($title));
-
-			$display = ( $section_name == $section ) ? 'block' : 'none';
-
-			echo "\t<div id='section-{$san_title}' class='section' style='display: {$display};'>\n";
-			echo "\t\t<h2 class='long-header'>$title</h2>";
-			echo $content;
-			echo "\t</div>\n";
-		}
-	echo "</div>\n";
-
-	iframe_footer();
-	exit;
-}
-
-
-add_action('install_plugins_upload', 'upload_plugin');
-function upload_plugin() {
-
-	if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
-		wp_die($uploads['error']);
-
-	if ( !empty($_FILES) )
-		$filename = $_FILES['pluginzip']['name'];
-	else if ( isset($_GET['package']) )
-		$filename = $_GET['package'];
-
-	check_admin_referer('plugin-upload');
-
-	echo '<div class="wrap">';
-	echo '<h2>', sprintf( __('Installing Plugin from file: %s'), basename($filename) ), '</h2>';
-
-	//Handle a newly uploaded file, Else assume it was
-	if ( !empty($_FILES) ) {
-		$filename = wp_unique_filename( $uploads['basedir'], $filename );
-		$local_file = $uploads['basedir'] . '/' . $filename;
-
-		// Move the file to the uploads dir
-		if ( false === @ move_uploaded_file( $_FILES['pluginzip']['tmp_name'], $local_file) )
-			wp_die( sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path']));
-	} else {
-		$local_file = $uploads['basedir'] . '/' . $filename;
-	}
-
-	do_plugin_install_local_package($local_file, $filename);
-	echo '</div>';
-}
-
-add_action('install_plugins_install', 'install_plugin');
-
-/**
- * Display plugin link and execute install.
- *
- * @since 2.7.0
- */
-function install_plugin() {
-
-	$plugin = isset($_REQUEST['plugin']) ? stripslashes( $_REQUEST['plugin'] ) : '';
-
-	check_admin_referer('install-plugin_' . $plugin);
-	$api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
-
-	if ( is_wp_error($api) )
-		wp_die($api);
-
-	echo '<div class="wrap">';
-	echo '<h2>', sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ), '</h2>';
-
-	do_plugin_install($api->download_link, $api);
-	echo '</div>';
-
-}
-
-/**
- * Retrieve plugin and install.
- *
- * @since 2.7.0
- *
- * @param string $download_url Download URL.
- * @param object $plugin_information Optional. Plugin information
- */
-function do_plugin_install($download_url, $plugin_information = null) {
-	global $wp_filesystem;
-
-	if ( empty($download_url) ) {
-		show_message( __('No plugin Specified') );
-		return;
-	}
-
-	$plugin = isset($_REQUEST['plugin']) ? stripslashes( $_REQUEST['plugin'] ) : '';
-
-	$url = 'plugin-install.php?tab=install';
-	$url = add_query_arg(array('plugin' => $plugin, 'plugin_name' => stripslashes( $_REQUEST['plugin_name'] ), 'download_url' => stripslashes( $_REQUEST['download_url'] ) ), $url);
-
-	$url = wp_nonce_url($url, 'install-plugin_' . $plugin);
-	if ( false === ($credentials = request_filesystem_credentials($url)) )
-		return;
-
-	if ( ! WP_Filesystem($credentials) ) {
-		request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
-		return;
-	}
-
-	if ( $wp_filesystem->errors->get_error_code() ) {
-		foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-			show_message($message);
-		return;
-	}
-
-	$result = wp_install_plugin( $download_url, 'show_message' );
-
-	if ( is_wp_error($result) ) {
-		show_message($result);
-		show_message( __('Installation Failed') );
-	} else {
-		show_message( sprintf(__('Successfully installed the plugin <strong>%s %s</strong>.'), $plugin_information->name, $plugin_information->version) );
-		$plugin_file = $result;
-
-		$install_actions = apply_filters('install_plugin_complete_actions', array(
-			'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . attribute_escape(__('Activate this plugin')) . '" target="_parent">' . __('Activate Plugin') . '</a>',
-			'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . attribute_escape(__('Goto plugins page')) . '" target="_parent">' . __('Return to Plugins page') . '</a>'
-							), $plugin_information, $plugin_file);
-		if ( ! empty($install_actions) )
-			show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$install_actions));
-	}
-}
-
-/**
- * Install a plugin from a local file.
- *
- * @since 2.7.0
- *
- * @param string $package Local Plugin zip
- * @param string $filename Optional. Original filename
- * @param object $plugin_information Optional. Plugin information
- */
-function do_plugin_install_local_package($package, $filename = '') {
-	global $wp_filesystem;
-
-	if ( empty($package) ) {
-		show_message( __('No plugin Specified') );
-		return;
-	}
-
-	if ( empty($filename) )
-		$filename = basename($package);
-
-	$url = 'plugin-install.php?tab=upload';
-	$url = add_query_arg(array('package' => $filename), $url);
-
-	$url = wp_nonce_url($url, 'plugin-upload');
-	if ( false === ($credentials = request_filesystem_credentials($url)) )
-		return;
-
-	if ( ! WP_Filesystem($credentials) ) {
-		request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
-		return;
-	}
-
-	if ( $wp_filesystem->errors->get_error_code() ) {
-		foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-			show_message($message);
-		return;
-	}
-
-	$result = wp_install_plugin_local_package( $package, 'show_message' );
-
-	if ( is_wp_error($result) ) {
-		show_message($result);
-		show_message( __('Installation Failed') );
-	} else {
-		show_message( __('Successfully installed the plugin.') );
-		$plugin_file = $result;
-
-		$install_actions = apply_filters('install_plugin_complete_actions', array(
-							'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
-							'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . __('Goto plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
-							), array(), $plugin_file);
-		if ( ! empty($install_actions) )
-			show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$install_actions));
-	}
-}
-
-/**
- * Install plugin.
- *
- * @since 2.7.0
- *
- * @param string $package
- * @param string $feedback Optional.
- * @return mixed.
- */
-function wp_install_plugin($package, $feedback = '') {
-	global $wp_filesystem;
-
-	if ( !empty($feedback) )
-		add_filter('install_feedback', $feedback);
-
-	// Is a filesystem accessor setup?
-	if ( ! $wp_filesystem || ! is_object($wp_filesystem) )
-		WP_Filesystem();
-
-	if ( ! is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
-
-	if ( $wp_filesystem->errors->get_error_code() )
-		return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
-
-	//Get the base plugin folder
-	$plugins_dir = $wp_filesystem->wp_plugins_dir();
-	if ( empty($plugins_dir) )
-		return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
-
-	//And the same for the Content directory.
-	$content_dir = $wp_filesystem->wp_content_dir();
-	if( empty($content_dir) )
-		return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-
-	$plugins_dir = trailingslashit( $plugins_dir );
-	$content_dir = trailingslashit( $content_dir );
-
-	if ( empty($package) )
-		return new WP_Error('no_package', __('Install package not available.'));
-
-	// Download the package
-	apply_filters('install_feedback', sprintf(__('Downloading plugin package from %s'), $package));
-	$download_file = download_url($package);
-
-	if ( is_wp_error($download_file) )
-		return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message());
-
-	$working_dir = $content_dir . 'upgrade/' . basename($package, '.zip');
-
-	// Clean up working directory
-	if ( $wp_filesystem->is_dir($working_dir) )
-		$wp_filesystem->delete($working_dir, true);
-
-	apply_filters('install_feedback', __('Unpacking the plugin package'));
-	// Unzip package to working directory
-	$result = unzip_file($download_file, $working_dir);
-
-	// Once extracted, delete the package
-	@unlink($download_file);
-
-	if ( is_wp_error($result) ) {
-		$wp_filesystem->delete($working_dir, true);
-		return $result;
-	}
-
-	//Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
-	$filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-	if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) {
-		$wp_filesystem->delete($working_dir, true);
-		return new WP_Error('install_folder_exists', __('Folder already exists.'), $filelist[0] );
-	}
-
-	apply_filters('install_feedback', __('Installing the plugin'));
-	// Copy new version of plugin into place.
-	$result = copy_dir($working_dir, $plugins_dir);
-	if ( is_wp_error($result) ) {
-		$wp_filesystem->delete($working_dir, true);
-		return $result;
-	}
-
-	//Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
-	$filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-	// Remove working directory
-	$wp_filesystem->delete($working_dir, true);
-
-	if( empty($filelist) )
-		return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-
-	$folder = $filelist[0];
-	$plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash
-	$pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
-
-	//Return the plugin files name.
-	return  $folder . '/' . $pluginfiles[0];
-}
-
-/**
- * Install plugin from local package
- *
- * @since 2.7.0
- *
- * @param string $package
- * @param string $feedback Optional.
- * @return mixed.
- */
-function wp_install_plugin_local_package($package, $feedback = '') {
-	global $wp_filesystem;
-
-	if ( !empty($feedback) )
-		add_filter('install_feedback', $feedback);
-
-	// Is a filesystem accessor setup?
-	if ( ! $wp_filesystem || ! is_object($wp_filesystem) )
-		WP_Filesystem();
-
-	if ( ! is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
-
-	if ( $wp_filesystem->errors->get_error_code() )
-		return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
-
-	//Get the base plugin folder
-	$plugins_dir = $wp_filesystem->wp_plugins_dir();
-	if ( empty($plugins_dir) )
-		return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
-
-	//And the same for the Content directory.
-	$content_dir = $wp_filesystem->wp_content_dir();
-	if( empty($content_dir) )
-		return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-
-	$plugins_dir = trailingslashit( $plugins_dir );
-	$content_dir = trailingslashit( $content_dir );
-
-	if ( empty($package) )
-		return new WP_Error('no_package', __('Install package not available.'));
-
-	$working_dir = $content_dir . 'upgrade/' . basename($package, '.zip');
-
-	// Clean up working directory
-	if ( $wp_filesystem->is_dir($working_dir) )
-		$wp_filesystem->delete($working_dir, true);
-
-	apply_filters('install_feedback', __('Unpacking the plugin package'));
-	// Unzip package to working directory
-	$result = unzip_file($package, $working_dir);
-
-	// Once extracted, delete the package
-	unlink($package);
-
-	if ( is_wp_error($result) ) {
-		$wp_filesystem->delete($working_dir, true);
-		return $result;
-	}
-
-	//Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
-	$filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-	if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) {
-		$wp_filesystem->delete($working_dir, true);
-		return new WP_Error('install_folder_exists', __('Folder already exists.'), $filelist[0] );
-	}
-
-	apply_filters('install_feedback', __('Installing the plugin'));
-	// Copy new version of plugin into place.
-	$result = copy_dir($working_dir, $plugins_dir);
-	if ( is_wp_error($result) ) {
-		$wp_filesystem->delete($working_dir, true);
-		return $result;
-	}
-
-	//Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
-	$filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-	// Remove working directory
-	$wp_filesystem->delete($working_dir, true);
-
-	if( empty($filelist) )
-		return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-
-	$folder = $filelist[0];
-	$plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash
-	$pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
-
-	//Return the plugin files name.
-	return  $folder . '/' . $pluginfiles[0];
-}
-
-?>
diff -uNr a/mp-wp/wp-admin/includes/plugin.php b/mp-wp/wp-admin/includes/plugin.php
--- a/mp-wp/wp-admin/includes/plugin.php f324c3e723ae8d5248a4bc68b41bf2867524cf50d19d64f09d965a7c7e7f5e521bee9570bff3ece96ad44f0e2086d69ceb97e0101bc6b1aecd2d574a540aed79
+++ b/mp-wp/wp-admin/includes/plugin.php f42c4e6e3fb6a8f32281a6a8bd0049b1bdf120fcc3a0b917f8f5bd2ad5299da654a3236d37d47f679288bfdf2cbc48968dc2b574e2c8dca54fe1e6df7c24a01c
@@ -124,7 +124,7 @@
 		if ( ! empty($plugin_data['AuthorURI']) )
 			$plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '" title="' . __( 'Visit author homepage' ) . '">' . $plugin_data['Author'] . '</a>';
 
-		$plugin_data['Description'] = wptexturize( $plugin_data['Description'] );
+		$plugin_data['Description'] = $plugin_data['Description'];
 		if( ! empty($plugin_data['Author']) )
 			$plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s'), $plugin_data['Author'] ) . '.</cite>';
 	}
@@ -342,99 +342,6 @@
 	return true;
 }
 
-/**
- * Remove directory and files of a plugin for a single or list of plugin(s).
- *
- * If the plugins parameter list is empty, false will be returned. True when
- * completed.
- *
- * @since unknown
- *
- * @param array $plugins List of plugin
- * @param string $redirect Redirect to page when complete.
- * @return mixed
- */
-function delete_plugins($plugins, $redirect = '' ) {
-	global $wp_filesystem;
-
-	if( empty($plugins) )
-		return false;
-
-	$checked = array();
-	foreach( $plugins as $plugin )
-		$checked[] = 'checked[]=' . $plugin;
-
-	ob_start();
-	$url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-manage-plugins');
-	if ( false === ($credentials = request_filesystem_credentials($url)) ) {
-		$data = ob_get_contents();
-		ob_end_clean();
-		if( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
-			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
-			exit;
-		}
-		return;
-	}
-
-	if ( ! WP_Filesystem($credentials) ) {
-		request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
-		$data = ob_get_contents();
-		ob_end_clean();
-		if( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
-			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
-			exit;
-		}
-		return;
-	}
-
-	if ( $wp_filesystem->errors->get_error_code() ) {
-		return $wp_filesystem->errors;
-	}
-
-	if ( ! is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
-
-	if ( $wp_filesystem->errors->get_error_code() )
-		return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
-
-	//Get the base plugin folder
-	$plugins_dir = $wp_filesystem->wp_plugins_dir();
-	if ( empty($plugins_dir) )
-		return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
-
-	$plugins_dir = trailingslashit( $plugins_dir );
-
-	$errors = array();
-
-	foreach( $plugins as $plugin_file ) {
-		// Run Uninstall hook
-		if ( is_uninstallable_plugin( $plugin_file ) )
-			uninstall_plugin($plugin_file);
-
-		$this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin_file) );
-		// If plugin is in its own directory, recursively delete the directory.
-		if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
-			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
-		else
-			$deleted = $wp_filesystem->delete($plugins_dir . $plugin_file);
-
-		if ( ! $deleted )
-			$errors[] = $plugin_file;
-	}
-
-	if ( ! empty($errors) )
-		return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s'), implode(', ', $errors)) );
-
-	// Force refresh of plugin update information
-	delete_option('update_plugins');
-
-	return true;
-}
-
 function validate_active_plugins() {
 	$check_plugins = get_option('active_plugins');
 
@@ -479,63 +386,6 @@
 	return 0;
 }
 
-/**
- * Whether the plugin can be uninstalled.
- *
- * @since 2.7.0
- *
- * @param string $plugin Plugin path to check.
- * @return bool Whether plugin can be uninstalled.
- */
-function is_uninstallable_plugin($plugin) {
-	$file = plugin_basename($plugin);
-
-	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	if ( isset( $uninstallable_plugins[$file] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) )
-		return true;
-
-	return false;
-}
-
-/**
- * Uninstall a single plugin.
- *
- * Calls the uninstall hook, if it is available.
- *
- * @since 2.7.0
- *
- * @param string $plugin Relative plugin path from Plugin Directory.
- */
-function uninstall_plugin($plugin) {
-	$file = plugin_basename($plugin);
-
-	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	if ( file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) ) {
-		if ( isset( $uninstallable_plugins[$file] ) ) {
-			unset($uninstallable_plugins[$file]);
-			update_option('uninstall_plugins', $uninstallable_plugins);
-		}
-		unset($uninstallable_plugins);
-
-		define('WP_UNINSTALL_PLUGIN', $file);
-		include WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php';
-
-		return true;
-	}
-
-	if ( isset( $uninstallable_plugins[$file] ) ) {
-		$callable = $uninstallable_plugins[$file];
-		unset($uninstallable_plugins[$file]);
-		update_option('uninstall_plugins', $uninstallable_plugins);
-		unset($uninstallable_plugins);
-
-		include WP_PLUGIN_DIR . '/' . $file;
-
-		add_action( 'uninstall_' . $file, $callable );
-		do_action( 'uninstall_' . $file );
-	}
-}
-
 //
 // Menu
 //
@@ -711,14 +561,6 @@
 			$parent = $_wp_real_parent_file[$parent];
 		return $parent;
 	}
-/*
-	if ( !empty ( $parent_file ) ) {
-		if ( isset( $_wp_real_parent_file[$parent_file] ) )
-			$parent_file = $_wp_real_parent_file[$parent_file];
-
-		return $parent_file;
-	}
-*/
 
 	if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) {
 		foreach ( $menu as $parent_menu ) {
diff -uNr a/mp-wp/wp-admin/includes/post.php b/mp-wp/wp-admin/includes/post.php
--- a/mp-wp/wp-admin/includes/post.php 0259b97c471cea621cc846a3c22ab4e8e160f88d44cfb8720a518fe7813ea79831ecfa85c08a8bcb91915ded8d462c90296940787da889d2ee8bc8d603a839d5
+++ b/mp-wp/wp-admin/includes/post.php 0f56a6d784e662b0fffce0fe0ec9277715912422e89a577d4c614c07b044c49672357ba556355d0308f7b09caf3ac7f6d62e45c4427a813221525323c8d8ea58
@@ -926,6 +926,7 @@
 	$post->post_status = $original_status;
 	$post->post_date = $original_date;
 	$post->post_name = $original_name;
+
 	return $permalink;
 }
 
@@ -945,24 +946,8 @@
 	if (false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%')) {
 		return '';
 	}
-	$title = __('Click to edit this part of the permalink');
-	if (function_exists('mb_strlen')) {
-		if (mb_strlen($post_name) > 30) {
-			$post_name_abridged = mb_substr($post_name, 0, 14). '&hellip;' . mb_substr($post_name, -14);
-		} else {
-			$post_name_abridged = $post_name;
-		}
-	} else {
-		if (strlen($post_name) > 30) {
-			$post_name_abridged = substr($post_name, 0, 14). '&hellip;' . substr($post_name, -14);
-		} else {
-			$post_name_abridged = $post_name;
-		}
-	}
-	$post_name_html = '<span id="editable-post-name" title="'.$title.'">'.$post_name_abridged.'</span><span id="editable-post-name-full">'.$post_name.'</span>';
-	$display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
-	$return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $display_link . "</span>\n";
-	$return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button" onclick="edit_permalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
+	$display_link = str_replace(array('%pagename%/','%postname%/'), '', $permalink);
+	$return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $display_link . "</span>".'<input type="text" id="new-post-slug" name="post_name" value="' . $post_name . '" />';
 	return $return;
 }
 
diff -uNr a/mp-wp/wp-admin/includes/schema.php b/mp-wp/wp-admin/includes/schema.php
--- a/mp-wp/wp-admin/includes/schema.php c890a951b231c4c93f6b5c87cd66f0a3312c83fd26fa04718ee43a55d67b18c7e4cc2e3b44e54276e093bb952b191430260f6de08ad6fca55dc96e7987997c4a
+++ b/mp-wp/wp-admin/includes/schema.php e083b5b6b430483751fd25b8c8e411daa0e5478557c02a48c349e784ed38e2c24a08c21e82107b6b7f2155f5c2193dd5e8f58418282b7f2ec60f4076e35a358c
@@ -299,7 +299,7 @@
 	add_option('dismissed_update_core', array());
 
 	// Delete unused options
-	$unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins');
+	$unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins');
 	foreach ($unusedoptions as $option) :
 		delete_option($option);
 	endforeach;
diff -uNr a/mp-wp/wp-admin/includes/template.php b/mp-wp/wp-admin/includes/template.php
--- a/mp-wp/wp-admin/includes/template.php 16c0fc9c5d8a4cc9ff746e06c54c55c30fc703f1d81d3f441454e3cc94655a0abbcf606e3df1126dad1e5ffdc049f04328f33461f1ef137a46e06a5aca0eabe9
+++ b/mp-wp/wp-admin/includes/template.php 67007ae96743e9c971f9d54432741753eda72b8c98134960a3ed97bc8368ba32ea6c57830219f47e34804ffe607dfa4b400e41846323595eaf134f43e20bfcc9
@@ -121,9 +121,8 @@
 		$edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>" . attribute_escape( $name ) . '</a><br />';
 		$actions = array();
 		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
 		if ( $default_cat_id != $category->term_id )
-			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("categories.php?action=delete&amp;cat_ID=$category->term_id", 'delete-category_' . $category->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this category '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("categories.php?action=delete&amp;cat_ID=$category->term_id", 'delete-category_' . $category->term_id) . "'>" . __('Delete') . "</a>";
 		$action_count = count($actions);
 		$i = 0;
 		$edit .= '<div class="row-actions">';
@@ -157,13 +156,13 @@
 
 		switch ($column_name) {
 			case 'cb':
-				$output .= "<th scope='row' class='check-column'>";
+				$output .= "<td scope='row' class='check-column'>";
 				if ( $default_cat_id != $category->term_id ) {
 					$output .= "<input type='checkbox' name='delete[]' value='$category->term_id' />";
 				} else {
 					$output .= "&nbsp;";
 				}
-				$output .= '</th>';
+				$output .= '</td>';
 				break;
 			case 'name':
 				$output .= "<td $attributes>$edit";
@@ -191,80 +190,6 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since 2.7
- *
- * Outputs the HTML for the hidden table rows used in Categories, Link Caregories and Tags quick edit.
- *
- * @param string $type "tag", "category" or "link-category"
- * @return
- */
-function inline_edit_term_row($type) {
-
-	if ( ! current_user_can( 'manage_categories' ) )
-		return;
-
-	$is_tag = $type == 'edit-tags';
-	$columns = get_column_headers($type);
-	$hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($type) ) );
-	$col_count = count($columns) - count($hidden);
-	?>
-
-<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
-	<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $col_count; ?>">
-
-		<fieldset><div class="inline-edit-col">
-			<h4><?php _e( 'Quick Edit' ); ?></h4>
-
-			<label>
-				<span class="title"><?php _e( 'Name' ); ?></span>
-				<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
-			</label>
-
-			<label>
-				<span class="title"><?php _e( 'Slug' ); ?></span>
-				<span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
-			</label>
-
-<?php if ( 'category' == $type ) : ?>
-
-			<label>
-				<span class="title"><?php _e( 'Parent' ); ?></span>
-				<?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('None'))); ?>
-			</label>
-
-<?php endif; // $type ?>
-
-		</div></fieldset>
-
-<?php
-
-	$core_columns = array( 'cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true );
-
-	foreach ( $columns as $column_name => $column_display_name ) {
-		if ( isset( $core_columns[$column_name] ) )
-			continue;
-		do_action( 'quick_edit_custom_box', $column_name, $type );
-	}
-
-?>
-
-	<p class="inline-edit-save submit">
-		<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
-		<?php $update_text = ( $is_tag ) ? __( 'Update Tag' ) : __( 'Update Category' ); ?>
-		<a accesskey="s" href="#inline-edit" title="<?php echo attribute_escape( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
-		<img class="waiting" style="display:none;" src="images/loading.svg" alt="" />
-		<span class="error" style="display:none;"></span>
-		<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
-		<br class="clear" />
-	</p>
-	</td></tr>
-	</tbody></table></form>
-<?php
-}
-
-/**
- * {@internal Missing Short Description}}
- *
  * @since unknown
  *
  * @param unknown_type $category
@@ -286,9 +211,8 @@
 		$edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>$name</a><br />";
 		$actions = array();
 		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
 		if ( $default_cat_id != $category->term_id )
-			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link-category.php?action=delete&amp;cat_ID=$category->term_id", 'delete-link-category_' . $category->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this category '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link-category.php?action=delete&amp;cat_ID=$category->term_id", 'delete-link-category_' . $category->term_id) . "'>" . __('Delete') . "</a>";
 		$action_count = count($actions);
 		$i = 0;
 		$edit .= '<div class="row-actions">';
@@ -321,13 +245,13 @@
 
 		switch ($column_name) {
 			case 'cb':
-				$output .= "<th scope='row' class='check-column'>";
+				$output .= "<td scope='row' class='check-column'>";
 				if ( absint( get_option( 'default_link_category' ) ) != $category->term_id ) {
 					$output .= "<input type='checkbox' name='delete[]' value='$category->term_id' />";
 				} else {
 					$output .= "&nbsp;";
 				}
-				$output .= "</th>";
+				$output .= "</td>";
 				break;
 			case 'name':
 				$output .= "<td $attributes>$edit";
@@ -603,14 +527,13 @@
 
 			switch ($column_name) {
 				case 'cb':
-					$out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>';
+					$out .= '<td scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></td>';
 					break;
 				case 'name':
 					$out .= '<td ' . $attributes . '><strong><a class="row-title" href="' . $edit_link . '" title="' . attribute_escape(sprintf(__('Edit "%s"'), $name)) . '">' . $name . '</a></strong><br />';
 					$actions = array();
 					$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-					$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
-					$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this tag '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+					$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "'>" . __('Delete') . "</a>";
 					$action_count = count($actions);
 					$i = 0;
 					$out .= '<div class="row-actions">';
@@ -686,13 +609,13 @@
  */
 function wp_manage_posts_columns() {
 	$posts_columns = array();
-	$posts_columns['cb'] = '<input type="checkbox" />';
+	$posts_columns['cb'] = '&nbsp;';
 	$posts_columns['title'] = _c('Post|noun');
 	$posts_columns['author'] = __('Author');
 	$posts_columns['categories'] = __('Categories');
 	$posts_columns['tags'] = __('Tags');
 	if ( !isset($_GET['post_status']) || !in_array($_GET['post_status'], array('pending', 'draft', 'future')) )
-		$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.svg" /></div>';
+		$posts_columns['comments'] = '<div class="vers">Comments</div>';
 	$posts_columns['date'] = __('Date');
 	$posts_columns = apply_filters('manage_posts_columns', $posts_columns);
 
@@ -709,14 +632,11 @@
  */
 function wp_manage_media_columns() {
 	$posts_columns = array();
-	$posts_columns['cb'] = '<input type="checkbox" />';
+	$posts_columns['cb'] = '&nbsp;';
 	$posts_columns['icon'] = '';
 	$posts_columns['media'] = _c('File|media column header');
 	$posts_columns['author'] = __('Author');
-	//$posts_columns['tags'] = _c('Tags|media column header');
-	$posts_columns['parent'] = _c('Attached to|media column header');
-	$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.svg" /></div>';
-	//$posts_columns['comments'] = __('Comments');
+	$posts_columns['comments'] = '<div class="vers">Comments</div>';
 	$posts_columns['date'] = _c('Date|media column header');
 	$posts_columns = apply_filters('manage_media_columns', $posts_columns);
 
@@ -732,14 +652,14 @@
  */
 function wp_manage_pages_columns() {
 	$posts_columns = array();
-	$posts_columns['cb'] = '<input type="checkbox" />';
+	$posts_columns['cb'] = '&nbsp;';
 	$posts_columns['title'] = __('Title');
 	$posts_columns['author'] = __('Author');
 	$post_status = 'all';
 	if ( !empty($_GET['post_status']) )
 		$post_status = $_GET['post_status'];
 	if ( !in_array($post_status, array('pending', 'draft', 'future')) )
-		$posts_columns['comments'] = '<div class="vers"><img alt="" src="images/comment-grey-bubble.svg" /></div>';
+		$posts_columns['comments'] = '<div class="vers">Comments</div>';
 	$posts_columns['date'] = __('Date');
 	$posts_columns = apply_filters('manage_pages_columns', $posts_columns);
 
@@ -773,7 +693,7 @@
 			break;
 		case 'edit-comments':
 			$_wp_column_headers[$page] = array(
-				'cb' => '<input type="checkbox" />',
+				'cb' => '&nbsp;',
 				'author' => __('Author'),
 				'comment' => _c('Comment|noun'),
 				//'date' => __('Submitted'),
@@ -783,7 +703,7 @@
 			break;
 		case 'link-manager':
 			$_wp_column_headers[$page] = array(
-				'cb' => '<input type="checkbox" />',
+				'cb' => '&nbsp;',
 				'name' => __('Name'),
 				'url' => __('URL'),
 				'categories' => __('Categories'),
@@ -797,7 +717,7 @@
 			break;
 		case 'categories':
 			$_wp_column_headers[$page] = array(
-				'cb' => '<input type="checkbox" />',
+				'cb' => '&nbsp;',
 				'name' => __('Name'),
 				'description' => __('Description'),
 				'slug' => __('Slug'),
@@ -807,7 +727,7 @@
 			break;
 		case 'edit-link-categories':
 			$_wp_column_headers[$page] = array(
-				'cb' => '<input type="checkbox" />',
+				'cb' => '&nbsp;',
 				'name' => __('Name'),
 				'description' => __('Description'),
 				'slug' => __('Slug'),
@@ -817,7 +737,7 @@
 			break;
 		case 'edit-tags':
 			$_wp_column_headers[$page] = array(
-				'cb' => '<input type="checkbox" />',
+				'cb' => '&nbsp;',
 				'name' => __('Name'),
 				'slug' => __('Slug'),
 				'posts' => __('Posts')
@@ -826,7 +746,7 @@
 			break;
 		case 'users':
 			$_wp_column_headers[$page] = array(
-				'cb' => '<input type="checkbox" />',
+				'cb' => '&nbsp;',
 				'username' => __('Username'),
 				'name' => __('Name'),
 				'email' => __('E-mail'),
@@ -914,295 +834,6 @@
 	return (array) get_user_option( 'manage-' . $page . '-columns-hidden', 0, false );
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * Outputs the quick edit and bulk edit table rows for posts and pages
- *
- * @since 2.7
- *
- * @param string $type 'post' or 'page'
- */
-function inline_edit_row( $type ) {
-	global $current_user, $mode;
-
-	$is_page = 'page' == $type;
-	if ( $is_page ) {
-		$screen = 'edit-pages';
-		$post = get_default_page_to_edit();
-	} else {
-		$screen = 'edit';
-		$post = get_default_post_to_edit();
-	}
-
-	$columns = $is_page ? wp_manage_pages_columns() : wp_manage_posts_columns();
-	$hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($screen) ) );
-	$col_count = count($columns) - count($hidden);
-	$m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
-	$can_publish = current_user_can("publish_{$type}s");
-	$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
-
-?>
-
-<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
-	<?php
-	$bulk = 0;
-	while ( $bulk < 2 ) { ?>
-
-	<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$type ";
-		echo $bulk ? "bulk-edit-row bulk-edit-row-$type" : "quick-edit-row quick-edit-row-$type";
-	?>" style="display: none"><td colspan="<?php echo $col_count; ?>">
-
-	<fieldset class="inline-edit-col-left"><div class="inline-edit-col">
-		<h4><?php echo $bulk ? ( $is_page ? __( 'Bulk Edit Pages' ) : __( 'Bulk Edit Posts' ) ) : __( 'Quick Edit' ); ?></h4>
-
-
-<?php if ( $bulk ) : ?>
-		<div id="bulk-title-div">
-			<div id="bulk-titles"></div>
-		</div>
-
-<?php else : // $bulk ?>
-
-		<label>
-			<span class="title"><?php _e( 'Title' ); ?></span>
-			<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
-		</label>
-
-<?php endif; // $bulk ?>
-
-
-<?php if ( !$bulk ) : ?>
-
-		<label>
-			<span class="title"><?php _e( 'Slug' ); ?></span>
-			<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
-		</label>
-
-		<label><span class="title"><?php _e( 'Date' ); ?></span></label>
-		<div class="inline-edit-date">
-			<?php touch_time(1, 1, 4, 1); ?>
-		</div>
-		<br class="clear" />
-
-<?php endif; // $bulk
-
-		ob_start();
-		$authors = get_editable_user_ids( $current_user->id, true, $type ); // TODO: ROLE SYSTEM
-		if ( $authors && count( $authors ) > 1 ) :
-			$users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1);
-			if ( $bulk )
-				$users_opt['show_option_none'] = __('- No Change -');
-?>
-		<label>
-			<span class="title"><?php _e( 'Author' ); ?></span>
-			<?php wp_dropdown_users( $users_opt ); ?>
-		</label>
-
-<?php
-		endif; // authors
-		$authors_dropdown = ob_get_clean();
-?>
-
-<?php if ( !$bulk ) : echo $authors_dropdown; ?>
-
-		<div class="inline-edit-group">
-			<label class="alignleft">
-				<span class="title"><?php _e( 'Password' ); ?></span>
-				<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
-			</label>
-
-			<em style="margin:5px 10px 0 0" class="alignleft"><?php echo _c( '&ndash;OR&ndash;|Between password field and private checkbox on post quick edit interface' ); ?></em>
-
-			<label class="alignleft inline-edit-private">
-				<input type="checkbox" name="keep_private" value="private" />
-				<span class="checkbox-title"><?php echo $is_page ? __('Private page') : __('Private post'); ?></span>
-			</label>
-		</div>
-
-<?php endif; ?>
-
-	</div></fieldset>
-
-<?php if ( !$is_page && !$bulk ) : ?>
-
-	<fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
-		<span class="title inline-edit-categories-label"><?php _e( 'Categories' ); ?>
-			<span class="catshow"><?php _e('[more]'); ?></span>
-			<span class="cathide" style="display:none;"><?php _e('[less]'); ?></span>
-		</span>
-		<ul class="cat-checklist">
-			<?php wp_category_checklist(); ?>
-		</ul>
-	</div></fieldset>
-
-<?php endif; // !$is_page && !$bulk ?>
-
-	<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
-
-<?php
-	if ( $bulk )
-		echo $authors_dropdown;
-?>
-
-<?php if ( $is_page ) : ?>
-
-		<label>
-			<span class="title"><?php _e( 'Parent' ); ?></span>
-<?php
-	$dropdown_args = array('selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title');
-	if ( $bulk )
-		$dropdown_args['show_option_no_change'] =  __('- No Change -');
-	$dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);
-	wp_dropdown_pages($dropdown_args);
-?>
-		</label>
-
-<?php	if ( !$bulk ) : ?>
-
-		<label>
-			<span class="title"><?php _e( 'Order' ); ?></span>
-			<span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span>
-		</label>
-
-<?php	endif; // !$bulk ?>
-
-		<label>
-			<span class="title"><?php _e( 'Template' ); ?></span>
-			<select name="page_template">
-<?php	if ( $bulk ) : ?>
-				<option value="-1"><?php _e('- No Change -'); ?></option>
-<?php	endif; // $bulk ?>
-				<option value="default"><?php _e( 'Default Template' ); ?></option>
-				<?php page_template_dropdown() ?>
-			</select>
-		</label>
-
-<?php elseif ( !$bulk ) : // $is_page ?>
-
-		<label class="inline-edit-tags">
-			<span class="title"><?php _e( 'Tags' ); ?></span>
-			<textarea cols="22" rows="1" name="tags_input" class="tags_input"></textarea>
-		</label>
-
-<?php endif; // $is_page  ?>
-
-<?php if ( $bulk ) : ?>
-
-		<div class="inline-edit-group">
-		<label class="alignleft">
-			<span class="title"><?php _e( 'Comments' ); ?></span>
-			<select name="comment_status">
-				<option value=""><?php _e('- No Change -'); ?></option>
-				<option value="open"><?php _e('Allow'); ?></option>
-				<option value="closed"><?php _e('Do not allow'); ?></option>
-			</select>
-		</label>
-
-		<label class="alignright">
-			<span class="title"><?php _e( 'Pings' ); ?></span>
-			<select name="ping_status">
-				<option value=""><?php _e('- No Change -'); ?></option>
-				<option value="open"><?php _e('Allow'); ?></option>
-				<option value="closed"><?php _e('Do not allow'); ?></option>
-			</select>
-		</label>
-		</div>
-
-<?php else : // $bulk ?>
-
-		<div class="inline-edit-group">
-			<label class="alignleft">
-				<input type="checkbox" name="comment_status" value="open" />
-				<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
-			</label>
-
-			<label class="alignleft">
-				<input type="checkbox" name="ping_status" value="open" />
-				<span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>
-			</label>
-		</div>
-
-<?php endif; // $bulk ?>
-
-
-		<div class="inline-edit-group">
-			<label class="inline-edit-status alignleft">
-				<span class="title"><?php _e( 'Status' ); ?></span>
-				<select name="_status">
-<?php if ( $bulk ) : ?>
-					<option value="-1"><?php _e('- No Change -'); ?></option>
-<?php endif; // $bulk ?>
-				<?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
-					<option value="publish"><?php _e( 'Published' ); ?></option>
-					<option value="future"><?php _e( 'Scheduled' ); ?></option>
-<?php if ( $bulk ) : ?>
-					<option value="private"><?php _e('Private') ?></option>
-<?php endif; // $bulk ?>
-				<?php endif; ?>
-					<option value="pending"><?php _e( 'Pending Review' ); ?></option>
-					<option value="draft"><?php _e( 'Unpublished' ); ?></option>
-				</select>
-			</label>
-
-<?php if ( !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ) : ?>
-
-<?php	if ( $bulk ) : ?>
-
-			<label class="alignright">
-				<span class="title"><?php _e( 'Sticky' ); ?></span>
-				<select name="sticky">
-					<option value="-1"><?php _e( '- No Change -' ); ?></option>
-					<option value="sticky"><?php _e( 'Sticky' ); ?></option>
-					<option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
-				</select>
-			</label>
-
-<?php	else : // $bulk ?>
-
-			<label class="alignleft">
-				<input type="checkbox" name="sticky" value="sticky" />
-				<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
-			</label>
-
-<?php	endif; // $bulk ?>
-
-<?php endif; // !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ?>
-
-		</div>
-
-	</div></fieldset>
-
-<?php
-	foreach ( $columns as $column_name => $column_display_name ) {
-		if ( isset( $core_columns[$column_name] ) )
-			continue;
-		do_action( $bulk ? 'bulk_edit_custom_box' : 'quick_edit_custom_box', $column_name, $type);
-	}
-?>
-	<p class="submit inline-edit-save">
-		<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel alignleft"><?php _e('Cancel'); ?></a>
-		<?php if ( ! $bulk ) {
-			wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
-			$update_text = ( $is_page ) ? __( 'Update Page' ) : __( 'Update Post' );
-			?>
-			<a accesskey="s" href="#inline-edit" title="<?php _e('Update'); ?>" class="button-primary save alignright"><?php echo attribute_escape( $update_text ); ?></a>
-			<img class="waiting" style="display:none;" src="images/loading.svg" alt="" />
-		<?php } else {
-			$update_text = ( $is_page ) ? __( 'Update Pages' ) : __( 'Update Posts' );
-		?>
-			<input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php echo attribute_escape( $update_text ); ?>" />
-		<?php } ?>
-		<input type="hidden" name="post_view" value="<?php echo $m; ?>" />
-		<br class="clear" />
-	</p>
-	</td></tr>
-<?php
-	$bulk++;
-	} ?>
-	</tbody></table></form>
-<?php
-}
 
 // adds hidden fields with the data for use in the inline editor for posts and pages
 /**
@@ -1323,7 +954,7 @@
 
 		case 'cb':
 		?>
-		<th scope="row" class="check-column"><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
+		<td scope="row" class="check-column"><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></td>
 		<?php
 		break;
 
@@ -1383,8 +1014,6 @@
 			$actions = array();
 			if ( current_user_can('edit_post', $post->ID) ) {
 				$actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '" title="' . attribute_escape(__('Edit this post')) . '">' . __('Edit') . '</a>';
-				$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . attribute_escape(__('Edit this post inline')) . '">' . __('Quick&nbsp;Edit') . '</a>';
-				$actions['delete'] = "<a class='submitdelete' title='" . attribute_escape(__('Delete this post')) . "' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
 			}
 			if ( in_array($post->post_status, array('pending', 'draft')) ) {
 				if ( current_user_can('edit_post', $post->ID) )
@@ -1535,7 +1164,7 @@
 
 	case 'cb':
 		?>
-		<th scope="row" class="check-column"><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /></th>
+		<td scope="row" class="check-column"><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /></td>
 		<?php
 		break;
 	case 'date':
@@ -1573,8 +1202,7 @@
 		$actions = array();
 		if ( current_user_can('edit_page', $page->ID) ) {
 			$actions['edit'] = '<a href="' . $edit_link . '" title="' . attribute_escape(__('Edit this page')) . '">' . __('Edit') . '</a>';
-			$actions['inline'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
-			$actions['delete'] = "<a class='submitdelete' title='" . attribute_escape(__('Delete this page')) . "' href='" . wp_nonce_url("page.php?action=delete&amp;post=$page->ID", 'delete-page_' . $page->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+			$actions['delete'] = "<a class='submitdelete' title='" . attribute_escape(__('Delete this page')) . "' href='" . wp_nonce_url("page.php?action=delete&amp;post=$page->ID", 'delete-page_' . $page->ID) . "'>" . __('Delete') . "</a>";
 		}
 		if ( in_array($post->post_status, array('pending', 'draft')) ) {
 			if ( current_user_can('edit_page', $page->ID) )
@@ -1842,7 +1470,7 @@
 
 		switch ($column_name) {
 			case 'cb':
-				$r .= "<th scope='row' class='check-column'><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /></th>";
+				$r .= "<td scope='row' class='check-column'><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /></td>";
 				break;
 			case 'username':
 				$r .= "<td $attributes>$avatar $edit</td>";
@@ -1995,9 +1623,9 @@
 		switch ($column_name) {
 			case 'cb':
 				if ( !$checkbox ) break;
-				echo '<th scope="row" class="check-column">';
+				echo '<td scope="row" class="check-column">';
 				if ( current_user_can('edit_post', $post->ID) ) echo "<input type='checkbox' name='delete_comments[]' value='$comment->comment_ID' />";
-				echo '</th>';
+				echo '</td>';
 				break;
 			case 'comment':
 				echo "<td $attributes>";
@@ -2031,9 +1659,6 @@
 						$actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . _c( 'Spam|verb' ) . '</a>';
 					$actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
 					$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
-					$actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
-					if ( 'spam' != $the_comment_status )
-						$actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
 
 					$actions = apply_filters( 'comment_row_actions', $actions, $comment );
 
@@ -2043,10 +1668,6 @@
 						++$i;
 						( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
 
-						// Reply and quickedit need a hide-if-no-js span when not added with ajax
-						if ( ('reply' == $action || 'quickedit' == $action) && ! $from_ajax )
-							$action .= ' hide-if-no-js';
-
 						echo "<span class='$action'>$sep$link</span>";
 					}
 					echo '</div>';
@@ -2168,7 +1789,7 @@
 	<a href="#comments-form" class="save button-primary alignright" tabindex="104">
 	<span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
 	<span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
-	<img class="waiting" style="display:none;" src="images/loading.svg" alt="" />
+	<span class="waiting" style="display:none;">loading...</span>
 	<span class="error" style="display:none;"></span>
 	<br class="clear" />
 	</p>
@@ -2362,8 +1983,7 @@
 	}
 ?>
 </select>
-<input class="hide-if-js" type="text" id="metakeyinput" name="metakeyinput" tabindex="7" value="" />
-<a href="#postcustomstuff" class="hide-if-no-js" onclick="jQuery('#metakeyinput, #metakeyselect, #enternew, #cancelnew').toggle();return false;">
+<input type="text" id="metakeyinput" name="metakeyinput" tabindex="7" value="" />
 <span id="enternew"><?php _e('Enter new'); ?></span>
 <span id="cancelnew" class="hidden"><?php _e('Cancel'); ?></span></a>
 <?php } else { ?>
@@ -2448,11 +2068,6 @@
 ?>
 
 <input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" />
-
-<p>
-<a href="#edit_timestamp" class="save-timestamp hide-if-no-js button"><?php _e('OK'); ?></a>
-<a href="#edit_timestamp" class="cancel-timestamp hide-if-no-js"><?php _e('Cancel'); ?></a>
-</p>
 <?php
 }
 
@@ -2515,18 +2130,6 @@
  * {@internal Missing Short Description}}
  *
  * @since unknown
- */
-function browse_happy() {
-	$getit = __( 'WordPress recommends a better browser' );
-	echo '
-		<div id="bh"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.svg" alt="Browse Happy" /></a></div>
-';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
  *
  * @param unknown_type $id
  * @return unknown
@@ -2789,7 +2392,6 @@
 					if ( in_array($box['id'], $hidden) )
 						$style = 'style="display:none;"';
 					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . '" ' . $style . '>' . "\n";
-					echo '<div class="handlediv" title="' . __('Click to toggle') . '"><br /></div>';
 					echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
 					echo '<div class="inside">' . "\n";
 					call_user_func($box['callback'], $object, $box);
@@ -3003,142 +2605,6 @@
 }
 
 /**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $found_action
- */
-function find_posts_div($found_action = '') {
-?>
-	<div id="find-posts" class="find-box" style="display:none;">
-		<div id="find-posts-head" class="find-box-head"><?php _e('Find Posts or Pages'); ?></div>
-		<div class="find-box-inside">
-			<div class="find-box-search">
-				<?php if ( $found_action ) { ?>
-					<input type="hidden" name="found_action" value="<?php echo $found_action; ?>" />
-				<?php } ?>
-
-				<input type="hidden" name="affected" id="affected" value="" />
-				<?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
-				<label class="hidden" for="find-posts-input"><?php _e( 'Search' ); ?></label>
-				<input type="text" id="find-posts-input" class="search-input" name="ps" value="" />
-				<input type="button" onclick="findPosts.send();" value="<?php _e( 'Search' ); ?>" class="button" /><br />
-
-				<input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" />
-				<label for="find-posts-posts"><?php _e( 'Posts' ); ?></label>
-				<input type="radio" name="find-posts-what" id="find-posts-pages" value="pages" />
-				<label for="find-posts-pages"><?php _e( 'Pages' ); ?></label>
-			</div>
-			<div id="find-posts-response"></div>
-		</div>
-		<div class="find-box-buttons">
-			<input type="button" class="button" onclick="findPosts.close();" value="<?php _e('Close'); ?>" />
-			<input id="find-posts-submit" type="submit" class="button" value="<?php _e('Select'); ?>" />
-		</div>
-	</div>
-	<script type="text/javascript">
-	/* <![CDATA[ */
-	(function($){
-		findPosts = {
-			open : function(af_name, af_val) {
-				var st = document.documentElement.scrollTop || $(document).scrollTop();
-
-				if ( af_name && af_val )
-					$('#affected').attr('name', af_name).val(af_val);
-
-				$('#find-posts').show().draggable({
-					handle: '#find-posts-head'
-				}).resizable({
-					handles: 'all',
-					minHeight: 150,
-					minWidth: 280
-				}).css({'top':st+'px','left':'50%','marginLeft':'-200px'});
-
-				$('.ui-resizable-handle').css({
-					'backgroundColor': '#e5e5e5'
-				});
-
-				$('.ui-resizable-se').css({
-					'border': '0 none',
-					'width': '15px',
-					'height': '16px',
-					'background': 'transparent url(images/se.svg) no-repeat scroll 0 0'
-				});
-
-				$('#find-posts-input').focus().keyup(function(e){
-					if (e.which == 27) findPosts.close(); // close on Escape
-				});
-
-				return false;
-			},
-
-			close : function() {
-				$('#find-posts-response').html('');
-				$('#find-posts').draggable('destroy').resizable('destroy').hide();
-			},
-
-			send : function() {
-				var post = {};
-
-				post['ps'] = $('#find-posts-input').val();
-				post['action'] = 'find_posts';
-				post['_ajax_nonce'] = $('#_ajax_nonce').val();
-
-				if ( $('#find-posts-pages:checked').val() )
-					post['pages'] = 1;
-				else
-					post['posts'] = 1;
-
-				$.ajax({
-					type : 'POST',
-					url : '<?php echo admin_url('admin-ajax.php'); ?>',
-					data : post,
-					success : function(x) { findPosts.show(x); },
-					error : function(r) { findPosts.error(r); }
-				});
-			},
-
-			show : function(x) {
-
-				if ( typeof(x) == 'string' ) {
-					this.error({'responseText': x});
-					return;
-				}
-
-				var r = wpAjax.parseAjaxResponse(x);
-
-				if ( r.errors )
-					this.error({'responseText': wpAjax.broken});
-
-				r = r.responses[0];
-				$('#find-posts-response').html(r.data);
-			},
-
-			error : function(r) {
-				var er = r.statusText;
-
-				if ( r.responseText )
-					er = r.responseText.replace( /<.[^<>]*?>/g, '' );
-
-				if ( er )
-					$('#find-posts-response').html(er);
-			}
-		};
-
-		$(document).ready(function(){
-			$('#find-posts-submit').click(function(e) {
-				if ( '' == $('#find-posts-response').html() )
-					e.preventDefault();
-			});
-		});
-	})(jQuery);
-	/* ]]> */
-	</script>
-<?php
-}
-
-/**
  * Display the post password.
  *
  * The password is passed through {@link attribute_escape()} to ensure that it
@@ -3152,46 +2618,6 @@
 	if ( isset( $post->post_password ) ) echo attribute_escape( $post->post_password );
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- */
-function favorite_actions() {
-	$actions = array(
-		'post-new.php' => array(__('New Post'), 'edit_posts'),
-		'edit.php?post_status=draft' => array(__('Drafts'), 'edit_posts'),
-		'page-new.php' => array(__('New Page'), 'edit_pages'),
-		'media-new.php' => array(__('Upload'), 'upload_files'),
-		'edit-comments.php' => array(__('Comments'), 'moderate_comments')
-		);
-
-	$actions = apply_filters('favorite_actions', $actions);
-
-	$allowed_actions = array();
-	foreach ( $actions as $action => $data ) {
-		if ( current_user_can($data[1]) )
-			$allowed_actions[$action] = $data[0];
-	}
-
-	if ( empty($allowed_actions) )
-		return;
-
-	$first = array_keys($allowed_actions);
-	$first = $first[0];
-	echo '<div id="favorite-actions">';
-	echo '<div id="favorite-first"><a href="' . $first . '">' . $allowed_actions[$first] . '</a></div><div id="favorite-toggle"><br /></div>';
-	echo '<div id="favorite-inside">';
-
-	array_shift($allowed_actions);
-
-	foreach ( $allowed_actions as $action => $label) {
-		echo "<div class='favorite-action'><a href='$action'>";
-		echo $label;
-		echo "</a></div>\n";
-	}
-	echo "</div></div>\n";
-}
 
 /**
  * Get the post title.
@@ -3225,53 +2651,6 @@
 	echo isset($_GET['s']) ? attribute_escape( stripslashes( $_GET['s'] ) ) : '';
 }
 
-/**
- * Generic Iframe header for use with Thickbox
- *
- * @since 2.7.0
- * @param string $title Title of the Iframe page.
- * @param bool $limit_styles Limit styles to colour-related styles only (unless others are enqueued).
- *
- */
-function iframe_header( $title = '', $limit_styles = false) {
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
-<head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<title><?php bloginfo('name') ?> &rsaquo; <?php echo $title ?> &#8212; <?php _e('WordPress'); ?></title>
-<?php
-wp_enqueue_style( 'global' );
-wp_enqueue_style( 'colors' );
-if ( ! $limit_styles )
-	wp_enqueue_style( 'wp-admin' );
-?>
-<script type="text/javascript">
-//<![CDATA[
-function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}else{ var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}}
-//]]>
-</script>
-<?php
-do_action('admin_print_styles');
-do_action('admin_print_scripts');
-do_action('admin_head');
-?>
-</head>
-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>>
-<?php
-}
-
-/**
- * Generic Iframe footer for use with Thickbox
- *
- * @since 2.7.0
- *
- */
-function iframe_footer() {
-	echo '
-	</body>
-</html>';
-}
-
 function _post_states($post) {
 	$post_states = array();
 	if ( isset($_GET['post_status']) )
@@ -3300,137 +2679,6 @@
 	}
 }
 
-function screen_meta($screen) {
-	global $wp_meta_boxes, $_wp_contextual_help;
-
-	$screen = str_replace('.php', '', $screen);
-	$screen = str_replace('-new', '', $screen);
-	$screen = str_replace('-add', '', $screen);
-	$screen = apply_filters('screen_meta_screen', $screen);
-
-	$column_screens = get_column_headers($screen);
-	$meta_screens = array('index' => 'dashboard');
-
-	if ( isset($meta_screens[$screen]) )
-		$screen = $meta_screens[$screen];
-	$show_screen = false;
-	if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens) )
-		$show_screen = true;
-?>
-<div id="screen-meta">
-<?php
-	if ( $show_screen ) :
-?>
-<div id="screen-options-wrap" class="hidden">
-	<h5><?php _e('Show on screen') ?></h5>
-	<form id="adv-settings" action="" method="get">
-	<div class="metabox-prefs">
-<?php
-	if ( !meta_box_prefs($screen) && isset($column_screens) ) {
-		manage_columns_prefs($screen);
-		wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false );
-	}
-?>
-	<br class="clear" />
-	</div></form>
-</div>
-
-<?php
-	endif;
-
-	global $title;
-
-	if ( !isset($_wp_contextual_help) )
-		$_wp_contextual_help = array();
-
-	if ( !isset($_wp_contextual_help['post']) ) {
-		$help = drag_drop_help();
-		$help .= '<p>' . __('<a href="http://codex.wordpress.org/Writing_Posts" target="_blank">Writing Posts</a>') . '</p>';
-		$_wp_contextual_help['post'] = $help;
-	}
-
-	if ( !isset($_wp_contextual_help['page']) ) {
-		$help = drag_drop_help();
-		$_wp_contextual_help['page'] = $help;
-	}
-
-	if ( !isset($_wp_contextual_help['dashboard']) ) {
-		$help = drag_drop_help();
-		$_wp_contextual_help['dashboard'] = $help;
-	}
-
-	if ( !isset($_wp_contextual_help['link']) ) {
-		$help = drag_drop_help();
-		$_wp_contextual_help['link'] = $help;
-	}
-
-	if ( !isset($_wp_contextual_help['options-general']) )
-		$_wp_contextual_help['options-general'] =  __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>');
-
-	$_wp_contextual_help = apply_filters('contextual_help_list', $_wp_contextual_help, $screen);
-	?>
-	<div id="contextual-help-wrap" class="hidden">
-	<?php
-	$contextual_help = '';
-	if ( isset($_wp_contextual_help[$screen]) ) {
-		if ( !empty($title) )
-			$contextual_help .= '<h5>' . sprintf(__('Get help with "%s"'), $title) . '</h5>';
-		else
-			$contextual_help .= '<h5>' . __('Get help with this page') . '</h5>';
-		$contextual_help .= '<div class="metabox-prefs">' . $_wp_contextual_help[$screen] . "</div>\n";
-
-		$contextual_help .= '<h5>' . __('Other Help') . '</h5>';
-	} else {
-		$contextual_help .= '<h5>' . __('Help') . '</h5>';
-	}
-
-	$contextual_help .= '<div class="metabox-prefs">';
-	$contextual_help .= __('<a href="http://codex.wordpress.org/" target="_blank">Documentation</a>');
-	$contextual_help .= '<br />';
-	$contextual_help .= __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>');
-	$contextual_help .= "</div>\n";
-	echo apply_filters('contextual_help', $contextual_help, $screen);
-	?>
-	</div>
-
-<div id="screen-meta-links">
-<div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
-<a href="#contextual-help" id="contextual-help-link" class="show-settings"><?php _e('Help') ?></a>
-</div>
-<?php if ( $show_screen ) { ?>
-<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
-<a href="#screen-options" id="show-settings-link" class="show-settings"><?php _e('Screen Options') ?></a>
-</div>
-<?php } ?>
-</div>
-</div>
-<?php
-}
-
-/**
- * Add contextual help text for a page
- *
- * @since 2.7.0
- *
- * @param string $screen The handle for the screen to add help to.  This is usually the hook name returned by the add_*_page() functions.
- * @param string $help Arbitrary help text
- */
-function add_contextual_help($screen, $help) {
-	global $_wp_contextual_help;
-
-	if ( !isset($_wp_contextual_help) )
-		$_wp_contextual_help = array();
-
-	$_wp_contextual_help[$screen] = $help;
-}
-
-function drag_drop_help() {
-	return '
-	<p>' .	__('Most of the modules on this screen can be moved. If you hover your mouse over the title bar of a module you`ll notice the 4 arrow cursor appears to let you know it is movable. Click on it, hold down the mouse button and start dragging the module to a new location. As you drag the module, notice the dotted gray box that also moves. This box indicates where the module will be placed when you release the mouse button.') . '</p>
-	<p>' . __('The same modules can be expanded and collapsed by clicking once on their title bar and also completely hidden from the Screen Options tab.') . '</p>
-';
-}
-
 function screen_icon($name = '') {
 	global $parent_file, $hook_suffix;
 
@@ -3441,9 +2689,6 @@
 			$name = str_replace(array('.php', '-new', '-add'), '', $hook_suffix);
 	}
 	unset($hook_suffix);
-?>
-	<div id="icon-<?php echo $name; ?>" class="icon32"><br /></div>
-<?php
 }
 
 ?>
diff -uNr a/mp-wp/wp-admin/includes/widgets.php b/mp-wp/wp-admin/includes/widgets.php
--- a/mp-wp/wp-admin/includes/widgets.php 254517b0604be63728fe88b3965f8da94140ae82cf34e1b22324506e4883f6937b9c07d9c9ce18a5bac7db55f4d72c787dff30d486a7ce08e1d478b1011e4b05
+++ b/mp-wp/wp-admin/includes/widgets.php 0bbc732f61e4f55f812b8cf492c409d36c42b842dd660f947f68251888a7d8b5008c2c3b086f583b95922d829fdd2d0d2c15fcf2310e2a1c0cdc2afba996c5ef
@@ -302,13 +302,6 @@
 			<input type="hidden" class="widget-width" value="<?php echo $control['width']; ?>" />
 
 			<div class="widget-control-actions">
-
-				<?php if ( $control ) : ?>
-
-				<a class="button widget-action widget-control-save hide-if-no-js edit alignleft" href="#save:<?php echo $id_format; ?>"><?php _e('Done'); ?></a>
-
-				<?php endif; ?>
-
 				<a class="button widget-action widget-control-remove alignright" href="<?php echo clean_url( wp_nonce_url( add_query_arg( array( 'remove' => $id_format, 'key' => $key ) ), "remove-widget_$widget[id]" ) ); ?>"><?php _e('Remove'); ?></a>
 				<br class="clear" />
 			</div>
@@ -337,4 +330,4 @@
 	return trim( wp_specialchars( strip_tags( $string ) ) );
 }
 
-?>
\ No newline at end of file
+?>
diff -uNr a/mp-wp/wp-admin/index-extra.php b/mp-wp/wp-admin/index-extra.php
--- a/mp-wp/wp-admin/index-extra.php 251a67164a1d3c2a768817863f03fdcad5670a9963ff30b7fe9d854c1f756750fe0a06d680e23b4be7d49f132a47f920eda3d89827277ff1054cd3785b194d06
+++ b/mp-wp/wp-admin/index-extra.php 154677028eaa9e17a85d9c731eb736f456193f39f3879ed63cbe4a30fd0870fc1b98a49754cef5099d6becb3bbae45eee65dbcec355bb09f6ff2052a5233c57e
@@ -30,11 +30,6 @@
 case 'dashboard_secondary' :
 	wp_dashboard_secondary_output();
 	break;
-
-case 'dashboard_plugins' :
-	wp_dashboard_plugins_output();
-	break;
-
 }
 
-?>
\ No newline at end of file
+?>
diff -uNr a/mp-wp/wp-admin/index.php b/mp-wp/wp-admin/index.php
--- a/mp-wp/wp-admin/index.php f069b7b1994121d8227ac9ba20dcbaf8a9980cf48c606090afb8e580b9e003d219f08cb75d9af86de64791b6e5d324e0175427ef5fd43c7fd26d3b46b7de1a91
+++ b/mp-wp/wp-admin/index.php bf7be02a73c676986e7b4e4b978e6d374b1bdcb5e27cffaab7902d4750c8c95e87f0f1af47165d15c9aa5fd7661a09fd98e6e69a093ed13badcc4c9aeb52d768
@@ -14,12 +14,8 @@
 
 wp_dashboard_setup();
 
-wp_enqueue_script( 'dashboard' );
-wp_enqueue_script( 'plugin-install' );
-wp_enqueue_script( 'media-upload' );
 wp_admin_css( 'dashboard' );
 wp_admin_css( 'plugin-install' );
-add_thickbox();
 
 $title = __('Dashboard');
 $parent_file = 'index.php';
diff -uNr a/mp-wp/wp-admin/install.php b/mp-wp/wp-admin/install.php
--- a/mp-wp/wp-admin/install.php f5749ce9778014c4db045b1fa8ccd66d10fdc98442e94c424b5145111c9bd93bcb83df44535b251a9cec68490897cee768aee9b651334b59cf3a69051ee39572
+++ b/mp-wp/wp-admin/install.php a9a90cb00f87e99ad8b3639c2c102c75440c14d5c2f3405176ff033be77382e6ff8ed54ff15a863cf71f0725edcfe072e002584b43eb263de30a1ea0b87aeb37
@@ -43,7 +43,7 @@
 	<?php wp_admin_css( 'install', true ); ?>
 </head>
 <body>
-<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.svg" /></h1>
+<h1 id="logo">MP-WP</h1>
 
 <?php
 }//end function display_header();
@@ -128,6 +128,5 @@
 		break;
 }
 ?>
-<script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
 </body>
 </html>
diff -uNr a/mp-wp/wp-admin/js/cat.js b/mp-wp/wp-admin/js/cat.js
--- a/mp-wp/wp-admin/js/cat.js 7e1e51e966391bf49519b06fb023a0f141d07ce95cfa1a04382504bea418f3170014276ba975ac7f5aa627b6253a1015ced433bdaf5c091a71bd46109ae71db9
+++ b/mp-wp/wp-admin/js/cat.js false
@@ -1,5 +0,0 @@
-jQuery( function($) {
-	var myConfirm = function() { return '' !== $('#newcat').val(); };
-	$('#jaxcat').prepend('<span id="ajaxcat"><input type="text" name="newcat" id="newcat" size="16" autocomplete="off"/><input type="button" name="Button" class="add:categorychecklist:jaxcat" id="catadd" value="' + catL10n.add + '"/><input type="hidden"/><input type="hidden"/><span id="howto">' + catL10n.how + '</span></span><span id="cat-ajax-response"></span>')
-	$('#categorychecklist').wpList( { alt: '', response: 'cat-ajax-response', confirm: myConfirm } );
-} );
diff -uNr a/mp-wp/wp-admin/js/categories.js b/mp-wp/wp-admin/js/categories.js
--- a/mp-wp/wp-admin/js/categories.js fbe46531eac11f184d4019581b116e1c6f30b3ab43efb1408e58331c3cc775ff0a49126885b5153bfc56bdb331f8c307ef926f7f547673cfba115e6818fe6388
+++ b/mp-wp/wp-admin/js/categories.js false
@@ -1,37 +0,0 @@
-jQuery(function($) {
-	var options = false
-	if ( document.forms['addcat'].category_parent )
-		options = document.forms['addcat'].category_parent.options;
-
-	var addAfter = function( r, settings ) {
-		var name = $("<span>" + $('name', r).text() + "</span>").html();
-		var id = $('cat', r).attr('id');
-		options[options.length] = new Option(name, id);
-
-		addAfter2( r, settings );
-	}
-
-	var addAfter2 = function( x, r ) {
-		var t = $(r.parsed.responses[0].data);
-		if ( t.length == 1 )
-			inlineEditTax.addEvents($(t.id));
-	}
-
-	var delAfter = function( r, settings ) {
-		var id = $('cat', r).attr('id');
-		for ( var o = 0; o < options.length; o++ )
-			if ( id == options[o].value )
-				options[o] = null;
-	}
-
-	if ( options )
-		$('#the-list').wpList( { addAfter: addAfter, delAfter: delAfter } );
-	else
-		$('#the-list').wpList({ addAfter: addAfter2 });
-
-	if ( jQuery('#link-category-search-input').size() ) {
-		columns.init('edit-link-categories');
-	} else {
-		columns.init('categories');
-	}
-});
diff -uNr a/mp-wp/wp-admin/js/comment.js b/mp-wp/wp-admin/js/comment.js
--- a/mp-wp/wp-admin/js/comment.js 8addf23a31f89cb15336bcf457d1f0e494ac355c12139d4987406eef2f443eeef47313cb496218d222d204b5eaddb28fbb390166e5b084c3262cff81d6b926e5
+++ b/mp-wp/wp-admin/js/comment.js false
@@ -1,39 +0,0 @@
-jQuery(document).ready( function($) {
-	jQuery('.hide-if-no-js').show();
-	jQuery('.hide-if-js').hide();
-
-	var stamp = $('#timestamp').html();
-	$('.edit-timestamp').click(function () {
-		if ($('#timestampdiv').is(":hidden")) {
-			$('#timestampdiv').slideDown("normal");
-			$('.edit-timestamp').hide();
-		}
-		return false;
-	});
-
-	$('.cancel-timestamp').click(function() {
-		$('#timestampdiv').slideUp("normal");
-		$('#mm').val($('#hidden_mm').val());
-		$('#jj').val($('#hidden_jj').val());
-		$('#aa').val($('#hidden_aa').val());
-		$('#hh').val($('#hidden_hh').val());
-		$('#mn').val($('#hidden_mn').val());
-		$('#timestamp').html(stamp);
-		$('.edit-timestamp').show();
-		return false;
-	});
-
-	$('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
-		$('#timestampdiv').slideUp("normal");
-		$('.edit-timestamp').show();
-		$('#timestamp').html(
-			commentL10n.submittedOn + ' <b>' +
-			$( '#mm option[value=' + $('#mm').val() + ']' ).text() + ' ' +
-			$('#jj').val() + ', ' +
-			$('#aa').val() + ' @ ' +
-			$('#hh').val() + ':' +
-			$('#mn').val() + '</b> '
-		);
-		return false;
-	});
-});
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/js/common.js b/mp-wp/wp-admin/js/common.js
--- a/mp-wp/wp-admin/js/common.js e47932af030e1a7055a8e3a8d649999819fbfb685a92349e5ee9a83f6225741cb39f92102fc23241c892d679d7f2e8b2af87d28b12fc9474d773a8f81cae007d
+++ b/mp-wp/wp-admin/js/common.js false
@@ -1,366 +0,0 @@
-
-wpCookies = {
-// The following functions are from Cookie.js class in TinyMCE, Moxiecode, used under LGPL.
-
-	each : function(o, cb, s) {
-		var n, l;
-
-		if (!o)
-			return 0;
-
-		s = s || o;
-
-		if (typeof(o.length) != 'undefined') {
-			for (n=0, l = o.length; n<l; n++) {
-				if (cb.call(s, o[n], n, o) === false)
-					return 0;
-			}
-		} else {
-			for (n in o) {
-				if (o.hasOwnProperty(n)) {
-					if (cb.call(s, o[n], n, o) === false)
-						return 0;
-				}
-			}
-		}
-		return 1;
-	},
-
-	getHash : function(n) {
-		var v = this.get(n), h;
-
-		if (v) {
-			this.each(v.split('&'), function(v) {
-				v = v.split('=');
-				h = h || {};
-				h[v[0]] = v[1];
-			});
-		}
-		return h;
-	},
-
-	setHash : function(n, v, e, p, d, s) {
-		var o = '';
-
-		this.each(v, function(v, k) {
-			o += (!o ? '' : '&') + k + '=' + v;
-		});
-
-		this.set(n, o, e, p, d, s);
-	},
-
-	get : function(n) {
-		var c = document.cookie, e, p = n + "=", b;
-
-		if (!c)
-			return;
-
-		b = c.indexOf("; " + p);
-
-		if (b == -1) {
-			b = c.indexOf(p);
-
-			if (b != 0)
-				return null;
-		} else
-			b += 2;
-
-		e = c.indexOf(";", b);
-
-		if (e == -1)
-			e = c.length;
-
-		return decodeURIComponent(c.substring(b + p.length, e));
-	},
-
-	set : function(n, v, e, p, d, s) {
-		document.cookie = n + "=" + encodeURIComponent(v) +
-			((e) ? "; expires=" + e.toGMTString() : "") +
-			((p) ? "; path=" + p : "") +
-			((d) ? "; domain=" + d : "") +
-			((s) ? "; secure" : "");
-	},
-
-	remove : function(n, p) {
-		var d = new Date();
-
-		d.setTime(d.getTime() - 1000);
-
-		this.set(n, '', d, p, d);
-	}
-};
-
-// Returns the value as string. Second arg or empty string is returned when value is not set.
-function getUserSetting( name, def ) {
-	var o = getAllUserSettings();
-
-	if ( o.hasOwnProperty(name) )
-		return o[name];
-
-	if ( typeof def != 'undefined' )
-		return def;
-
-	return '';
-}
-
-// Both name and value must be only ASCII letters, numbers or underscore
-// and the shorter, the better (cookies can store maximum 4KB). Not suitable to store text.
-function setUserSetting( name, value, del ) {
-	var c = 'wp-settings-'+userSettings.uid, o = wpCookies.getHash(c) || {}, d = new Date();
-	var n = name.toString().replace(/[^A-Za-z0-9_]/, ''), v = value.toString().replace(/[^A-Za-z0-9_]/, '');
-
-	if ( del ) delete o[n];
-	else o[n] = v;
-
-	d.setTime( d.getTime() + 31536000000 );
-	p = userSettings.url;
-
-	wpCookies.setHash(c, o, d, p );
-	wpCookies.set('wp-settings-time-'+userSettings.uid, userSettings.time, d, p );
-}
-
-function deleteUserSetting( name ) {
-	setUserSetting( name, '', 1 );
-}
-
-// Returns all settings as js object.
-function getAllUserSettings() {
-	return wpCookies.getHash('wp-settings-'+userSettings.uid) || {};
-}
-
-
-jQuery(document).ready( function($) {
-	// pulse
-	$('.fade').animate( { backgroundColor: '#ffffe0' }, 300).animate( { backgroundColor: '#fffbcc' }, 300).animate( { backgroundColor: '#ffffe0' }, 300).animate( { backgroundColor: '#fffbcc' }, 300);
-
-	// show things that should be visible, hide what should be hidden
-	$('.hide-if-no-js').removeClass('hide-if-no-js');
-	$('.hide-if-js').hide();
-
-	// Basic form validation
-	if ( ( 'undefined' != typeof wpAjax ) && $.isFunction( wpAjax.validateForm ) ) {
-		$('form.validate').submit( function() { return wpAjax.validateForm( $(this) ); } );
-	}
-
-	// Move .updated and .error alert boxes
-	$('div.wrap h2 ~ div.updated, div.wrap h2 ~ div.error').addClass('below-h2');
-	$('div.updated, div.error').not('.below-h2').insertAfter('div.wrap h2:first');
-
-	// screen settings tab
-	$('#show-settings-link').click(function () {
-		if ( ! $('#screen-options-wrap').hasClass('screen-options-open') ) {
-			$('#contextual-help-link-wrap').addClass('invisible');
-		}
-		$('#screen-options-wrap').slideToggle('fast', function(){
-			if ( $(this).hasClass('screen-options-open') ) {
-				$('#show-settings-link').css({'backgroundImage':'url("images/screen-options-right.svg")'});
-				$('#contextual-help-link-wrap').removeClass('invisible');
-				$(this).removeClass('screen-options-open');
-
-			} else {
-				$('#show-settings-link').css({'backgroundImage':'url("images/screen-options-right-up.svg")'});
-				$(this).addClass('screen-options-open');
-			}
-		});
-		return false;
-	});
-
-	// help tab
-	$('#contextual-help-link').click(function () {
-		if ( ! $('#contextual-help-wrap').hasClass('contextual-help-open') ) {
-			$('#screen-options-link-wrap').addClass('invisible');
-		}
-		$('#contextual-help-wrap').slideToggle('fast', function(){
-			if ( $(this).hasClass('contextual-help-open') ) {
-				$('#contextual-help-link').css({'backgroundImage':'url("images/screen-options-right.svg")'});
-				$('#screen-options-link-wrap').removeClass('invisible');
-				$(this).removeClass('contextual-help-open');
-			} else {
-				$('#contextual-help-link').css({'backgroundImage':'url("images/screen-options-right-up.svg")'});
-				$(this).addClass('contextual-help-open');
-			}
-		});
-		return false;
-	});
-
-	// check all checkboxes
-	var lastClicked = false;
-	$( 'table:visible tbody .check-column :checkbox' ).click( function(e) {
-		if ( 'undefined' == e.shiftKey ) { return true; }
-		if ( e.shiftKey ) {
-			if ( !lastClicked ) { return true; }
-			var checks = $( lastClicked ).parents( 'form:first' ).find( ':checkbox' );
-			var first = checks.index( lastClicked );
-			var last = checks.index( this );
-			var checked = $(this).attr('checked');
-			if ( 0 < first && 0 < last && first != last ) {
-				checks.slice( first, last ).attr( 'checked', function(){
-					if ( $(this).parents('tr').is(':visible') )
-						return checked ? 'checked' : '';
-
-					return '';
-				});
-			}
-		}
-		lastClicked = this;
-		return true;
-	} );
-	$( 'thead :checkbox, tfoot :checkbox' ).click( function(e) {
-		var c = $(this).attr('checked');
-		if ( 'undefined' == typeof  toggleWithKeyboard)
-			toggleWithKeyboard = false;
-		var toggle = e.shiftKey || toggleWithKeyboard;
-		$(this).parents( 'form:first' ).find( 'table tbody:visible').find( '.check-column :checkbox' ).attr( 'checked', function() {
-			if ( $(this).parents('tr').is(':hidden') )
-				return '';
-			if ( toggle )
-				return $(this).attr( 'checked' ) ? '' : 'checked';
-			else if (c)
-				return 'checked';
-			return '';
-		});
-		$(this).parents( 'form:first' ).find( 'table thead:visible, table tfoot:visible').find( '.check-column :checkbox' ).attr( 'checked', function() {
-			if ( toggle )
-				return '';
-			else if (c)
-				return 'checked';
-			return '';
-		});
-	});
-});
-
-var showNotice, adminMenu, columns;
-
-// stub for doing better warnings
-showNotice = {
-	warn : function(text) {
-		if ( confirm(text) )
-			return true;
-
-		return false;
-	},
-
-	note : function(text) {
-		alert(text);
-	}
-};
-
-(function($){
-// sidebar admin menu
-adminMenu = {
-
-	init : function() {
-		$('#adminmenu div.wp-menu-toggle').each( function() {
-			if ( $(this).siblings('.wp-submenu').length )
-				$(this).click(function(){ adminMenu.toggle( $(this).siblings('.wp-submenu') ); });
-			else
-				$(this).hide();
-		});
-		$('#adminmenu li.menu-top .wp-menu-image').click( function() { window.location = $(this).siblings('a.menu-top')[0].href; } );
-		this.favorites();
-
-		$('.wp-menu-separator').click(function(){
-			if ( $('#wpcontent').hasClass('folded') ) {
-				adminMenu.fold(1);
-				setUserSetting( 'mfold', 'o' );
-			} else {
-				adminMenu.fold();
-				setUserSetting( 'mfold', 'f' );
-			}
-		});
-
-		if ( 'f' != getUserSetting( 'mfold' ) ) {
-			this.restoreMenuState();
-		} else {
-			this.fold();
-		}
-	},
-
-	restoreMenuState : function() {
-		$('#adminmenu li.wp-has-submenu').each(function(i, e) {
-			var v = getUserSetting( 'm'+i );
-			if ( $(e).hasClass('wp-has-current-submenu') ) return true; // leave the current parent open
-
-			if ( 'o' == v ) $(e).addClass('wp-menu-open');
-			else if ( 'c' == v ) $(e).removeClass('wp-menu-open');
-		});
-	},
-
-	toggle : function(el) {
-
-		el['slideToggle'](150, function(){el.css('display','');}).parent().toggleClass( 'wp-menu-open' );
-
-		$('#adminmenu li.wp-has-submenu').each(function(i, e) {
-			var v = $(e).hasClass('wp-menu-open') ? 'o' : 'c';
-			setUserSetting( 'm'+i, v );
-		});
-
-		return false;
-	},
-
-	fold : function(off) {
-		if (off) {
-			$('#wpcontent').removeClass('folded');
-			$('#adminmenu li.wp-has-submenu').unbind();
-		} else {
-			$('#wpcontent').addClass('folded');
-			$('#adminmenu li.wp-has-submenu').hoverIntent({
-				over: function(e){
-					var m = $(this).find('.wp-submenu'), t = e.clientY, H = $(window).height(), h = m.height(), o;
-
-					if ( (t+h+10) > H ) {
-						o = (t+h+10) - H;
-						m.css({'marginTop':'-'+o+'px'});
-					} else if ( m.css('marginTop') ) {
-						m.css({'marginTop':''})
-					}
-					m.addClass('sub-open');
-				},
-				out: function(){ $(this).find('.wp-submenu').removeClass('sub-open').css({'marginTop':''}); },
-				timeout: 220,
-				sensitivity: 8,
-				interval: 100
-			});
-
-		}
-	},
-
-	favorites : function() {
-		$('#favorite-inside').width($('#favorite-actions').width()-4);
-		$('#favorite-toggle, #favorite-inside').bind( 'mouseenter', function(){$('#favorite-inside').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideDown') ) { $('#favorite-inside').slideDown(100); $('#favorite-first').addClass('slide-down'); }}, 200) } );
-
-		$('#favorite-toggle, #favorite-inside').bind( 'mouseleave', function(){$('#favorite-inside').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideUp') ) { $('#favorite-inside').slideUp(100, function(){ $('#favorite-first').removeClass('slide-down'); } ); }}, 300) } );
-	}
-};
-
-$(document).ready(function(){adminMenu.init();});
-})(jQuery);
-
-(function($){
-// show/hide/save table columns
-columns = {
-	init : function(page) {
-		$('.hide-column-tog').click( function() {
-			var column = $(this).val();
-			var show = $(this).attr('checked');
-			if ( show ) {
-				$('.column-' + column).show();
-			} else {
-				$('.column-' + column).hide();
-			}
-			columns.save_manage_columns_state(page);
-		} );
-	},
-
-	save_manage_columns_state : function(page) {
-		var hidden = $('.manage-column').filter(':hidden').map(function() { return this.id; }).get().join(',');
-		$.post('admin-ajax.php', {
-			action: 'hidden-columns',
-			hidden: hidden,
-			hiddencolumnsnonce: $('#hiddencolumnsnonce').val(),
-			page: page
-		});
-	}
-}
-
-})(jQuery);
diff -uNr a/mp-wp/wp-admin/js/custom-fields.js b/mp-wp/wp-admin/js/custom-fields.js
--- a/mp-wp/wp-admin/js/custom-fields.js 5f941c6e1aca63ea206e2b919cb9840b7016b42bd446f5de435074128b3efeb596a1a54aa3924ed0a53251d8faf077d363953308f134e8597bec2bdead205357
+++ b/mp-wp/wp-admin/js/custom-fields.js false
@@ -1,33 +0,0 @@
-jQuery( function($) {
-	var before = function() {
-		var nonce = $('#newmeta [@name=_ajax_nonce]').val();
-		var postId = $('#post_ID').val();
-		if ( !nonce || !postId ) { return false; }
-		return [nonce,postId];
-	}
-
-	var addBefore = function( s ) {
-		var b = before();
-		if ( !b ) { return false; }
-		s.data = s.data.replace(/_ajax_nonce=[a-f0-9]+/, '_ajax_nonce=' + b[0]) + '&post_id=' + b[1];
-		return s;
-	};
-
-	var addAfter = function( r, s ) {
-		var postId = $('postid', r).text();
-		if ( !postId ) { return; }
-		$('#post_ID').attr( 'name', 'post_ID' ).val( postId );
-		var h = $('#hiddenaction');
-		if ( 'post' == h.val() ) { h.val( 'postajaxpost' ); }
-	};
-
-	var delBefore = function( s ) {
-		var b = before(); if ( !b ) return false;
-		s.data._ajax_nonce = b[0]; s.data.post_id = b[1];
-		return s;
-	}
-
-	$('#the-list')
-		.wpList( { addBefore: addBefore, addAfter: addAfter, delBefore: delBefore } )
-		.find('.updatemeta, .deletemeta').attr( 'type', 'button' );
-} );
diff -uNr a/mp-wp/wp-admin/js/dashboard.js b/mp-wp/wp-admin/js/dashboard.js
--- a/mp-wp/wp-admin/js/dashboard.js dbb690a6db5fc22577d0c7ceadf77dd61b12921e5d3fc522ecad69cc7550449dcfea61dbb80f0ab41af3b0bb56f3e06c833fb2d3dfa9632c4cac9f0653167212
+++ b/mp-wp/wp-admin/js/dashboard.js false
@@ -1,52 +0,0 @@
-
-jQuery( function($) {
-
-// close postboxes that should be closed
-jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
-
-// These widgets are sometimes populated via ajax
-var ajaxWidgets = [
-	'dashboard_incoming_links',
-	'dashboard_primary',
-	'dashboard_secondary',
-	'dashboard_plugins'
-];
-
-var ajaxPopulateWidgets = function() {
-	$.each( ajaxWidgets, function() {
-		var e = jQuery('#' + this + ':visible div.inside').find('.widget-loading');
-		if ( e.size() ) { e.parent().load('index-extra.php?jax=' + this); }
-	} );
-};
-ajaxPopulateWidgets();
-
-postboxes.add_postbox_toggles('dashboard', { onShow: ajaxPopulateWidgets } );
-
-/* QuickPress */
-var quickPressLoad = function() {
-	var act = $('#quickpost-action');
-	var t = $('#quick-press').submit( function() {
-		$('#dashboard_quick_press h3').append( '<img src="images/loading.svg" style="margin: 0 6px 0 0; vertical-align: middle" />' );
-
-		if ( 'post' == act.val() ) {
-			act.val( 'post-quickpress-publish' );
-		}
-
-		$('#dashboard_quick_press div.inside').load( t.attr( 'action' ), t.serializeArray(), function() {
-			$('#dashboard_quick_press h3 img').remove();
-			$('#dashboard_quick_press ul').find('li').each( function() {
-				$('#dashboard_recent_drafts ul').prepend( this );
-			} ).end().remove();
-			$(this).find('.hide-if-no-js').removeClass('hide-if-no-js');
-			tb_init('a.thickbox');
-			quickPressLoad();
-		} );
-		return false;
-	} );
-
-	$('#publish').click( function() { act.val( 'post-quickpress-publish' ); } );
-
-};
-quickPressLoad();
-
-} );
diff -uNr a/mp-wp/wp-admin/js/edit-comments.js b/mp-wp/wp-admin/js/edit-comments.js
--- a/mp-wp/wp-admin/js/edit-comments.js 6da73765cfed73371ee21f3859092ca22f84db3018b80d23169de1eaa8a507863d4b48228546f2c4e9add0bdebc9225d283989214ea6bb1056b32957e5f82bc4
+++ b/mp-wp/wp-admin/js/edit-comments.js false
@@ -1,320 +0,0 @@
-var theList; var theExtraList;
-(function($) {
-
-setCommentsList = function() {
-	var dimAfter = function( r, settings ) {
-		var c = $('#' + settings.element);
-
-		if ( c.is('.unapproved') )
-			c.find('div.comment_status').html('0')
-		else
-			c.find('div.comment_status').html('1')
-
-		$('span.pending-count').each( function() {
-			var a = $(this);
-			var n = a.html().replace(/[ ,.]+/g, '');
-			n = parseInt(n,10);
-			if ( isNaN(n) ) return;
-			n = n + ( $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1 );
-			if ( n < 0 ) { n = 0; }
-			$('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
-			n = n.toString();
-			if ( n.length > 3 )
-				n = n.substr(0, n.length-3)+' '+n.substr(-3);
-			a.html(n);
-		});
-	};
-
-	var delAfter = function( r, settings ) {
-		$('span.pending-count').each( function() {
-			var a = $(this);
-			var n = a.html().replace(/[ ,.]+/g, '');
-			n = parseInt(n,10);
-			if ( isNaN(n) ) return;
-			if ( $('#' + settings.element).is('.unapproved') ) { // we deleted a formerly unapproved comment
-				n = n - 1;
-			} else if ( $(settings.target).parents( 'span.unapprove' ).size() ) { // we "deleted" an approved comment from the approved list by clicking "Unapprove"
-				n = n + 1;
-			}
-			if ( n < 0 ) { n = 0; }
-			$('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
-			n = n.toString();
-			if ( n.length > 3 )
-				n = n.substr(0, n.length-3)+' '+n.substr(-3);
-			a.html(n);
-		});
-
-		$('span.spam-count' ).each( function() {
-			var a = $(this);
-			var n = a.html().replace(/[ ,.]+/g, '');
-			n = parseInt(n,10);
-			if ( isNaN(n) ) return;
-			if ( $(settings.target).parents( 'span.spam' ).size() ) { // we marked a comment as spam
-				n = n + 1;
-			} else if ( $('#' + settings.element).is('.spam') ) { // we approved or deleted a comment marked as spam
-				n = n - 1;
-			}
-			if ( n < 0 ) { n = 0; }
-			n = n.toString();
-			if ( n.length > 3 )
-				n = n.substr(0, n.length-3)+' '+n.substr(-3);
-			a.html(n);
-		});
-
-		if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 ) {
-			return;
-		}
-
-		theList.get(0).wpList.add( theExtraList.children(':eq(0)').remove().clone() );
-		$('#get-extra-comments').submit();
-	};
-
-	theExtraList = $('#the-extra-comment-list').wpList( { alt: '', delColor: 'none', addColor: 'none' } );
-	theList = $('#the-comment-list').wpList( { alt: '', dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } );
-
-};
-
-$(document).ready(function(){
-	setCommentsList();
-});
-
-commentReply = {
-
-	init : function() {
-		var row = $('#replyrow');
-
-		$('a.cancel', row).click(function() { return commentReply.revert(); });
-		$('a.save', row).click(function() { return commentReply.send(this); });
-
-		// add events
-		$('#the-comment-list .column-comment > p').dblclick(function(){
-				commentReply.toggle($(this).parent());
-			});
-
-		$('#doaction, #doaction2, #post-query-submit').click(function(e){
-			if ( $('#the-comment-list #replyrow').length > 0 )
-				t.close();
-		});
-
-	},
-
-	addEvents : function(r) {
-		r.each(function() {
-			$(this).find('.column-comment > p').dblclick(function(){
-				commentReply.toggle($(this).parent());
-			});
-		});
-	},
-
-	toggle : function(el) {
-		if ( $(el).css('display') != 'none' )
-			$(el).find('a.vim-q').click();
-	},
-
-	revert : function() {
-
-		if ( $('#the-comment-list #replyrow').length < 1 )
-			return false;
-
-		$('#replyrow').fadeOut('fast', function(){
-			commentReply.close();
-		});
-
-		return false;
-	},
-
-	close : function() {
-		$(this.o).fadeIn('fast').css('backgroundColor', '');
-		$('#com-reply').append( $('#replyrow') );
-		$('#replycontent').val('');
-		$('#edithead input').val('');
-		$('#replysubmit .error').html('').hide();
-		$('#replysubmit .waiting').hide();
-		if ( $.browser.msie )
-			$('#replycontainer, #replycontent').css('height', '120px');
-		else
-			$('#replycontainer').resizable('destroy').css('height', '120px');
-	},
-
-	open : function(id, p, a) {
-		var t = this;
-		t.close();
-		t.o = '#comment-'+id;
-
-		$('#replyrow td').attr('colspan', $('.widefat thead th:visible').length);
-		var editRow = $('#replyrow'), rowData = $('#inline-'+id);
-		var act = t.act = (a == 'edit') ? 'edit-comment' : 'replyto-comment';
-
-		$('#action', editRow).val(act);
-		$('#comment_post_ID', editRow).val(p);
-		$('#comment_ID', editRow).val(id);
-
-		if ( a == 'edit' ) {
-			$('#author', editRow).val( $('div.author', rowData).text() );
-			$('#author-email', editRow).val( $('div.author-email', rowData).text() );
-			$('#author-url', editRow).val( $('div.author-url', rowData).text() );
-			$('#status', editRow).val( $('div.comment_status', rowData).text() );
-			$('#replycontent', editRow).val( $('textarea.comment', rowData).val() );
-			$('#edithead, #savebtn', editRow).show();
-			$('#replyhead, #replybtn', editRow).hide();
-
-			var h = $(t.o).height();
-			if ( h > 220 )
-				if ( $.browser.msie )
-					$('#replycontainer, #replycontent', editRow).height(h-105);
-				else
-					$('#replycontainer', editRow).height(h-105);
-
-			$(t.o).after(editRow.hide()).fadeOut('fast', function(){
-				$('#replyrow').fadeIn('fast');
-			});
-		} else {
-			$('#edithead, #savebtn', editRow).hide();
-			$('#replyhead, #replybtn', editRow).show();
-			$(t.o).after(editRow);
-			$('#replyrow').hide().fadeIn('fast');
-		}
-
-		if ( ! $.browser.msie )
-			$('#replycontainer').resizable({
-				handles : 's',
-				axis : 'y',
-				minHeight : 80,
-				stop : function() {
-					$('#replycontainer').width('auto');
-				}
-			});
-
-		setTimeout(function() {
-			var rtop = $('#replyrow').offset().top;
-			var rbottom = rtop + $('#replyrow').height();
-			var scrollTop = window.pageYOffset || document.documentElement.scrollTop;
-			var vp = document.documentElement.clientHeight || self.innerHeight || 0;
-			var scrollBottom = scrollTop + vp;
-
-			if ( scrollBottom - 20 < rbottom )
-				window.scroll(0, rbottom - vp + 35);
-			else if ( rtop - 20 < scrollTop )
-				window.scroll(0, rtop - 35);
-
-			$('#replycontent').focus().keyup(function(e){
-				if (e.which == 27) commentReply.revert(); // close on Escape
-			});
-		}, 600);
-
-		return false;
-	},
-
-	send : function() {
-		var post = {};
-
-		$('#replysubmit .waiting').show();
-
-		$('#replyrow input').each(function() {
-			post[ $(this).attr('name') ] = $(this).val();
-		});
-
-		post.content = $('#replycontent').val();
-		post.id = post.comment_post_ID;
-
-		$.ajax({
-			type : 'POST',
-			url : wpListL10n.url,
-			data : post,
-			success : function(x) { commentReply.show(x); },
-			error : function(r) { commentReply.error(r); }
-		});
-
-		return false;
-	},
-
-	show : function(xml) {
-
-		if ( typeof(xml) == 'string' ) {
-			this.error({'responseText': xml});
-			return false;
-		}
-
-		var r = wpAjax.parseAjaxResponse(xml);
-		if ( r.errors ) {
-			this.error({'responseText': wpAjax.broken});
-			return false;
-		}
-
-		if ( 'edit-comment' == this.act )
-			$(this.o).remove();
-
-		r = r.responses[0];
-		var c = r.data;
-
-		$(c).hide()
-		$('#replyrow').after(c);
-		this.o = id = '#comment-'+r.id;
-		$(id+' .hide-if-no-js').removeClass('hide-if-no-js');
-		this.revert();
-		this.addEvents($(id));
-		var bg = $(id).hasClass('unapproved') ? '#ffffe0' : '#fff';
-
-		$(id)
-			.animate( { 'backgroundColor':'#CCEEBB' }, 600 )
-			.animate( { 'backgroundColor': bg }, 600 );
-
-		$.fn.wpList.process($(id))
-	},
-
-	error : function(r) {
-		var er = r.statusText;
-
-		$('#replysubmit .waiting').hide();
-
-		if ( r.responseText )
-			er = r.responseText.replace( /<.[^<>]*?>/g, '' );
-
-		if ( er )
-			$('#replysubmit .error').html(er).show();
-
-	}
-};
-toggleWithKeyboard = false;
-$(document).ready(function(){
-	columns.init('edit-comments');
-	commentReply.init();
-
-	if ( typeof QTags != 'undefined' )
-		ed_reply = new QTags('ed_reply', 'replycontent', 'replycontainer', 'more');
-
-	if ( typeof $.table_hotkeys != 'undefined' ) {
-		var make_hotkeys_redirect = function(which) {
-			return function() {
-				var first_last = 'next' == which? 'first' : 'last';
-				var l=$('.'+which+'.page-numbers');
-				if (l.length)
-					window.location = l[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g, '')+'&hotkeys_highlight_'+first_last+'=1';
-			}
-		};
-		var edit_comment = function(event, current_row) {
-			window.location = $('span.edit a', current_row).attr('href');
-		};
-		var toggle_all = function() {
-			toggleWithKeyboard = true;
-			var master_checkbox = $('form#comments-form .check-column :checkbox:first');
-			master_checkbox.click().attr('checked', '');
-			toggleWithKeyboard = false;
-		}
-		var make_bulk = function(value) {
-			return function(event, _) {
-				$('option[value='+value+']').attr('selected', 'selected');
-				$('form#comments-form')[0].submit();
-			}
-		};
-		$.table_hotkeys($('table.widefat'),['a', 'u', 's', 'd', 'r', 'q', ['e', edit_comment],
-				['shift+a', make_bulk('approve')], ['shift+s', make_bulk('markspam')],
-				['shift+d', make_bulk('delete')], ['shift+x', toggle_all],
-				['shift+u', make_bulk('unapprove')]],
-				{highlight_first: adminCommentsL10n.hotkeys_highlight_first, highlight_last: adminCommentsL10n.hotkeys_highlight_last,
-				prev_page_link_cb: make_hotkeys_redirect('prev'), next_page_link_cb: make_hotkeys_redirect('next')}
-		);
-	}
-});
-
-})(jQuery);
diff -uNr a/mp-wp/wp-admin/js/farbtastic.js b/mp-wp/wp-admin/js/farbtastic.js
--- a/mp-wp/wp-admin/js/farbtastic.js 7635f283443ee28af79c1528487294c23bc99fcdffd16d714e8c4175ce924cd6ea13fa5fa74d966393c57571ea9e9acba1eb87f27bbc5312e7999ea6c411f9bb
+++ b/mp-wp/wp-admin/js/farbtastic.js false
@@ -1,333 +0,0 @@
-// $Id: farbtastic.js,v 1.2 2007/01/08 22:53:01 unconed Exp $
-// Farbtastic 1.2
-
-var farbtastic_click = false;
-
-jQuery.fn.farbtastic = function (callback) {
-  jQuery.farbtastic(this, callback);
-  return this;
-};
-
-jQuery.farbtastic = function (container, callback) {
-  var container = jQuery(container).get(0);
-  return container.farbtastic || (container.farbtastic = new jQuery._farbtastic(container, callback));
-}
-
-jQuery._farbtastic = function (container, callback) {
-  // Store farbtastic object
-  var fb = this;
-
-  // Insert markup
-  jQuery(container).html('<div class="farbtastic"><div class="color"></div><div class="wheel"></div><div class="overlay"></div><div class="h-marker marker"></div><div class="sl-marker marker"></div></div>');
-  var e = jQuery('.farbtastic', container);
-  fb.wheel = jQuery('.wheel', container).get(0);
-  // Dimensions
-  fb.radius = 84;
-  fb.square = 100;
-  fb.width = 194;
-
-  // Fix background PNGs in IE6
-  if (navigator.appVersion.match(/MSIE [0-6]\./)) {
-    jQuery('*', e).each(function () {
-      if (this.currentStyle.backgroundImage != 'none') {
-        var image = this.currentStyle.backgroundImage;
-        image = this.currentStyle.backgroundImage.substring(5, image.length - 2);
-        jQuery(this).css({
-          'backgroundImage': 'none',
-          'filter': "progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop, src='" + image + "')"
-        });
-      }
-    });
-  }
-
-  /**
-   * Link to the given element(s) or callback.
-   */
-  fb.linkTo = function (callback) {
-    // Unbind previous nodes
-    if (typeof fb.callback == 'object') {
-      jQuery(fb.callback).unbind('keyup', fb.updateValue);
-    }
-
-    // Reset color
-    fb.color = null;
-
-    // Bind callback or elements
-    if (typeof callback == 'function') {
-      fb.callback = callback;
-    }
-    else if (typeof callback == 'object' || typeof callback == 'string') {
-      fb.callback = jQuery(callback);
-      fb.callback.bind('keyup', fb.updateValue);
-      if (fb.callback.get(0).value) {
-        fb.setColor(fb.callback.get(0).value);
-      }
-    }
-    return this;
-  }
-  fb.updateValue = function (event) {
-    if (this.value && this.value != fb.color) {
-      fb.setColor(this.value);
-    }
-  }
-
-  /**
-   * Change color with HTML syntax #123456
-   */
-  fb.setColor = function (color) {
-    var unpack = fb.unpack(color);
-    if (fb.color != color && unpack) {
-      fb.color = color;
-      fb.rgb = unpack;
-      fb.hsl = fb.RGBToHSL(fb.rgb);
-      fb.updateDisplay();
-    }
-    return this;
-  }
-
-  /**
-   * Change color with HSL triplet [0..1, 0..1, 0..1]
-   */
-  fb.setHSL = function (hsl) {
-    fb.hsl = hsl;
-    fb.rgb = fb.HSLToRGB(hsl);
-    fb.color = fb.pack(fb.rgb);
-    fb.updateDisplay();
-    return this;
-  }
-
-  /////////////////////////////////////////////////////
-
-  /**
-   * Retrieve the coordinates of the given event relative to the center
-   * of the widget.
-   */
-  fb.widgetCoords = function (event) {
-    var x, y;
-    var el = event.target || event.srcElement;
-    var reference = fb.wheel;
-
-    if (typeof event.offsetX != 'undefined') {
-      // Use offset coordinates and find common offsetParent
-      var pos = { x: event.offsetX, y: event.offsetY };
-
-      // Send the coordinates upwards through the offsetParent chain.
-      var e = el;
-      while (e) {
-        e.mouseX = pos.x;
-        e.mouseY = pos.y;
-        pos.x += e.offsetLeft;
-        pos.y += e.offsetTop;
-        e = e.offsetParent;
-      }
-
-      // Look for the coordinates starting from the wheel widget.
-      var e = reference;
-      var offset = { x: 0, y: 0 }
-      while (e) {
-        if (typeof e.mouseX != 'undefined') {
-          x = e.mouseX - offset.x;
-          y = e.mouseY - offset.y;
-          break;
-        }
-        offset.x += e.offsetLeft;
-        offset.y += e.offsetTop;
-        e = e.offsetParent;
-      }
-
-      // Reset stored coordinates
-      e = el;
-      while (e) {
-        e.mouseX = undefined;
-        e.mouseY = undefined;
-        e = e.offsetParent;
-      }
-    }
-    else {
-      // Use absolute coordinates
-      var pos = fb.absolutePosition(reference);
-      x = (event.pageX || 0*(event.clientX + jQuery('html').get(0).scrollLeft)) - pos.x;
-      y = (event.pageY || 0*(event.clientY + jQuery('html').get(0).scrollTop)) - pos.y;
-    }
-    // Subtract distance to middle
-    return { x: x - fb.width / 2, y: y - fb.width / 2 };
-  }
-
-  /**
-   * Mousedown handler
-   */
-  fb.mousedown = function (event) {
-	farbtastic_click = true;
-    // Capture mouse
-    if (!document.dragging) {
-      jQuery(document).bind('mousemove', fb.mousemove).bind('mouseup', fb.mouseup);
-      document.dragging = true;
-    }
-
-    // Check which area is being dragged
-    var pos = fb.widgetCoords(event);
-    fb.circleDrag = Math.max(Math.abs(pos.x), Math.abs(pos.y)) * 2 > fb.square;
-
-    // Process
-    fb.mousemove(event);
-    return false;
-  }
-
-  /**
-   * Mousemove handler
-   */
-  fb.mousemove = function (event) {
-    // Get coordinates relative to color picker center
-    var pos = fb.widgetCoords(event);
-
-    // Set new HSL parameters
-    if (fb.circleDrag) {
-      var hue = Math.atan2(pos.x, -pos.y) / 6.28;
-      if (hue < 0) hue += 1;
-      fb.setHSL([hue, fb.hsl[1], fb.hsl[2]]);
-    }
-    else {
-      var sat = Math.max(0, Math.min(1, -(pos.x / fb.square) + .5));
-      var lum = Math.max(0, Math.min(1, -(pos.y / fb.square) + .5));
-      fb.setHSL([fb.hsl[0], sat, lum]);
-    }
-    return false;
-  }
-
-  /**
-   * Mouseup handler
-   */
-  fb.mouseup = function () {
-    // Uncapture mouse
-	farbtastic_click = false;
-    jQuery(document).unbind('mousemove', fb.mousemove);
-    jQuery(document).unbind('mouseup', fb.mouseup);
-    document.dragging = false;
-  }
-
-  /**
-   * Update the markers and styles
-   */
-  fb.updateDisplay = function () {
-    // Markers
-    var angle = fb.hsl[0] * 6.28;
-    jQuery('.h-marker', e).css({
-      left: Math.round(Math.sin(angle) * fb.radius + fb.width / 2) + 'px',
-      top: Math.round(-Math.cos(angle) * fb.radius + fb.width / 2) + 'px'
-    });
-
-    jQuery('.sl-marker', e).css({
-      left: Math.round(fb.square * (.5 - fb.hsl[1]) + fb.width / 2) + 'px',
-      top: Math.round(fb.square * (.5 - fb.hsl[2]) + fb.width / 2) + 'px'
-    });
-
-    // Saturation/Luminance gradient
-    jQuery('.color', e).css('backgroundColor', fb.pack(fb.HSLToRGB([fb.hsl[0], 1, 0.5])));
-
-    // Linked elements or callback
-    if (typeof fb.callback == 'object') {
-      // Set background/foreground color
-      jQuery(fb.callback).css({
-        backgroundColor: fb.color,
-        color: fb.hsl[2] > 0.5 ? '#000' : '#fff'
-      });
-
-      // Change linked value
-      jQuery(fb.callback).each(function() {
-        if (this.value && this.value != fb.color) {
-          this.value = fb.color;
-        }
-      });
-    }
-    else if (typeof fb.callback == 'function') {
-      fb.callback.call(fb, fb.color);
-    }
-  }
-
-  /**
-   * Get absolute position of element
-   */
-  fb.absolutePosition = function (el) {
-    var r = { x: el.offsetLeft, y: el.offsetTop };
-    // Resolve relative to offsetParent
-    if (el.offsetParent) {
-      var tmp = fb.absolutePosition(el.offsetParent);
-      r.x += tmp.x;
-      r.y += tmp.y;
-    }
-    return r;
-  };
-
-  /* Various color utility functions */
-  fb.pack = function (rgb) {
-    var r = Math.round(rgb[0] * 255);
-    var g = Math.round(rgb[1] * 255);
-    var b = Math.round(rgb[2] * 255);
-    return '#' + (r < 16 ? '0' : '') + r.toString(16) +
-           (g < 16 ? '0' : '') + g.toString(16) +
-           (b < 16 ? '0' : '') + b.toString(16);
-  }
-
-  fb.unpack = function (color) {
-    if (color.length == 7) {
-      return [parseInt('0x' + color.substring(1, 3)) / 255,
-        parseInt('0x' + color.substring(3, 5)) / 255,
-        parseInt('0x' + color.substring(5, 7)) / 255];
-    }
-    else if (color.length == 4) {
-      return [parseInt('0x' + color.substring(1, 2)) / 15,
-        parseInt('0x' + color.substring(2, 3)) / 15,
-        parseInt('0x' + color.substring(3, 4)) / 15];
-    }
-  }
-
-  fb.HSLToRGB = function (hsl) {
-    var m1, m2, r, g, b;
-    var h = hsl[0], s = hsl[1], l = hsl[2];
-    m2 = (l <= 0.5) ? l * (s + 1) : l + s - l*s;
-    m1 = l * 2 - m2;
-    return [this.hueToRGB(m1, m2, h+0.33333),
-        this.hueToRGB(m1, m2, h),
-        this.hueToRGB(m1, m2, h-0.33333)];
-  }
-
-  fb.hueToRGB = function (m1, m2, h) {
-    h = (h < 0) ? h + 1 : ((h > 1) ? h - 1 : h);
-    if (h * 6 < 1) return m1 + (m2 - m1) * h * 6;
-    if (h * 2 < 1) return m2;
-    if (h * 3 < 2) return m1 + (m2 - m1) * (0.66666 - h) * 6;
-    return m1;
-  }
-
-  fb.RGBToHSL = function (rgb) {
-    var min, max, delta, h, s, l;
-    var r = rgb[0], g = rgb[1], b = rgb[2];
-    min = Math.min(r, Math.min(g, b));
-    max = Math.max(r, Math.max(g, b));
-    delta = max - min;
-    l = (min + max) / 2;
-    s = 0;
-    if (l > 0 && l < 1) {
-      s = delta / (l < 0.5 ? (2 * l) : (2 - 2 * l));
-    }
-    h = 0;
-    if (delta > 0) {
-      if (max == r && max != g) h += (g - b) / delta;
-      if (max == g && max != b) h += (2 + (b - r) / delta);
-      if (max == b && max != r) h += (4 + (r - g) / delta);
-      h /= 6;
-    }
-    return [h, s, l];
-  }
-
-  // Install mousedown handler (the others are set on the document on-demand)
-  jQuery('*', e).mousedown(fb.mousedown);
-
-    // Init color
-  fb.setColor('#000000');
-
-  // Set linked elements/callback
-  if (callback) {
-    fb.linkTo(callback);
-  }
-}
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/js/gallery.js b/mp-wp/wp-admin/js/gallery.js
--- a/mp-wp/wp-admin/js/gallery.js 238aa7e252e5c106b396b8eaa65d155d70c48c09e84ba23ab408364962b7fa67f345cbc7c303d6dc47b6d4e64edd71b2522b34793bd9954ee1ba72f64f140dd8
+++ b/mp-wp/wp-admin/js/gallery.js false
@@ -1,76 +0,0 @@
-jQuery(function($) {
-	var gallerySortable;
-	var gallerySortableInit = function() {
-		gallerySortable = $('#media-items').sortable( {
-			items: '.media-item',
-			placeholder: 'sorthelper',
-			axis: 'y',
-			distance: 2,
-			update: galleryReorder
-		} );
-	}
-
-	// When an update has occurred, adjust the order for each item
-	var galleryReorder = function(e, sort) {
-		jQuery.each(sort['element'].sortable('toArray'), function(i, id) {
-			jQuery('#' + id + ' .menu_order input')[0].value = (1+i);
-		});
-	}
-
-	// initialize sortable
-	gallerySortableInit();
-});
-
-jQuery(document).ready(function($){
-	$('.menu_order_input').each(function(){
-		if ( this.value == '0' ) this.value = '';
-	});
-
-	if ( $('#media-items>*').length > 1 ) {
-		var w = wpgallery.getWin();
-
-		$('#save-all, #gallery-settings').show();
-		$('#insert-gallery').show();
-	}
-});
-
-var wpgallery = {
-	editor : {},
-	dom : {},
-	is_update : false,
-	el : {},
-
-	I : function(e) {
-		return document.getElementById(e);
-	},
-
-	getWin : function() {
-		return window.dialogArguments || opener || parent || top;
-	},
-
-	getSettings : function() {
-		var I = this.I, s = '';
-
-		if ( I('linkto-file').checked ) {
-			s += ' link="file"';
-			setUserSetting('galfile', '1');
-		}
-
-		if ( I('order-desc').checked ) {
-			s += ' order="DESC"';
-			setUserSetting('galdesc', '1');
-		}
-
-		if ( I('columns').value != 3 ) {
-			s += ' columns="'+I('columns').value+'"';
-			setUserSetting('galcols', I('columns').value);
-		}
-
-		if ( I('orderby').value != 'menu_order' ) {
-			s += ' orderby="'+I('orderby').value+'"';
-			setUserSetting('galord', I('orderby').value);
-		}
-
-		return s;
-	}
-};
diff -uNr a/mp-wp/wp-admin/js/inline-edit-post.js b/mp-wp/wp-admin/js/inline-edit-post.js
--- a/mp-wp/wp-admin/js/inline-edit-post.js aedfc89600e617c7d6c40d9c87492697ba06a629df5207f95d82502908552fc3a52ee5f645b06b5974cf8a8a27b043bd54a2d4b3e5c4d684f299fa80f7db5352
+++ b/mp-wp/wp-admin/js/inline-edit-post.js false
@@ -1,266 +0,0 @@
-
-(function($) {
-inlineEditPost = {
-
-	init : function() {
-		var t = this, qeRow = $('#inline-edit'), bulkRow = $('#bulk-edit');
-
-		t.type = $('table.widefat').hasClass('page') ? 'page' : 'post';
-		t.what = '#'+t.type+'-';
-
-		// get all editable rows
-		t.rows = $('tr.iedit');
-
-		// prepare the edit rows
-		qeRow.keyup(function(e) { if(e.which == 27) return inlineEditPost.revert(); });
-		bulkRow.keyup(function(e) { if (e.which == 27) return inlineEditPost.revert(); });
-
-		$('a.cancel', qeRow).click(function() { return inlineEditPost.revert(); });
-		$('a.save', qeRow).click(function() { return inlineEditPost.save(this); });
-		$('input, select', qeRow).keydown(function(e) { if(e.which == 13) return inlineEditPost.save(this); });
-
-		$('a.cancel', bulkRow).click(function() { return inlineEditPost.revert(); });
-
-		$('#inline-edit .inline-edit-private input[value=private]').click( function(){
-			var pw = $('input.inline-edit-password-input');
-			if ( $(this).attr('checked') ) {
-				pw.val('').attr('disabled', 'disabled');
-			} else {
-				pw.attr('disabled', '');
-			}
-		});
-
-		// add events
-		t.addEvents(t.rows);
-
-		$('#bulk-title-div').parents('fieldset').after(
-			$('#inline-edit fieldset.inline-edit-categories').clone()
-		).siblings( 'fieldset:last' ).prepend(
-//		).siblings( 'fieldset:last' ).after( '<fieldset class="inline-edit-col-bottom"><div class="inline-edit-col"></div></fieldset>' );
-//		$('fieldset.inline-edit-col-bottom').prepend(
-			$('#inline-edit label.inline-edit-tags').clone()
-		);
-
-		// categories expandable?
-		$('span.catshow').click(function() {
-			$('.inline-editor ul.cat-checklist').addClass("cat-hover");
-			$('.inline-editor span.cathide').show();
-			$(this).hide();
-		});
-
-		$('span.cathide').click(function() {
-			$('.inline-editor ul.cat-checklist').removeClass("cat-hover");
-			$('.inline-editor span.catshow').show();
-			$(this).hide();
-		});
-
-		$('select[name="_status"] option[value="future"]', bulkRow).remove();
-
-		$('#doaction, #doaction2').click(function(e){
-			var n = $(this).attr('id').substr(2);
-			if ( $('select[name="'+n+'"]').val() == 'edit' ) {
-				e.preventDefault();
-				t.setBulk();
-			} else if ( $('form#posts-filter tr.inline-editor').length > 0 ) {
-				t.revert();
-			}
-		});
-
-		$('#post-query-submit').click(function(e){
-			if ( $('form#posts-filter tr.inline-editor').length > 0 )
-				t.revert();
-		});
-
-	},
-
-	toggle : function(el) {
-		var t = this;
-
-		$(t.what+t.getId(el)).css('display') == 'none' ? t.revert() : t.edit(el);
-	},
-
-	addEvents : function(r) {
-		r.each(function() {
-			var row = $(this);
-			$('a.editinline', row).click(function() { inlineEditPost.edit(this); return false; });
-		});
-	},
-
-	setBulk : function() {
-		var te = '', c = '', type = this.type;
-		this.revert();
-
-		$('#bulk-edit td').attr('colspan', $('.widefat:first thead th:visible').length);
-		$('table.widefat tbody').prepend( $('#bulk-edit') );
-		$('#bulk-edit').addClass('inline-editor').show();
-
-		$('tbody th.check-column input[type="checkbox"]').each(function(i){
-			if ( $(this).attr('checked') ) {
-				var id = $(this).val();
-				var theTitle = $('#inline_'+id+' .post_title').text() || inlineEditL10n.notitle;
-				te += '<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="'+inlineEditL10n.ntdeltitle+'">X</a>'+theTitle+'</div>';
-			}
-		});
-
-		$('#bulk-titles').html(te);
-		$('#bulk-titles a').click(function() {
-			var id = $(this).attr('id').substr(1), r = inlineEditPost.type+'-'+id;
-
-			$('table.widefat input[value="'+id+'"]').attr('checked', '');
-			$('#ttle'+id).remove();
-		});
-
-		// enable autocomplete for tags
-		if ( type == 'post' )
-			$('tr.inline-editor textarea[name="tags_input"]').suggest( 'admin-ajax.php?action=ajax-tag-search', { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
-	},
-
-	edit : function(id) {
-		var t = this;
-		t.revert();
-
-		if ( typeof(id) == 'object' )
-			id = t.getId(id);
-
-		var fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'ss', 'post_password'];
-		if ( t.type == 'page' ) fields.push('post_parent', 'menu_order', 'page_template');
-		if ( t.type == 'post' ) fields.push('tags_input');
-
-		// add the new blank row
-		var editRow = $('#inline-edit').clone(true);
-		$('td', editRow).attr('colspan', $('.widefat:first thead th:visible').length);
-
-		if ( $(t.what+id).hasClass('alternate') )
-			$(editRow).addClass('alternate');
-		$(t.what+id).hide().after(editRow);
-
-		// populate the data
-		var rowData = $('#inline_'+id);
-		for ( var f = 0; f < fields.length; f++ ) {
-			$(':input[name="'+fields[f]+'"]', editRow).val( $('.'+fields[f], rowData).text() );
-		}
-
-		if ( $('.comment_status', rowData).text() == 'open' )
-			$('input[name="comment_status"]', editRow).attr("checked", "checked");
-		if ( $('.ping_status', rowData).text() == 'open' )
-			$('input[name="ping_status"]', editRow).attr("checked", "checked");
-		if ( $('.sticky', rowData).text() == 'sticky' )
-			$('input[name="sticky"]', editRow).attr("checked", "checked");
-
-		// categories
-		var cats;
-		if ( cats = $('.post_category', rowData).text() )
-			$('ul.cat-checklist :checkbox', editRow).val(cats.split(','));
-
-		// handle the post status
-		var status = $('._status', rowData).text();
-		if ( status != 'future' ) $('select[name="_status"] option[value="future"]', editRow).remove();
-		if ( status == 'private' ) {
-			$('input[name="keep_private"]', editRow).attr("checked", "checked");
-			$('input.inline-edit-password-input').val('').attr('disabled', 'disabled');
-		}
-
-		// remove the current page and children from the parent dropdown
-		var pageOpt = $('select[name="post_parent"] option[value="'+id+'"]', editRow);
-		if ( pageOpt.length > 0 ) {
-			var pageLevel = pageOpt[0].className.split('-')[1], nextPage = pageOpt, pageLoop = true;
-			while ( pageLoop ) {
-				var nextPage = nextPage.next('option');
-				if (nextPage.length == 0) break;
-				var nextLevel = nextPage[0].className.split('-')[1];
-				if ( nextLevel <= pageLevel ) {
-					pageLoop = false;
-				} else {
-					nextPage.remove();
-					nextPage = pageOpt;
-				}
-			}
-			pageOpt.remove();
-		}
-
-		$(editRow).attr('id', 'edit-'+id).addClass('inline-editor').show();
-		$('.ptitle', editRow).focus();
-
-		// enable autocomplete for tags
-		if ( t.type == 'post' )
-			$('tr.inline-editor textarea[name="tags_input"]').suggest( 'admin-ajax.php?action=ajax-tag-search', { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
-
-		return false;
-	},
-
-	save : function(id) {
-		if( typeof(id) == 'object' )
-			id = this.getId(id);
-
-		$('table.widefat .inline-edit-save .waiting').show();
-
-		var params = {
-			action: 'inline-save',
-			post_type: this.type,
-			post_ID: id,
-			edit_date: 'true'
-		};
-
-		var fields = $('#edit-'+id+' :input').fieldSerialize();
-		params = fields + '&' + $.param(params);
-
-		// make ajax request
-		$.post('admin-ajax.php', params,
-			function(r) {
-				$('table.widefat .inline-edit-save .waiting').hide();
-
-				if (r) {
-					if ( -1 != r.indexOf('<tr') ) {
-						$(inlineEditPost.what+id).remove();
-						$('#edit-'+id).before(r).remove();
-
-						var row = $(inlineEditPost.what+id);
-						row.hide();
-
-						if ( 'draft' == $('input[name="post_status"]').val() )
-							row.find('td.column-comments').hide();
-
-						row.find('.hide-if-no-js').removeClass('hide-if-no-js');
-						inlineEditPost.addEvents(row);
-						row.fadeIn();
-					} else {
-						r = r.replace( /<.[^<>]*?>/g, '' );
-						$('#edit-'+id+' .inline-edit-save').append('<span class="error">'+r+'</span>');
-					}
-				} else {
-					$('#edit-'+id+' .inline-edit-save').append('<span class="error">'+inlineEditL10n.error+'</span>');
-				}
-			}
-		, 'html');
-		return false;
-	},
-
-	revert : function() {
-		var id;
-
-		if ( id = $('table.widefat tr.inline-editor').attr('id') ) {
-			$('table.widefat .inline-edit-save .waiting').hide();
-
-			if ( 'bulk-edit' == id ) {
-				$('table.widefat #bulk-edit').removeClass('inline-editor').hide();
-				$('#bulk-titles').html('');
-				$('#inlineedit').append( $('#bulk-edit') );
-			} else  {
-				$('#'+id).remove();
-				id = id.substr( id.lastIndexOf('-') + 1 );
-				$(this.what+id).show();
-			}
-		}
-
-		return false;
-	},
-
-	getId : function(o) {
-		var id = o.tagName == 'TR' ? o.id : $(o).parents('tr').attr('id');
-		var parts = id.split('-');
-		return parts[parts.length - 1];
-	}
-};
-
-$(document).ready(function(){inlineEditPost.init();});
-})(jQuery);
diff -uNr a/mp-wp/wp-admin/js/inline-edit-tax.js b/mp-wp/wp-admin/js/inline-edit-tax.js
--- a/mp-wp/wp-admin/js/inline-edit-tax.js 58a2e12401cc7677080783281ce0711a3f715b1fe117e5d3edf1b3afad8b7315325834d93a5d1917c416edc644bedd069054a1d0960cd214c7acddbea4f550f5
+++ b/mp-wp/wp-admin/js/inline-edit-tax.js false
@@ -1,152 +0,0 @@
-
-(function($) {
-inlineEditTax = {
-
-	init : function() {
-		var t = this, row = $('#inline-edit');
-
-		t.type = $('#the-list').attr('className').substr(5);
-		t.what = '#'+t.type+'-';
-
-		// get all editable rows
-		t.rows = $('tr.iedit');
-
-		// prepare the edit row
-		row.keyup(function(e) { if(e.which == 27) return inlineEditTax.revert(); });
-
-		$('a.cancel', row).click(function() { return inlineEditTax.revert(); });
-		$('a.save', row).click(function() { return inlineEditTax.save(this); });
-		$('input, select', row).keydown(function(e) { if(e.which == 13) return inlineEditTax.save(this); });
-
-		// add events
-		t.addEvents(t.rows);
-
-		$('#posts-filter input[type="submit"]').click(function(e){
-			if ( $('form#posts-filter tr.inline-editor').length > 0 )
-				t.revert();
-		});
-	},
-
-	toggle : function(el) {
-		var t = this;
-
-		$(t.what+t.getId(el)).css('display') == 'none' ? t.revert() : t.edit(el);
-	},
-
-	addEvents : function(r) {
-		r.each(function() {
-			$(this).find('a.editinline').click(function() { inlineEditTax.edit(this); return false; });
-			$(this).find('.hide-if-no-js').removeClass('hide-if-no-js');
-		});
-	},
-
-	edit : function(id) {
-		var t = this;
-		t.revert();
-
-		if ( typeof(id) == 'object' )
-			id = t.getId(id);
-
-		var editRow = $('#inline-edit').clone(true), rowData = $('#inline_'+id);
-		$('td', editRow).attr('colspan', $('.widefat:first thead th:visible').length);
-
-		if ( $(t.what+id).hasClass('alternate') )
-			$(editRow).addClass('alternate');
-
-		$(t.what+id).hide().after(editRow);
-
-		$(':input[name="name"]', editRow).val( $('.name', rowData).text() );
-		$(':input[name="slug"]', editRow).val( $('.slug', rowData).text() );
-
-		// cat parents
-		var cat_parent = $('.cat_parent', rowData).text();
-		if ( cat_parent != '0' )
-			$('select[name="parent"]', editRow).val(cat_parent);
-
-		// remove the current parent and children from the parent dropdown
-		var pageOpt = $('select[name="parent"] option[value="'+id+'"]', editRow);
-		if ( pageOpt.length > 0 ) {
-			var pageLevel = pageOpt[0].className.split('-')[1], nextPage = pageOpt, pageLoop = true;
-			while ( pageLoop ) {
-				var nextPage = nextPage.next('option');
-				if (nextPage.length == 0) break;
-				var nextLevel = nextPage[0].className.split('-')[1];
-				if ( nextLevel <= pageLevel ) {
-					pageLoop = false;
-				} else {
-					nextPage.remove();
-					nextPage = pageOpt;
-				}
-			}
-			pageOpt.remove();
-		}
-
-		$(editRow).attr('id', 'edit-'+id).addClass('inline-editor').show();
-		$('.ptitle', editRow).eq(0).focus();
-
-		return false;
-	},
-
-	save : function(id) {
-		if( typeof(id) == 'object' )
-			id = this.getId(id);
-
-		$('table.widefat .inline-edit-save .waiting').show();
-
-		var params = {
-			action: 'inline-save-tax',
-			tax_type: this.type,
-			tax_ID: id
-		};
-
-		var fields = $('#edit-'+id+' :input').fieldSerialize();
-		params = fields + '&' + $.param(params);
-
-		// make ajax request
-		$.post('admin-ajax.php', params,
-			function(r) {
-
-				$('table.widefat .inline-edit-save .waiting').hide();
-
-				if (r) {
-					if ( -1 != r.indexOf('<tr') ) {
-						$(inlineEditTax.what+id).remove();
-						$('#edit-'+id).before(r).remove();
-
-						var row = $(inlineEditTax.what+id);
-						row.hide();
-
-						row.find('.hide-if-no-js').removeClass('hide-if-no-js');
-						inlineEditTax.addEvents(row);
-						row.fadeIn();
-					} else
-						$('#edit-'+id+' .inline-edit-save .error').html(r).show();
-				} else
-					$('#edit-'+id+' .inline-edit-save .error').html(inlineEditL10n.error).show();
-			}
-		);
-		return false;
-	},
-
-	revert : function() {
-		var id = $('table.widefat tr.inline-editor').attr('id');
-
-		if ( id ) {
-			$('table.widefat .inline-edit-save .waiting').hide();
-			$('#'+id).remove();
-			id = id.substr( id.lastIndexOf('-') + 1 );
-			$(this.what+id).show();
-		}
-
-		return false;
-	},
-
-	getId : function(o) {
-		var id = o.tagName == 'TR' ? o.id : $(o).parents('tr').attr('id');
-		var parts = id.split('-');
-		return parts[parts.length - 1];
-	}
-};
-
-$(document).ready(function(){inlineEditTax.init();});
-})(jQuery);
diff -uNr a/mp-wp/wp-admin/js/link.js b/mp-wp/wp-admin/js/link.js
--- a/mp-wp/wp-admin/js/link.js c8b704b2b6d67ac065e7fc13f5c7ca4c1d51d6753175794fd6abded5c7c65f9b187ce364cf2e9661d8b771fe43babe6701b2bf042bf3a9bb4a816f668bb7376f
+++ b/mp-wp/wp-admin/js/link.js false
@@ -1,57 +0,0 @@
-jQuery(document).ready( function($) {
-	// close postboxes that should be closed
-	jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
-
-	jQuery('#link_name').focus();
-	// postboxes
-	postboxes.add_postbox_toggles('link');
-
-	// category tabs
-	var categoryTabs = jQuery('#category-tabs').tabs();
-
-	// Ajax Cat
-	var newCat = jQuery('#newcat').one( 'focus', function() { jQuery(this).val( '' ).removeClass( 'form-input-tip' ) } );
-	jQuery('#category-add-sumbit').click( function() { newCat.focus(); } );
-	var noSyncChecks = false; // prophylactic. necessary?
-	var syncChecks = function() {
-		if ( noSyncChecks )
-			return;
-		noSyncChecks = true;
-		var th = jQuery(this);
-		var c = th.is(':checked');
-		var id = th.val().toString();
-		jQuery('#in-category-' + id + ', #in-popular-category-' + id).attr( 'checked', c );
-		noSyncChecks = false;
-	};
-	var catAddAfter = function( r, s ) {
-		jQuery(s.what + ' response_data', r).each( function() {
-			var t = jQuery(jQuery(this).text());
-			t.find( 'label' ).each( function() {
-				var th = jQuery(this);
-				var val = th.find('input').val();
-				var id = th.find('input')[0].id
-				jQuery('#' + id).change( syncChecks );
-				var name = jQuery.trim( th.text() );
-				var o = jQuery( '<option value="' +  parseInt( val, 10 ) + '"></option>' ).text( name );
-			} );
-		} );
-	};
-	jQuery('#categorychecklist').wpList( {
-		alt: '',
-		what: 'link-category',
-		response: 'category-ajax-response',
-		addAfter: catAddAfter
-	} );
-
-	$('a[href="#categories-all"]').click(function(){deleteUserSetting('cats');});
-	$('a[href="#categories-pop"]').click(function(){setUserSetting('cats','pop');});
-	if ( 'pop' == getUserSetting('cats') )
-		$('a[href="#categories-pop"]').click();
-
-	jQuery('#category-add-toggle').click( function() {
-		jQuery(this).parents('div:first').toggleClass( 'wp-hidden-children' );
-		categoryTabs.tabsClick( 1 );
-		return false;
-	} );
-	jQuery('.categorychecklist :checkbox').change( syncChecks ).filter( ':checked' ).change();
-});
diff -uNr a/mp-wp/wp-admin/js/media-upload.js b/mp-wp/wp-admin/js/media-upload.js
--- a/mp-wp/wp-admin/js/media-upload.js 4e29388d9dbcfe61ef580e8c11d9c76fecc91ff58658dac3036848b5254685efc61858a4500fc252111a2ac8df3038a8d10c95b10eebefa0e7af13b80b9bc27b
+++ b/mp-wp/wp-admin/js/media-upload.js false
@@ -1,40 +0,0 @@
-// send html to the post editor
-function send_to_editor(h) {
-	if ( typeof edInsertContent == 'function' ) {
-		edInsertContent(edCanvas, h);
-	} else {
-		jQuery( edCanvas ).val( jQuery( edCanvas ).val() + h );
-	}
-
-	tb_remove();
-}
-
-// thickbox settings
-jQuery(function($) {
-	tb_position = function() {
-		var tbWindow = $('#TB_window');
-		var width = $(window).width();
-		var H = $(window).height();
-		var W = ( 720 < width ) ? 720 : width;
-
-		if ( tbWindow.size() ) {
-			tbWindow.width( W - 50 ).height( H - 45 );
-			$('#TB_iframeContent').width( W - 50 ).height( H - 75 );
-			tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
-			if ( typeof document.body.style.maxWidth != 'undefined' )
-				tbWindow.css({'top':'20px','margin-top':'0'});
-			$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
-		};
-
-		return $('a.thickbox').each( function() {
-			var href = $(this).attr('href');
-			if ( ! href ) return;
-			href = href.replace(/&width=[0-9]+/g, '');
-			href = href.replace(/&height=[0-9]+/g, '');
-			$(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 ) );
-		});
-	};
-
-	$(window).resize( function() { tb_position() } );
-});
-
diff -uNr a/mp-wp/wp-admin/js/page.js b/mp-wp/wp-admin/js/page.js
--- a/mp-wp/wp-admin/js/page.js a83be8c8d6717497d784deda4a4e3934b1c0189deb86b593788c3b98cb4afbfaa9eae77f8f48bf5b2ecd01fc6db9fa5473baf5c978f4448766e070f16ecae201
+++ b/mp-wp/wp-admin/js/page.js false
@@ -1,202 +0,0 @@
-jQuery(document).ready( function($) {
-	postboxes.add_postbox_toggles('page');
-	make_slugedit_clickable();
-
-	// close postboxes that should be closed
-	jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
-
-	jQuery('#title').blur( function() { if ( (jQuery("#post_ID").val() > 0) || (jQuery("#title").val().length == 0) ) return; autosave(); } );
-
-	var stamp = $('#timestamp').html();
-
-	var visibility = $('#post-visibility-display').html();
-
-	function updateVisibility() {
-		if ( $('#post-visibility-select input:radio:checked').val() != 'public' ) {
-			$('#sticky').attr('checked', false);
-			$('#sticky-span').hide();
-		} else {
-			$('#sticky-span').show();
-		}
-		if ( $('#post-visibility-select input:radio:checked').val() != 'password' ) {
-			$('#password-span').hide();
-		} else {
-			$('#password-span').show();
-		}
-	}
-
-	function updateText() {
-		var attemptedDate = new Date( $('#aa').val(), $('#mm').val() -1, $('#jj').val(), $('#hh').val(), $('#mn').val());
-		var originalDate = new Date( $('#hidden_aa').val(), $('#hidden_mm').val() -1, $('#hidden_jj').val(), $('#hidden_hh').val(), $('#hidden_mn').val());
-		var currentDate = new Date( $('#cur_aa').val(), $('#cur_mm').val() -1, $('#cur_jj').val(), $('#cur_hh').val(), $('#cur_mn').val());
-		if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) {
-			var publishOn = postL10n.publishOnFuture;
-			$('#publish').val( postL10n.schedule );
-		} else if ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) {
-			var publishOn = postL10n.publishOn;
-			$('#publish').val( postL10n.publish );
-		} else {
-			var publishOn = postL10n.publishOnPast;
-			$('#publish').val( postL10n.update );
-		}
-		if ( originalDate.toUTCString() == attemptedDate.toUTCString() ) { //hack
-			$('#timestamp').html(stamp);
-		} else {
-			$('#timestamp').html(
-				publishOn + ' <b>' +
-				$( '#mm option[value=' + $('#mm').val() + ']' ).text() + ' ' +
-				$('#jj').val() + ', ' +
-				$('#aa').val() + ' @ ' +
-				$('#hh').val() + ':' +
-				$('#mn').val() + '</b> '
-			);
-		}
-
-		if ( $('#post-visibility-select input:radio:checked').val() == 'private' ) {
-			$('#publish').val( postL10n.update );
-			if ( $('#post_status option[value=publish]').length == 0 ) {
-				$('#post_status').append('<option value="publish">' + postL10n.privatelyPublished + '</option>');
-			}
-			$('#post_status option[value=publish]').html( postL10n.privatelyPublished );
-			$('#post_status option[value=publish]').attr('selected', true);
-			$('.edit-post-status').hide();
-		} else {
-			if ( $('#original_post_status').val() == 'future' || $('#original_post_status').val() == 'draft' ) {
-				if ( $('#post_status option[value=publish]').length != 0 ) {
-					$('#post_status option[value=publish]').remove();
-					$('#post_status').val($('#hidden_post_status').val());
-				}
-			} else {
-				$('#post_status option[value=publish]').html( postL10n.published );
-			}
-			$('.edit-post-status').show();
-		}
-		$('#post-status-display').html($('#post_status :selected').text());
-		if ( $('#post_status :selected').val() == 'private' || $('#post_status :selected').val() == 'publish' ) {
-			$('#save-post').hide();
-		} else {
-			$('#save-post').show();
-			if ( $('#post_status :selected').val() == 'pending' ) {
-				$('#save-post').show().val( postL10n.savePending );
-			} else {
-				$('#save-post').show().val( postL10n.saveDraft );
-			}
-		}
-	}
-
-	$('.edit-visibility').click(function () {
-		if ($('#post-visibility-select').is(":hidden")) {
-			updateVisibility();
-			$('#post-visibility-select').slideDown("normal");
-			$('.edit-visibility').hide();
-		}
-		return false;
-	});
-
-	$('.cancel-post-visibility').click(function () {
-		$('#post-visibility-select').slideUp("normal");
-		$('#visibility-radio-' + $('#hidden-post-visibility').val()).attr('checked', true);
-		$('#post_password').val($('#hidden_post_password').val());
-		$('#post-visibility-display').html(visibility);
-		$('.edit-visibility').show();
-		updateText();
-		return false;
-	});
-
-	$('.save-post-visibility').click(function () { // crazyhorse - multiple ok cancels
-		$('#post-visibility-select').slideUp("normal");
-		$('.edit-visibility').show();
-		updateText();
-
-		$('#post-visibility-display').html(
-			postL10n[$('#post-visibility-select input:radio:checked').val()]
-		);
-
-		return false;
-	});
-
-	$('#post-visibility-select input:radio').change(function() {
-		updateVisibility();
-	});
-
-	$('.edit-timestamp').click(function () {
-		if ($('#timestampdiv').is(":hidden")) {
-			$('#timestampdiv').slideDown("normal");
-			$('.edit-timestamp').hide();
-		}
-
-		return false;
-	});
-
-	$('.cancel-timestamp').click(function() {
-		$('#timestampdiv').slideUp("normal");
-		$('#mm').val($('#hidden_mm').val());
-		$('#jj').val($('#hidden_jj').val());
-		$('#aa').val($('#hidden_aa').val());
-		$('#hh').val($('#hidden_hh').val());
-		$('#mn').val($('#hidden_mn').val());
-		$('.edit-timestamp').show();
-
-		updateText();
-		return false;
-	});
-
-	$('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
-		$('#timestampdiv').slideUp("normal");
-		$('.edit-timestamp').show();
-		updateText();
-
-		return false;
-	});
-
-	$('.edit-post-status').click(function() {
-		if ($('#post-status-select').is(":hidden")) {
-			$('#post-status-select').slideDown("normal");
-			$(this).hide();
-		}
-
-		return false;
-	});
-
-	$('.save-post-status').click(function() {
-		$('#post-status-select').slideUp("normal");
-		$('.edit-post-status').show();
-		updateText();
-		return false;
-	});
-
-	$('.cancel-post-status').click(function() {
-		$('#post-status-select').slideUp("normal");
-		$('#post_status').val($('#hidden_post_status').val());
-		$('.edit-post-status').show();
-
-		updateText();
-		return false;
-	});
-
-	// Custom Fields
-	jQuery('#the-list').wpList( { addAfter: function( xml, s ) {
-		$('table#list-table').show();
-		if ( jQuery.isFunction( autosave_update_post_ID ) ) {
-			autosave_update_post_ID(s.parsed.responses[0].supplemental.postid);
-		}
-	}, addBefore: function( s ) {
-		s.data += '&post_id=' + jQuery('#post_ID').val();
-		return s;
-	}
-	});
-
-	// preview
-	$('#post-preview').click(function(e){
-		if ( 1 > $('#post_ID').val() && autosaveFirst ) {
-			autosaveDelayPreview = true;
-			autosave();
-			return false;
-		}
-
-		$('input#wp-preview').val('dopreview');
-		$('form#post').attr('target', 'wp-preview').submit().attr('target', '');
-		$('input#wp-preview').val('');
-		return false;
-	});
-});
diff -uNr a/mp-wp/wp-admin/js/password-strength-meter.js b/mp-wp/wp-admin/js/password-strength-meter.js
--- a/mp-wp/wp-admin/js/password-strength-meter.js eaa5fe29fddaf348ee9ca7b03dfb5cacbc5e1fcc9d56bbca9300bb0760e881c6c6c61f36e1525060339c089851109911e75440fa77a7a68d75731e8dbaf138cb
+++ b/mp-wp/wp-admin/js/password-strength-meter.js false
@@ -1,23 +0,0 @@
-// Password strength meter
-
-function passwordStrength(password,username) {
-    var shortPass = 1, badPass = 2, goodPass = 3, strongPass = 4;
-
-	//password < 4
-    if (password.length < 4 ) { return shortPass };
-
-    //password == username
-    if (password.toLowerCase()==username.toLowerCase()) return badPass;
-
-	var symbolSize = 0;
-	if (password.match(/[0-9]/)) symbolSize +=10;
-	if (password.match(/[a-z]/)) symbolSize +=26;
-	if (password.match(/[A-Z]/)) symbolSize +=26;
-	if (password.match(/[^a-zA-Z0-9]/)) symbolSize +=31;
-
-	var natLog = Math.log( Math.pow(symbolSize,password.length) );
-	var score = natLog / Math.LN2;
-	if (score < 40 )  return badPass
-	if (score < 56 )  return goodPass
-    return strongPass;
-}
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/js/plugin-install.js b/mp-wp/wp-admin/js/plugin-install.js
--- a/mp-wp/wp-admin/js/plugin-install.js 7645d24a8a9d64d762eb80785c29b925d47670b4eec201c33a64eecaec09dbd3a25841fd6eff6899ab41b10f9d30f369a9c54d83d8858a3f38d1e8b93248ffa5
+++ b/mp-wp/wp-admin/js/plugin-install.js false
@@ -1,53 +0,0 @@
-/* Plugin Browser Thickbox related JS*/
-jQuery(function($) {
-	var thickDims = function() {
-		var tbWindow = $('#TB_window');
-		var width = $(window).width();
-		var H = $(window).height();
-		var W = ( 720 < width ) ? 720 : width;
-
-		if ( tbWindow.size() ) {
-			tbWindow.width( W - 50 ).height( H - 45 );
-			$('#TB_iframeContent').width( W - 50 ).height( H - 75 );
-			tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
-			if ( ! ( $.browser.msie && $.browser.version.substr(0,1) < 7 ) )
-				tbWindow.css({'top':'20px','margin-top':'0'});
-		};
-
-		return $('a.thickbox').each( function() {
-			var href = $(this).attr('href');
-			if ( ! href )
-				return;
-			href = href.replace(/&width=[0-9]+/g, '');
-			href = href.replace(/&height=[0-9]+/g, '');
-			$(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 ) );
-		});
-	};
-
-	thickDims().click( function() {
-		$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
-		$('#TB_ajaxWindowTitle').html('<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).attr('title') );
-		return false;
-	});
-
-	$(window).resize( function() { tb_position() } );
-});
-
-/* Plugin install related JS*/
-jQuery(function($) {
-	$('#install-plugins tbody.plugins tr').click( function() {
-		$(this).find('.action-links a.onclick').click();
-		return false;
-	});
-
-	$('#plugin-information #sidemenu a').click( function() {
-		var tab = $(this).attr('name');
-		//Flip the tab
-		$('#plugin-information-header a.current').removeClass('current');
-		$(this).addClass('current');
-		//Flip the content.
-		$('#section-holder div.section').hide(); //Hide 'em all
-		$('#section-' + tab).show();
-		return false;
-	});
-});
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/js/post.js b/mp-wp/wp-admin/js/post.js
--- a/mp-wp/wp-admin/js/post.js 50ec9d3c1e91659d2ae1f9e78c70e46b077d0a047f58847995321bdd86d67858922a30a1a983cb1ffb19e7c8c95b1b8fbaa089c1fe9edd60e80a04a5fdb8a995
+++ b/mp-wp/wp-admin/js/post.js false
@@ -1,455 +0,0 @@
-// this file contains all the scripts used in the post/edit page
-
-function new_tag_remove_tag() {
-	var id = jQuery( this ).attr( 'id' );
-	var num = id.substr( 10 );
-	var current_tags = jQuery( '#tags-input' ).val().split(',');
-	delete current_tags[num];
-	var new_tags = [];
-	jQuery.each( current_tags, function( key, val ) {
-		if ( val && !val.match(/^\s+$/) && '' != val ) {
-			new_tags = new_tags.concat( val );
-		}
-	});
-	jQuery( '#tags-input' ).val( new_tags.join( ',' ).replace( /\s*,+\s*/, ',' ).replace( /,+/, ',' ).replace( /,+\s+,+/, ',' ).replace( /,+\s*$/, '' ).replace( /^\s*,+/, '' ) );
-	tag_update_quickclicks();
-	jQuery('#newtag').focus();
-	return false;
-}
-
-function tag_update_quickclicks() {
-	if ( jQuery( '#tags-input' ).length == 0 )
-		return;
-	var current_tags = jQuery( '#tags-input' ).val().split(',');
-	jQuery( '#tagchecklist' ).empty();
-	shown = false;
-//	jQuery.merge( current_tags, current_tags ); // this doesn't work anymore, need something to array_unique
-	jQuery.each( current_tags, function( key, val ) {
-		val = val.replace( /^\s+/, '' ).replace( /\s+$/, '' ); // trim
-		if ( !val.match(/^\s+$/) && '' != val ) {
-			txt = '<span><a id="tag-check-' + key + '" class="ntdelbutton">X</a>&nbsp;' + val + '</span> ';
-			jQuery( '#tagchecklist' ).append( txt );
-			jQuery( '#tag-check-' + key ).click( new_tag_remove_tag );
-			shown = true;
-		}
-	});
-	if ( shown )
-		jQuery( '#tagchecklist' ).prepend( '<strong>'+postL10n.tagsUsed+'</strong><br />' );
-}
-
-function tag_flush_to_text(e,a) {
-	a = a || false;
-	var text = a ? jQuery(a).text() : jQuery('#newtag').val();
-	var newtags = jQuery('#tags-input').val();
-
-	var t = text.replace( /\s*([^,]+).*/, '$1,' );
-	newtags += ','
-
-	if ( newtags.indexOf(t) != -1 )
-		return false;
-
-	newtags += text;
-
-	// massage
-	newtags = newtags.replace( /\s+,+\s*/g, ',' ).replace( /,+/g, ',' ).replace( /,+\s+,+/g, ',' ).replace( /,+\s*$/g, '' ).replace( /^\s*,+/g, '' );
-	jQuery('#tags-input').val( newtags );
-	tag_update_quickclicks();
-	if ( ! a ) {
-		jQuery('#newtag').val('');
-		jQuery('#newtag').focus();
-	}
-	return false;
-}
-
-function tag_save_on_publish() {
-	if ( jQuery('#newtag').val() != postL10n.addTag )
-		tag_flush_to_text();
-}
-
-function tag_press_key( e ) {
-	if ( 13 == e.keyCode ) {
-		tag_flush_to_text();
-		return false;
-	}
-};
-
-(function($){
-	tagCloud = {
-		init : function() {
-			$('#tagcloud-link').click(function(){tagCloud.get(); $(this).unbind().click(function(){return false;}); return false;});
-		},
-
-		get : function() {
-			$.post('admin-ajax.php', {'action':'get-tagcloud'}, function(r, stat) {
-				if ( 0 == r || 'success' != stat )
-					r = wpAjax.broken;
-
-				r = '<p id="the-tagcloud">'+r+'</p>';
-				$('#tagcloud-link').after($(r));
-				$('#the-tagcloud a').click(function(){
-					tag_flush_to_text(0,this);
-					return false;
-				});
-			});
-		}
-	}
-})(jQuery);
-
-jQuery(document).ready( function($) {
-	tagCloud.init();
-
-	// close postboxes that should be closed
-	jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
-
-	// postboxes
-	postboxes.add_postbox_toggles('post');
-
-	// Editable slugs
-	make_slugedit_clickable();
-
-	jQuery('#tags-input').hide();
-	tag_update_quickclicks();
-	// add the quickadd form
-	jQuery('#jaxtag').prepend('<span id="ajaxtag"><input type="text" name="newtag" id="newtag" class="form-input-tip" size="16" autocomplete="off" value="'+postL10n.addTag+'" /><input type="button" class="button" id="tagadd" value="' + postL10n.add + '" tabindex="3" /><input type="hidden"/><input type="hidden"/><span class="howto">'+postL10n.separate+'</span></span>');
-	jQuery('#tagadd').click( tag_flush_to_text );
-	jQuery('#newtag').focus(function() {
-		if ( this.value == postL10n.addTag )
-			jQuery(this).val( '' ).removeClass( 'form-input-tip' );
-	});
-	jQuery('#newtag').blur(function() {
-		if ( this.value == '' )
-			jQuery(this).val( postL10n.addTag ).addClass( 'form-input-tip' );
-	});
-
-	// auto-save tags on post save/publish
-	jQuery('#publish').click( tag_save_on_publish );
-	jQuery('#save-post').click( tag_save_on_publish );
-
-	jQuery('#title').blur( function() { if ( (jQuery("#post_ID").val() > 0) || (jQuery("#title").val().length == 0) ) return; autosave(); } );
-
-	// auto-suggest stuff
-	jQuery('#newtag').suggest( 'admin-ajax.php?action=ajax-tag-search', { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
-	jQuery('#newtag').keypress( tag_press_key );
-
-	// category tabs
-	var categoryTabs =jQuery('#category-tabs').tabs();
-
-	// Ajax Cat
-	var newCat = jQuery('#newcat').one( 'focus', function() { jQuery(this).val( '' ).removeClass( 'form-input-tip' ) } );
-	jQuery('#category-add-sumbit').click( function() { newCat.focus(); } );
-	var newCatParent = false;
-	var newCatParentOption = false;
-	var noSyncChecks = false; // prophylactic. necessary?
-	var syncChecks = function() {
-		if ( noSyncChecks )
-			return;
-		noSyncChecks = true;
-		var th = jQuery(this);
-		var c = th.is(':checked');
-		var id = th.val().toString();
-		jQuery('#in-category-' + id + ', #in-popular-category-' + id).attr( 'checked', c );
-		noSyncChecks = false;
-	};
-	var popularCats = jQuery('#categorychecklist-pop :checkbox').map( function() { return parseInt(jQuery(this).val(), 10); } ).get().join(',');
-	var catAddBefore = function( s ) {
-		s.data += '&popular_ids=' + popularCats + '&' + jQuery( '#categorychecklist :checked' ).serialize();
-		return s;
-	};
-	var catAddAfter = function( r, s ) {
-		if ( !newCatParent ) newCatParent = jQuery('#newcat_parent');
-		if ( !newCatParentOption ) newCatParentOption = newCatParent.find( 'option[value=-1]' );
-		jQuery(s.what + ' response_data', r).each( function() {
-			var t = jQuery(jQuery(this).text());
-			t.find( 'label' ).each( function() {
-				var th = jQuery(this);
-				var val = th.find('input').val();
-				var id = th.find('input')[0].id
-				jQuery('#' + id).change( syncChecks ).change();
-				if ( newCatParent.find( 'option[value=' + val + ']' ).size() )
-					return;
-				var name = jQuery.trim( th.text() );
-				var o = jQuery( '<option value="' +  parseInt( val, 10 ) + '"></option>' ).text( name );
-				newCatParent.prepend( o );
-			} );
-			newCatParentOption.attr( 'selected', true );
-		} );
-	};
-	jQuery('#categorychecklist').wpList( {
-		alt: '',
-		response: 'category-ajax-response',
-		addBefore: catAddBefore,
-		addAfter: catAddAfter
-	} );
-	jQuery('#category-add-toggle').click( function() {
-		jQuery(this).parents('div:first').toggleClass( 'wp-hidden-children' );
-		// categoryTabs.tabs( 'select', '#categories-all' ); // this is broken (in the UI beta?)
-		categoryTabs.find( 'a[href="#categories-all"]' ).click();
-		jQuery('#newcat').focus();
-		return false;
-	} );
-
-	$('a[href="#categories-all"]').click(function(){deleteUserSetting('cats');});
-	$('a[href="#categories-pop"]').click(function(){setUserSetting('cats','pop');});
-	if ( 'pop' == getUserSetting('cats') )
-		$('a[href="#categories-pop"]').click();
-
-	jQuery('.categorychecklist .popular-category :checkbox').change( syncChecks ).filter( ':checked' ).change();
-	var stamp = $('#timestamp').html();
-	var visibility = $('#post-visibility-display').html();
-	var sticky = '';
-
-	function updateVisibility() {
-		if ( $('#post-visibility-select input:radio:checked').val() != 'public' ) {
-			$('#sticky').attr('checked', false);
-			$('#sticky-span').hide();
-		} else {
-			$('#sticky-span').show();
-		}
-		if ( $('#post-visibility-select input:radio:checked').val() != 'password' ) {
-			$('#password-span').hide();
-		} else {
-			$('#password-span').show();
-		}
-	}
-
-	function updateText() {
-		var attemptedDate = new Date( $('#aa').val(), $('#mm').val() -1, $('#jj').val(), $('#hh').val(), $('#mn').val());
-		var originalDate = new Date( $('#hidden_aa').val(), $('#hidden_mm').val() -1, $('#hidden_jj').val(), $('#hidden_hh').val(), $('#hidden_mn').val());
-		var currentDate = new Date( $('#cur_aa').val(), $('#cur_mm').val() -1, $('#cur_jj').val(), $('#cur_hh').val(), $('#cur_mn').val());
-		if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) {
-			var publishOn = postL10n.publishOnFuture;
-			$('#publish').val( postL10n.schedule );
-		} else if ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) {
-			var publishOn = postL10n.publishOn;
-			$('#publish').val( postL10n.publish );
-		} else {
-			var publishOn = postL10n.publishOnPast;
-			$('#publish').val( postL10n.update );
-		}
-		if ( originalDate.toUTCString() == attemptedDate.toUTCString() ) { //hack
-			$('#timestamp').html(stamp);
-		} else {
-			$('#timestamp').html(
-				publishOn + ' <b>' +
-				$( '#mm option[value=' + $('#mm').val() + ']' ).text() + ' ' +
-				$('#jj').val() + ', ' +
-				$('#aa').val() + ' @ ' +
-				$('#hh').val() + ':' +
-				$('#mn').val() + '</b> '
-			);
-		}
-
-		if ( $('#post-visibility-select input:radio:checked').val() == 'private' ) {
-			$('#publish').val( postL10n.update );
-			if ( $('#post_status option[value=publish]').length == 0 ) {
-				$('#post_status').append('<option value="publish">' + postL10n.privatelyPublished + '</option>');
-			}
-			$('#post_status option[value=publish]').html( postL10n.privatelyPublished );
-			$('#post_status option[value=publish]').attr('selected', true);
-			$('.edit-post-status').hide();
-		} else {
-			if ( $('#original_post_status').val() == 'future' || $('#original_post_status').val() == 'draft' ) {
-				if ( $('#post_status option[value=publish]').length != 0 ) {
-					$('#post_status option[value=publish]').remove();
-					$('#post_status').val($('#hidden_post_status').val());
-				}
-			} else {
-				$('#post_status option[value=publish]').html( postL10n.published );
-			}
-			$('.edit-post-status').show();
-		}
-		$('#post-status-display').html($('#post_status :selected').text());
-		if ( $('#post_status :selected').val() == 'private' || $('#post_status :selected').val() == 'publish' ) {
-			$('#save-post').hide();
-		} else {
-			$('#save-post').show();
-			if ( $('#post_status :selected').val() == 'pending' ) {
-				$('#save-post').show().val( postL10n.savePending );
-			} else {
-				$('#save-post').show().val( postL10n.saveDraft );
-			}
-		}
-	}
-
-	$('.edit-visibility').click(function () {
-		if ($('#post-visibility-select').is(":hidden")) {
-			updateVisibility();
-			$('#post-visibility-select').slideDown("normal");
-			$('.edit-visibility').hide();
-		}
-		return false;
-	});
-
-	$('.cancel-post-visibility').click(function () {
-		$('#post-visibility-select').slideUp("normal");
-		$('#visibility-radio-' + $('#hidden-post-visibility').val()).attr('checked', true);
-		$('#post_password').val($('#hidden_post_password').val());
-		$('#sticky').attr('checked', $('#hidden-post-sticky').attr('checked'));
-		$('#post-visibility-display').html(visibility);
-		$('.edit-visibility').show();
-		updateText();
-		return false;
-	});
-
-	$('.save-post-visibility').click(function () { // crazyhorse - multiple ok cancels
-		$('#post-visibility-select').slideUp("normal");
-		$('.edit-visibility').show();
-		updateText();
-		if ( $('#post-visibility-select input:radio:checked').val() != 'public' ) {
-			$('#sticky').attr('checked', false);
-		}
-
-		if ( true == $('#sticky').attr('checked') ) {
-			sticky = 'Sticky';
-		} else {
-			sticky = '';
-		}
-
-		$('#post-visibility-display').html(
-			postL10n[$('#post-visibility-select input:radio:checked').val() + sticky]
-		);
-
-		return false;
-	});
-
-	$('#post-visibility-select input:radio').change(function() {
-		updateVisibility();
-	});
-
-	$('.edit-timestamp').click(function () {
-		if ($('#timestampdiv').is(":hidden")) {
-			$('#timestampdiv').slideDown("normal");
-			$('.edit-timestamp').hide();
-		}
-
-		return false;
-	});
-
-	$('.cancel-timestamp').click(function() {
-		$('#timestampdiv').slideUp("normal");
-		$('#mm').val($('#hidden_mm').val());
-		$('#jj').val($('#hidden_jj').val());
-		$('#aa').val($('#hidden_aa').val());
-		$('#hh').val($('#hidden_hh').val());
-		$('#mn').val($('#hidden_mn').val());
-		$('.edit-timestamp').show();
-		updateText();
-		return false;
-	});
-
-	$('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
-		$('#timestampdiv').slideUp("normal");
-		$('.edit-timestamp').show();
-		updateText();
-
-		return false;
-	});
-
-	$('.edit-post-status').click(function() {
-		if ($('#post-status-select').is(":hidden")) {
-			$('#post-status-select').slideDown("normal");
-			$(this).hide();
-		}
-
-		return false;
-	});
-
-	$('.save-post-status').click(function() {
-		$('#post-status-select').slideUp("normal");
-		$('.edit-post-status').show();
-		updateText();
-		return false;
-	});
-
-	$('.cancel-post-status').click(function() {
-		$('#post-status-select').slideUp("normal");
-		$('#post_status').val($('#hidden_post_status').val());
-		$('.edit-post-status').show();
-		updateText();
-		return false;
-	});
-
-	// Custom Fields
-	jQuery('#the-list').wpList( { addAfter: function( xml, s ) {
-		$('table#list-table').show();
-		if ( jQuery.isFunction( autosave_update_post_ID ) ) {
-			autosave_update_post_ID(s.parsed.responses[0].supplemental.postid);
-		}
-	}, addBefore: function( s ) {
-		s.data += '&post_id=' + jQuery('#post_ID').val();
-		return s;
-	}
-	});
-
-	// preview
-	$('#post-preview').click(function(e){
-		if ( 1 > $('#post_ID').val() && autosaveFirst ) {
-			autosaveDelayPreview = true;
-			autosave();
-			return false;
-		}
-
-		$('input#wp-preview').val('dopreview');
-		$('form#post').attr('target', 'wp-preview').submit().attr('target', '');
-		$('input#wp-preview').val('');
-		return false;
-	});
-
-});
-
-(function($){
-	commentsBox = {
-		st : 0,
-
-		get : function(total, num) {
-			var st = this.st;
-			if ( ! num )
-				num = 20;
-
-			this.st += num;
-			this.total = total;
-			$('.waiting').show();
-
-			var data = {
-				'action' : 'get-comments',
-				'mode' : 'single',
-				'_ajax_nonce' : $('#add_comment_nonce').val(),
-				'post_ID' : $('#post_ID').val(),
-				'start' : st,
-				'num' : num
-			};
-
-			$.post('admin-ajax.php', data,
-				function(r) {
-					var r = wpAjax.parseAjaxResponse(r);
-					$('#commentstatusdiv .widefat').show();
-					$('.waiting').hide();
-
-					if ( 'object' == typeof r && r.responses[0] ) {
-						$('#the-comment-list').append( r.responses[0].data );
-						$('#the-comment-list .hide-if-no-js').removeClass('hide-if-no-js');
-
-						theList = theExtraList = null;
-						$("a[className*=':']").unbind();
-						setCommentsList();
-
-						if ( commentsBox.st > commentsBox.total )
-							$('#show-comments').hide();
-						else
-							$('#show-comments').html(postL10n.showcomm);
-						return;
-					} else if ( 1 == r ) {
-						$('#show-comments').parent().html(postL10n.endcomm);
-						return;
-					}
-
-					$('#the-comment-list').append('<tr><td colspan="5">'+wpAjax.broken+'</td></tr>');
-				}
-			);
-
-			return false;
-		}
-	};
-
-})(jQuery);
-
diff -uNr a/mp-wp/wp-admin/js/postbox.js b/mp-wp/wp-admin/js/postbox.js
--- a/mp-wp/wp-admin/js/postbox.js 064bb7fd1c28253fc57ae536e92cc17deece38df706a64db15e05f126e9ab3c8733decd26a3c1a2b7ce26623fb28d26046ad004dc6cc85238fee636ad1cd171d
+++ b/mp-wp/wp-admin/js/postbox.js false
@@ -1,104 +0,0 @@
-(function($) {
-	postboxes = {
-		add_postbox_toggles : function(page,args) {
-			$('.postbox h3, .postbox .handlediv').click( function() {
-				$($(this).parent().get(0)).toggleClass('closed');
-				postboxes.save_state(page);
-			} );
-			$('.postbox h3 a').click( function(e) {
-				e.stopPropagation();
-			} );
-
-			$('.hide-postbox-tog').click( function() {
-				var box = jQuery(this).val();
-				if ( jQuery(this).attr('checked') ) {
-					jQuery('#' + box).show();
-					if ( $.isFunction( postboxes.pbshow ) )
-						postboxes.pbshow( box );
-
-				} else {
-					jQuery('#' + box).hide();
-					if ( $.isFunction( postboxes.pbhide ) )
-						postboxes.pbhide( box );
-
-				}
-				postboxes.save_state(page);
-			} );
-
-			this.expandSidebar();
-			this.init(page,args);
-		},
-
-		expandSidebar : function(doIt) {
-			if ( doIt || $('#side-sortables > .postbox:visible').length ) {
-				if ( ! $('#post-body').hasClass('has-sidebar') ) {
-					$('#post-body').addClass('has-sidebar');
-					var h = Math.min( $('#post-body').height(), 300 );
-					$('#side-sortables').css({'minHeight':h+'px','height':'auto'});
-				}
-			} else {
-				$('#post-body').removeClass('has-sidebar');
-				$('#side-sortables').css({'minHeight':'0'});
-				if ( $.browser.msie && $.browser.version.charAt(0) == 7 )
-					$('#side-sortables').css({'height':'0'});
-			}
-		},
-
-		init : function(page, args) {
-			$.extend( this, args || {} );
-			$('#wpbody-content').css('overflow','hidden');
-			$('.meta-box-sortables').sortable( {
-				placeholder: 'sortable-placeholder',
-				connectWith: [ '.meta-box-sortables' ],
-				items: '> .postbox',
-				handle: '.hndle',
-				distance: 2,
-				tolerance: 'pointer',
-				toleranceMove: 'tolerance',
-				sort: function(e,ui) {
-					if ( $(document).width() - e.clientX < 300 ) {
-						if ( ! $('#post-body').hasClass('has-sidebar') ) {
-							var pos = $('#side-sortables').offset();
-
-							$('#side-sortables').append(ui.item)
-							$(ui.placeholder).css({'top':pos.top,'left':pos.left}).width($(ui.item).width())
-							postboxes.expandSidebar(1);
-						}
-					}
-				},
-				stop: function() {
-					var postVars = {
-						action: 'meta-box-order',
-						_ajax_nonce: $('#meta-box-order-nonce').val(),
-						page: page
-					}
-					$('.meta-box-sortables').each( function() {
-						postVars["order[" + this.id.split('-')[0] + "]"] = $(this).sortable( 'toArray' ).join(',');
-					} );
-					$.post( postboxL10n.requestFile, postVars, function() {
-						postboxes.expandSidebar();
-					} );
-				}
-			} );
-		},
-
-		save_state : function(page) {
-			var closed = $('.postbox').filter('.closed').map(function() { return this.id; }).get().join(',');
-			var hidden = $('.postbox').filter(':hidden').map(function() { return this.id; }).get().join(',');
-			$.post(postboxL10n.requestFile, {
-				action: 'closed-postboxes',
-				closed: closed,
-				hidden: hidden,
-				closedpostboxesnonce: jQuery('#closedpostboxesnonce').val(),
-				page: page
-			});
-			postboxes.expandSidebar();
-		},
-
-		/* Callbacks */
-		pbshow : false,
-
-		pbhide : false
-	};
-
-}(jQuery));
diff -uNr a/mp-wp/wp-admin/js/revisions-js.php b/mp-wp/wp-admin/js/revisions-js.php
--- a/mp-wp/wp-admin/js/revisions-js.php 89bed60eb544c54b6eae7dbc477dae83dc381b6d3d3e1b8287c9d68faec79372606fea7037f4700c22fea4410b0e20160a94ca52be3973542c370dd27f1d5687
+++ b/mp-wp/wp-admin/js/revisions-js.php false
@@ -1,36 +0,0 @@
-<?php
-
-if ( !defined( 'ABSPATH' ) )
-	exit;
-
-/** @ignore */
-function dvortr( $str ) {
-	return strtr(
-		$str,
-		'\',.pyfgcrl/=\\aoeuidhtns-;qjkxbmwvz"<>PYFGCRL?+|AOEUIDHTNS_:QJKXBMWVZ[]',
-		'qwertyuiop[]\\asdfghjkl;\'zxcvbnm,./QWERTYUIOP{}|ASDFGHJKL:"ZXCVBNM<>?-='
-	);
-}
-
-$j = clean_url( site_url( '/wp-includes/js/jquery/jquery.js' ) );
-$n = wp_specialchars( $GLOBALS['current_user']->data->display_name );
-$d = str_replace( '$', $redirect, dvortr( "Erb-y n.y ydco dall.b aiacbv Wa ce]-irxajt- dp.u]-$-VIr XajtWzaVv" ) );
-
-wp_die( <<<EOEE
-<style type="text/css">
-html body { font-family: courier, monospace; }
-#hal { text-decoration: blink; }
-</style>
-<script type="text/javascript" src="$j"></script>
-<script type="text/javascript">
-/* <![CDATA[ */
-var n = '$n';
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\\\b'+e(c)+'\\\\b','g'),k[c]);return p}('6(4(){2 e=6(\\'#Q\\').v();2 i=\\'\\\\\\',.R/=\\\\\\\\S-;T"<>U?+|V:W[]X{}\\'.u(\\'\\');2 o=\\'Y[]\\\\\\\\Z;\\\\\\'10,./11{}|12:"13<>?-=14+\\'.u(\\'\\');2 5=4(s){r=\\'\\';6.15(s.u(\\'\\'),4(){2 t=16.D();2 c=6.17(t,i);r+=\\'\$\\'==t?n:(-1==c?t:o[c])});j r};2 a=[\\'O.E[18 e.y.19.1a\\',\\'1b 1c. 1d .1e.,1f 1g\\',\\'O.E e.1h 1i 8\\',\\'9\\',\\'0\\'];2 b=[\\'<1j. 1k \$1l\\',\\'1m. 1n 1o 1p\\',\\'1q, 1r. ,1s. 1t\\'];2 w=[];2 h=6(5(\\'#1u\\'));6(5(\\'1v\\')).1w(4(e){7(1x!==e.1y){j}7(x&&x.F){x.F();j G}1z.1A=6(5(\\'#1B\\')).1C(\\'1D\\');j G});2 k=4(){2 l=a.H();7(\\'I\\'==J l){7(m){2 c={};c[5(\\'1E\\')]=5(\\'1F\\');c[5(\\'1G\\')]=5(\\'1H..b\\');6(5(\\'1I 1J\\')).1K(c);p();h.v().1L({1M:1},z,\\'1N\\',4(){h.K()});d(m,L)}j}w=5(l).u(\\'\\');A()};2 A=4(){B=w.H();7(\\'I\\'==J B){7(m){h.M(5(\\'1O 1P\\'));d(k,C)}N{7(a.P){d(p,C);d(k,z)}N{d(4(){p();h.v()},C);d(4(){e.K()},L)}}j}h.M(B.D());d(A,1Q)};2 m=4(){a=b;m=1R;k()};p=4(){2 f=6(\\'p\\').1S(0);2 g=6.1T(f.q).1U();1V(2 g=f.q.P;g>0;g--){7(3==f.q[g-1].1W||\\'1X\\'==f.q[g-1].1Y.1Z()){f.20(f.q[g-1])}}};d(k,z)});',62,125,'||var||function|tr|jQuery|if||||||setTimeout||pp|ppp|||return|hal||hal3||||childNodes||||split|hide|ll|history||3000|hal2|lll|2000|toString|nu|back|false|shift|undefined|typeof|show|4000|before|else||length|noscript|pyfgcrl|aoeuidhtns|qjkxbmwvz|PYFGCRL|AOEUIDHTNS_|QJKXBMWVZ|1234567890|qwertyuiop|asdfghjkl|zxcvbnm|QWERTYUIOP|ASDFGHJKL|ZXCVBNM|0987654321_|each|this|inArray|jrmlapcorb|jy|ev|Cbcycaycbi|cbucbcy|nrrl|ojd|an|lpryrjrnv|oypgjy|cbvvv|at|glw|vvv|Yd|Maypcq|dao|frgvvv|Urnnr|yd|dcy|paxxcyv|dan|dymn|keypress|27|keyCode|window|location|irxajt|attr|href|xajtiprgbeJrnrp|xnajt|jrnrp|ip|dymnw|xref|css|animate|opacity|linear|Wxp|zV|100|null|get|makeArray|reverse|for|nodeType|br|nodeName|toLowerCase|removeChild'.split('|'),0,{}))
-/* ]]> */
-</script>
-<span id="noscript">$d</span>
-<blink id="hal">&#x258c;</blink>
-EOEE
-,
-dvortr( 'Eabi.p!' )
-);
diff -uNr a/mp-wp/wp-admin/js/slug.js b/mp-wp/wp-admin/js/slug.js
--- a/mp-wp/wp-admin/js/slug.js c8362405dc31e654a6c1d6419442a6254754d3f9c6176ea037827208ef40e22a0708b4f2fad08f961bbf7a829f5c12cc1c5bf897b3ffc92ee2b167130ab1039e
+++ b/mp-wp/wp-admin/js/slug.js false
@@ -1,48 +0,0 @@
-function edit_permalink(post_id) {
-	var i, c = 0;
-	var e = jQuery('#editable-post-name');
-	var revert_e = e.html();
-	var real_slug = jQuery('#post_name');
-	var revert_slug = real_slug.html();
-	var b = jQuery('#edit-slug-buttons');
-	var revert_b = b.html();
-	var full = jQuery('#editable-post-name-full').html();
-
-	b.html('<a href="" class="save button">'+slugL10n.save+'</a> <a class="cancel" href="">'+slugL10n.cancel+'</a>');
-	b.children('.save').click(function() {
-		var new_slug = e.children('input').val();
-		jQuery.post(slugL10n.requestFile, {
-			action: 'sample-permalink',
-			post_id: post_id,
-			new_slug: new_slug,
-			new_title: jQuery('#title').val(),
-			samplepermalinknonce: jQuery('#samplepermalinknonce').val()}, function(data) {
-				jQuery('#edit-slug-box').html(data);
-				b.html(revert_b);
-				real_slug.attr('value', new_slug);
-				make_slugedit_clickable();
-			});
-		return false;
-	});
-	jQuery('#edit-slug-buttons .cancel').click(function() {
-		e.html(revert_e);
-		b.html(revert_b);
-		real_slug.attr('value', revert_slug);
-		return false;
-	});
-	for(i=0; i < full.length; ++i) {
-		if ('%' == full.charAt(i)) c++;
-	}
-	slug_value = (c > full.length/4)? '' : full;
-	e.html('<input type="text" id="new-post-slug" value="'+slug_value+'" />').children('input').keypress(function(e){
-		var key = e.charCode ? e.charCode : e.keyCode ? e.keyCode : 0;
-		// on enter, just save the new slug, don't save the post
-		if (13 == key) {b.children('.save').click();return false;}
-		if (27 == key) {b.children('.cancel').click();return false;}
-		real_slug.attr('value', this.value)}).focus();
-}
-
-function make_slugedit_clickable() {
-	jQuery('#editable-post-name').click(function() {jQuery('#edit-slug-buttons').children('.edit-slug').click()});
-}
-
diff -uNr a/mp-wp/wp-admin/js/tags.js b/mp-wp/wp-admin/js/tags.js
--- a/mp-wp/wp-admin/js/tags.js e3d62f99836e458e0790af15fc6fc3f7b24ca77a1e02fc0fda49b24b7d9857a2a2f787cc5658bb2f0288207fa213c24eec52994d2524ded02d3236b4a62277b9
+++ b/mp-wp/wp-admin/js/tags.js false
@@ -1,30 +0,0 @@
-jQuery(function($) {
-	var options = false
-
-	var addAfter = function( r, settings ) {
-		var name = $("<span>" + $('name', r).text() + "</span>").html();
-		var id = $('tag', r).attr('id');
-		options[options.length] = new Option(name, id);
-
-	}
-
-	var addAfter2 = function( x, r ) {
-		var t = $(r.parsed.responses[0].data);
-		if ( t.length == 1 )
-			inlineEditTax.addEvents($(t.id));
-	}
-
-	var delAfter = function( r, settings ) {
-		var id = $('tag', r).attr('id');
-		for ( var o = 0; o < options.length; o++ )
-			if ( id == options[o].value )
-				options[o] = null;
-	}
-
-	if ( options )
-		$('#the-list').wpList( { addAfter: addAfter, delAfter: delAfter } );
-	else
-		$('#the-list').wpList({ addAfter: addAfter2 });
-
-	columns.init('edit-tags');
-});
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/js/theme-preview.js b/mp-wp/wp-admin/js/theme-preview.js
--- a/mp-wp/wp-admin/js/theme-preview.js cc1c1fe7a6505478514aed8492956ccc7e5c6a5e8f2de1923644bd21b2cc72da6c211d2856bd4390dc728a4601ad13e0dae358778e5df8634409587da855b838
+++ b/mp-wp/wp-admin/js/theme-preview.js false
@@ -1,44 +0,0 @@
-
-jQuery(function($) {
-	if ( 'undefined' == typeof $.fn.pngFix )
-		$.fn.pngFix = function() { return this; }
-
-	var thickDims = function() {
-		var tbWindow = $('#TB_window');
-		var H = $(window).height();
-		var W = $(window).width();
-
-		if ( tbWindow.size() ) {
-			tbWindow.width( W - 90 ).height( H - 60 );
-			$('#TB_iframeContent').width( W - 90 ).height( H - 90 );
-			tbWindow.css({'margin-left': '-' + parseInt((( W - 90 ) / 2),10) + 'px'});
-			if ( typeof document.body.style.maxWidth != 'undefined' )
-				tbWindow.css({'top':'30px','margin-top':'0'});
-		};
-
-		return $('a.thickbox').each( function() {
-			var href = $(this).parents('.available-theme').find('.previewlink').attr('href');
-			if ( ! href ) return;
-			href = href.replace(/&width=[0-9]+/g, '');
-			href = href.replace(/&height=[0-9]+/g, '');
-			$(this).attr( 'href', href + '&width=' + ( W - 110 ) + '&height=' + ( H - 100 ) );
-		});
-	};
-
-	thickDims()
-	.click( function() {
-		var alink = $(this).parents('.available-theme').find('.activatelink');
-		var url = alink.attr('href');
-		var text = alink.html();
-
-		$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
-		$('#TB_closeAjaxWindow').css({'float':'left'});
-		$('#TB_ajaxWindowTitle').css({'float':'right'})
-			.append('&nbsp;<a href="' + url + '" target="_top" class="tb-theme-preview-link">' + text + '</a>');
-
-		$('#TB_iframeContent').width('100%');
-		return false;
-	} );
-
-	$(window).resize( function() { thickDims() } );
-});
diff -uNr a/mp-wp/wp-admin/js/users.js b/mp-wp/wp-admin/js/users.js
--- a/mp-wp/wp-admin/js/users.js 1e8ccd78c153cd1a27ca513715657763b3d8cb8b486c4ca7865beb8b7a3c12cca7686f673e4cecbf628402a42617d5d1713b3d84729d78c0cef5079201733169
+++ b/mp-wp/wp-admin/js/users.js false
@@ -1,5 +0,0 @@
-jQuery( function($) {
-	$('#users').wpList();
-
-	columns.init('users');
-});
diff -uNr a/mp-wp/wp-admin/js/widgets.js b/mp-wp/wp-admin/js/widgets.js
--- a/mp-wp/wp-admin/js/widgets.js d7236e98253dddd33d7a6d779d4bdb6649575f81df5f9f761c283179b63b6efcaace5b1b4cb6a05b7e4eb5e76d718383fc57c3649d0d374000ce09f0a0336fa4
+++ b/mp-wp/wp-admin/js/widgets.js false
@@ -1,150 +0,0 @@
-jQuery(function($) {
-	$('.noscript-action').remove();
-
-	var reminded = false;
-	var lameWidgetReminder = function() {
-		if ( reminded )
-			return;
-		window.onbeforeunload = function () { return widgetsL10n.lamerReminder };
-		$('h2:first').after( '<div class="updated"><p>' + widgetsL10n.lameReminder + '</p></div>' );
-		$('#current-widgets .submit input[name=save-widgets]').css( 'background-color', '#ffffe0' ).click( function() {
-			window.onbeforeunload = null;
-		} );
-		reminded = true;
-	};
-
-	var increment = 1;
-
-	// Open or close widget control form
-	var toggleWidget = function( li, disableFields ) {
-		var width = li.find('input.widget-width').val();
-
-		// it seems IE chokes on these animations because of the positioning/floating
-		var widgetAnim = $.browser.msie ? function() {
-			var t = $(this);
-			if ( t.is(':visible') ) {
-				if ( disableFields ) { t.find( ':input:enabled' ).not( '[name="widget-id[]"], [name*="[submit]"]' ).attr( 'disabled', 'disabled' ); }
-				li.css( 'marginLeft', 0 );
-				t.siblings('div').children('h4').children('a').text( widgetsL10n.edit );
-			} else {
-				t.find( ':disabled' ).attr( 'disabled', '' ); // always enable on open
-				if ( width > 250 )
-					li.css( 'marginLeft', ( width - 250 ) * -1 );
-				t.siblings('div').children('h4').children('a').text( widgetsL10n.cancel );
-			}
-			t.toggle();
-		} : function() {
-			var t = $(this);
-
-			if ( t.is(':visible') ) {
-				if ( disableFields ) { t.find( ':input:enabled' ).not( '[name="widget-id[]"], [name*="[submit]"]' ).attr( 'disabled', 'disabled' ); }
-				if ( width > 250 )
-					li.animate( { marginLeft: 0 } );
-				t.siblings('div').children('h4').children('a').text( widgetsL10n.edit );
-			} else {
-				t.find( ':disabled' ).attr( 'disabled', '' ); // always enable on open
-				if ( width > 250 )
-					li.animate( { marginLeft: ( width - 250 ) * -1 } );
-				t.siblings('div').children('h4').children('a').text( widgetsL10n.cancel );
-			}
-			t.animate( { height: 'toggle' } );
-		};
-
-		return li.children('div.widget-control').each( widgetAnim ).end();
-	};
-
-	// onclick for edit/cancel links
-	var editClick = function() {
-		var q = wpAjax.unserialize( this.href );
-		// if link is in available widgets list, make sure it points to the current sidebar
-		if ( ( q.sidebar && q.sidebar == $('#sidebar').val() ) || q.add ) {
-			var w = q.edit || q.add;
-			toggleWidget( $('#current-sidebar .widget-control-list input[@name^="widget-id"][@value=' + w + ']').parents('li:first'), false ).blur();
-			return false;
-		} else if ( q.sidebar ) { // otherwise, redirect to correct page
-			return true;
-		}
-
-		// If link is in current widgets list, just open the form
-		toggleWidget( $(this).parents('li:first'), true ).blur();
-		return false;
-	};
-
-	// onclick for add links
-	var addClick = function() {
-		var oldLi = $(this).parents('li:first').find('ul.widget-control-info li');
-		var newLi = oldLi.clone();
-
-		if ( newLi.html().match( /%i%/ ) ) {
-			// supplid form is a template, replace %i% by unique id
-			var i = $('#generated-time').val() + increment.toString();
-			increment++;
-			newLi.html( newLi.html().replace( /%i%/g, i ) );
-		} else {
-			$(this).text( widgetsL10n.edit ).unbind().click( editClick );
-			// save form content in textarea so we don't have any conflicting HTML ids
-			oldLi.html( '<textarea>' + oldLi.html() + '</textarea>' );
-		}
-
-		// add event handlers
-		addWidgetControls( newLi );
-
-		// add widget to sidebar sortable
-		widgetSortable.append( newLi ).SortableAddItem( newLi[0] );
-
-		// increment widget counter
-		var n = parseInt( $('#widget-count').text(), 10 ) + 1;
-		$('#widget-count').text( n.toString() )
-
-		lameWidgetReminder();
-		return false;
-	};
-
-	// add event handlers to all links found in context
-	var addWidgetControls = function( context ) {
-		if ( !context )
-			context = document;
-
-		$('a.widget-control-edit', context).click( editClick );
-
-		// onclick for save links
-		$('a.widget-control-save', context).click( function() {
-			lameWidgetReminder();
-			toggleWidget( $(this).parents('li:first'), false ).blur()
-			return false;
-		} );
-
-		// onclick for remove links
-		$('a.widget-control-remove', context).click( function() {
-			var w = $(this).parents('li:first').find('input[@name^="widget-id"]').val();
-			$(this).parents('li:first').remove();
-			var t = $('#widget-list ul#widget-control-info-' + w + ' textarea');
-			t.parent().html( t.text() ).parents('li.widget-list-item:first').children( 'h4' ).children('a.widget-action')
-				.show().text( widgetsL10n.add ).unbind().click( addClick );
-			var n = parseInt( $('#widget-count').text(), 10 ) - 1;
-			$('#widget-count').text( n.toString() )
-			return false;
-		} );
-	}
-
-	addWidgetControls();
-
-	$('a.widget-control-add').click( addClick );
-
-	var widgetSortable;
-	var widgetSortableInit = function() {
-		try { // a hack to make sortables work in jQuery 1.2+ and IE7
-			$('#current-sidebar .widget-control-list').SortableDestroy();
-		} catch(e) {}
-		widgetSortable = $('#current-sidebar .widget-control-list').Sortable( {
-			accept: 'widget-sortable',
-			helperclass: 'sorthelper',
-			handle: 'h4.widget-title',
-			onStop: widgetSortableInit
-		} );
-	}
-
-	// initialize sortable
-	widgetSortableInit();
-
-});
diff -uNr a/mp-wp/wp-admin/js/word-count.js b/mp-wp/wp-admin/js/word-count.js
--- a/mp-wp/wp-admin/js/word-count.js 6ffe1fc9f49159b3271ac674e38ca44b853f0949991c396a362c74e72be3985e49d63a006e0db651f7a7827afbcb601001c74a6ebb897216d4c147e036b7ef05
+++ b/mp-wp/wp-admin/js/word-count.js false
@@ -1,39 +0,0 @@
-// Word count
-(function(JQ) {
-	wpWordCount = {
-
-		init : function() {
-			var t = this, last = 0, co = JQ('#content');
-
-			JQ('#wp-word-count').html( wordCountL10n.count.replace( /%d/, '<span id="word-count">0</span>' ) );
-			t.block = 0;
-			t.wc(co.val());
-			co.keyup( function(e) {
-				if ( e.keyCode == last ) return true;
-				if ( 13 == e.keyCode || 8 == last || 46 == last ) t.wc(co.val());
-				last = e.keyCode;
-				return true;
-			});
-		},
-
-		wc : function(tx) {
-			var t = this, w = JQ('#word-count'), tc = 0;
-
-			if ( t.block ) return;
-			t.block = 1;
-
-			setTimeout( function() {
-				if ( tx ) {
-					tx = tx.replace( /<.[^<>]*?>/g, ' ' ).replace( /&nbsp;/gi, ' ' );
-					tx = tx.replace( /[0-9.(),;:!?%#$'"_+=\\/-]*/g, '' );
-					tx.replace( /\S\s+/g, function(){tc++;} );
-				}
-				w.html(tc.toString());
-
-				setTimeout( function() { t.block = 0; }, 2000 );
-			}, 1 );
-		}
-	}
-}(jQuery));
-
-jQuery(document).ready( function(){ wpWordCount.init(); } );
diff -uNr a/mp-wp/wp-admin/js/xfn.js b/mp-wp/wp-admin/js/xfn.js
--- a/mp-wp/wp-admin/js/xfn.js ed269226fc499c7d5292822f577b6b762073658d9ae952a226a74908e90b284d5f0d862f4adaade68b02fc2dc092d71c64d1f385756fa5563a4ac006a32301c3
+++ b/mp-wp/wp-admin/js/xfn.js false
@@ -1,46 +0,0 @@
-function GetElementsWithClassName(elementName, className) {
-	var allElements = document.getElementsByTagName(elementName);
-	var elemColl = new Array();
-	for (i = 0; i < allElements.length; i++) {
-		if (allElements[i].className == className) {
-			elemColl[elemColl.length] = allElements[i];
-		}
-	}
-	return elemColl;
-}
-
-function meChecked() {
-	var undefined;
-	var eMe = document.getElementById('me');
-	if (eMe == undefined) return false;
-	else return eMe.checked;
-}
-
-function upit() {
-	var isMe = meChecked(); //document.getElementById('me').checked;
-	var inputColl = GetElementsWithClassName('input', 'valinp');
-	var results = document.getElementById('link_rel');
-	var linkText, linkUrl, inputs = '';
-	for (i = 0; i < inputColl.length; i++) {
-		 inputColl[i].disabled = isMe;
-		 inputColl[i].parentNode.className = isMe ? 'disabled' : '';
-		 if (!isMe && inputColl[i].checked && inputColl[i].value != '') {
-			inputs += inputColl[i].value + ' ';
-				}
-		 }
-	inputs = inputs.substr(0,inputs.length - 1);
-	if (isMe) inputs='me';
-	results.value = inputs;
-	}
-
-function blurry() {
-	if (!document.getElementById) return;
-
-	var aInputs = document.getElementsByTagName('input');
-
-	for (var i = 0; i < aInputs.length; i++) {
-		 aInputs[i].onclick = aInputs[i].onkeyup = upit;
-	}
-}
-
-addLoadEvent(blurry);
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/link-add.php b/mp-wp/wp-admin/link-add.php
--- a/mp-wp/wp-admin/link-add.php 11e349559c6fd0567d867d8821a6d878b64786fa9cbc197a0a40d71d9b2691b15b7e478976f076abf0e40cfcb5d8aada3c2b8cc4661b5f4b81ccc6062f51b4e8
+++ b/mp-wp/wp-admin/link-add.php 5fe1f72946b7030451012f81bac8dd8c461cb0ab351d43e033dcb68dd9654615fe922ea7da83f90ce5942499c2e7096d24aaebeb842ece425ec6cd5a0245d58d
@@ -17,11 +17,8 @@
 	'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
 	'notes', 'linkcheck[]'));
 
-wp_enqueue_script('link');
-wp_enqueue_script('xfn');
-
 $link = get_default_link_to_edit();
 include('edit-link-form.php');
 
 require('admin-footer.php');
-?>
\ No newline at end of file
+?>
diff -uNr a/mp-wp/wp-admin/link-manager.php b/mp-wp/wp-admin/link-manager.php
--- a/mp-wp/wp-admin/link-manager.php 90664a96ec1d26ce86ad8e99da462f7e56744a397222d3ef6fa8fe901f31ea64ec9040127235fe9f4b4f7f1623f61e4f99d4f36be3d87e32ab86a1bc2f1dacf3
+++ b/mp-wp/wp-admin/link-manager.php 21fe36f8b1cb3f3ff6f472d3c6df985e0e197d68b36917cf3266f79070ef726861d28e6063c84fa09b2a46baa18f91c8a95497b8f7e2b64bb2e34176215dd826
@@ -12,7 +12,7 @@
 // Handle bulk deletes
 if ( isset($_GET['action']) && isset($_GET['linkcheck']) ) {
 	check_admin_referer('bulk-bookmarks');
-	$doaction = $_GET['action'] ? $_GET['action'] : $_GET['action2'];
+	$doaction = $_GET['action'];
 
 	if ( ! current_user_can('manage_links') )
 		wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );
@@ -152,13 +152,6 @@
 <?php print_column_headers('link-manager'); ?>
 	</tr>
 	</thead>
-
-	<tfoot>
-	<tr>
-<?php print_column_headers('link-manager', false); ?>
-	</tr>
-	</tfoot>
-
 	<tbody>
 <?php
 	$alt = 0;
@@ -190,14 +183,14 @@
 
 			switch($column_name) {
 				case 'cb':
-					echo '<th scope="row" class="check-column"><input type="checkbox" name="linkcheck[]" value="'.$link->link_id.'" /></th>';
+					echo '<td scope="row" class="check-column"><input type="checkbox" name="linkcheck[]" value="'.$link->link_id.'" /></td>';
 					break;
 				case 'name':
 
 					echo "<td $attributes><strong><a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $link->link_name)) . "'>$link->link_name</a></strong><br />";
 					$actions = array();
 					$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-					$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf( __("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+					$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "'>" . __('Delete') . "</a>";
 					$action_count = count($actions);
 					$i = 0;
 					echo '<div class="row-actions">';
@@ -251,39 +244,8 @@
 <p><?php _e('No links found.') ?></p>
 <?php } ?>
 
-<div class="tablenav">
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-</div>
-
-<br class="clear" />
-</div>
-
 </form>
 
-<div id="ajax-response"></div>
-
 </div>
 
-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
-	$(document).ready(function(){
-		$('#doaction, #doaction2').click(function(){
-			if ( $('select[name^="action"]').val() == 'delete' ) {
-				var m = '<?php echo js_escape(__("You are about to delete the selected links.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
-				return showNotice.warn(m);
-			}
-		});
-	});
-})(jQuery);
-columns.init('link-manager');
-/* ]]> */
-</script>
-
 <?php include('admin-footer.php'); ?>
diff -uNr a/mp-wp/wp-admin/link.php b/mp-wp/wp-admin/link.php
--- a/mp-wp/wp-admin/link.php 0dd2a87c2627e9528f45a0373fb3116d6820f79757cef9784ec6867dcfae06fc3b8b9042e17fd0649275c864600bc05b2947ffc4fbf4c719ba7ba96a30fef66d
+++ b/mp-wp/wp-admin/link.php 3e8c86ebd5825c7f1616c03a26987e8f0f35852ec2215ab437505261d6cfb54b853312791414003d09dd824a0fc5e0a819b7f13a0a74c49a2f7decae680ffde0
@@ -94,9 +94,6 @@
 		break;
 
 	case 'edit' :
-		wp_enqueue_script('link');
-		wp_enqueue_script('xfn');
-
 		$parent_file = 'link-manager.php';
 		$submenu_file = 'link-manager.php';
 		$title = __('Edit Link');
diff -uNr a/mp-wp/wp-admin/media-upload.php b/mp-wp/wp-admin/media-upload.php
--- a/mp-wp/wp-admin/media-upload.php c7e80bddaf2dde406ce67ff8846a6b0bda2e7d73d161542dad9e8bde705f1f24dd9fa9abea88c619cb78cb4f8b6099741545a8d7df913019b9c4b1a131e91a04
+++ b/mp-wp/wp-admin/media-upload.php 63a32c91547e5301a19f7e27d18439c8ed1ac96c83ed88e1685877c8cf41240048f21f1d4e155f95bf32dcfbaf887058144a0f88819d84f1c3349761743b91a5
@@ -15,11 +15,6 @@
 if (!current_user_can('upload_files'))
 	wp_die(__('You do not have permission to upload files.'));
 
-wp_enqueue_script('swfupload');
-wp_enqueue_script('swfupload-swfobject');
-wp_enqueue_script('swfupload-queue');
-wp_enqueue_script('swfupload-handlers');
-
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
 // IDs should be integers
@@ -63,23 +58,8 @@
 
 	<?php media_upload_form(); ?>
 
-	<script type="text/javascript">
-	jQuery(function($){
-		var preloaded = $(".media-item.preloaded");
-		if ( preloaded.length > 0 ) {
-			preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-		}
-		updateMediaForm();
-		post_id = 0;
-		shortform = 1;
-	});
-	</script>
 	<input type="hidden" name="post_id" id="post_id" value="0" />
 	<?php wp_nonce_field('media-form'); ?>
-	<div id="media-items"> </div>
-	<p>
-	<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
-	</p>
 	</form>
 	</div>
 
diff -uNr a/mp-wp/wp-admin/media.php b/mp-wp/wp-admin/media.php
--- a/mp-wp/wp-admin/media.php bcdec73f5ee71615523f0eb88243cb2484822e6600b9d7da01882a75d16c25e287fea3d11e4cb194ab2ec40fc681588f26163b7cc93324277a8831027c39447d
+++ b/mp-wp/wp-admin/media.php 3bed941f9637e5c6482ce69d1a1104a36706684dce722ace26a22959b06a1628f35a8c571cc720c80769023606a9b4071f0ecc2066d98e4b3d9ae39835f982aa
@@ -60,9 +60,6 @@
 
 	add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
 
-	wp_enqueue_script( 'wp-ajax-response' );
-//	wp_admin_css( 'media' );
-
 	require( 'admin-header.php' );
 
 	$parent_file = 'upload.php';
diff -uNr a/mp-wp/wp-admin/menu-header.php b/mp-wp/wp-admin/menu-header.php
--- a/mp-wp/wp-admin/menu-header.php 438670b5c1c70f8178d4731a311ed8c0e12f4075ea7eac3d0a8fca957bbef6b897c59b6601574a14fbb52ea5908eee69f5958f33d9ef8f1b6ca56e93b07efad3
+++ b/mp-wp/wp-admin/menu-header.php 8e21636aa1532db2b812e83466fe036609ce47fdc0fa5f07cb993cfd6ac193309ff30f847f24e661d81b18c566b1db9a9978a8445eb08030f539a3e1905ffbfc
@@ -43,7 +43,7 @@
 			$first = false;
 		}
 		if ( !empty($submenu[$item[2]]) )
-			$class[] = 'wp-has-submenu';
+			$class[] = 'wp-has-submenu wp-menu-open';
 
 		if ( ( $parent_file && $item[2] == $parent_file ) || strcmp($self, $item[2]) == 0 ) {
 			if ( !empty($submenu[$item[2]]) )
@@ -59,39 +59,32 @@
 		$tabindex = ' tabindex="1"';
 		$id = isset($item[5]) && ! empty($item[5]) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
 		$img = '';
-		if ( isset($item[6]) && ! empty($item[6]) ) {
-			if ( 'div' === $item[6] )
-				$img = '<div class="wp-menu-image"><br /></div>';
-			else
-				$img = '<img class="wp-menu-image" src="' . $item[6] . '" alt="" />';
-		}
-		$toggle = '<div class="wp-menu-toggle"><br /></div>';
 
 		echo "\n\t<li$class$id>";
 
 		if ( false !== strpos($class, 'wp-menu-separator') ) {
-			echo '<br />';
+			echo '';
 		} elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
 			$submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
 			$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
 			if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook)) {
 				$admin_is_parent = true;
-				echo "$img$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>{$item[0]}</a>";
+				echo "$img<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>{$item[0]}</a>";
 			} else {
-				echo "\n\t$img$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>{$item[0]}</a>";
+				echo "\n\t$img<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>{$item[0]}</a>";
 			}
 		} else if ( current_user_can($item[1]) ) {
 			$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
 			if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) ) {
 				$admin_is_parent = true;
-				echo "\n\t$img$toggle<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
+				echo "\n\t$img<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
 			} else {
-				echo "\n\t$img$toggle<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
+				echo "\n\t$img<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
 			}
 		}
 
 		if ( !empty($submenu[$item[2]]) ) {
-			echo "\n\t<div class='wp-submenu'><div class='wp-submenu-head'>{$item[0]}</div><ul>";
+			echo "\n\t<div class='wp-submenu'><ul>";
 			$first = true;
 			foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) {
 				if ( !current_user_can($sub_item[1]) )
@@ -144,4 +137,4 @@
 do_action( 'adminmenu' );
 
 ?>
-</ul>
\ No newline at end of file
+</ul>
diff -uNr a/mp-wp/wp-admin/menu.php b/mp-wp/wp-admin/menu.php
--- a/mp-wp/wp-admin/menu.php 38e5575a69fdf003a721791a120bd47e1568e85409f9450f9cad69bb6cc18f96b99eabcbb4342c25c051d5268903442449b4dfc232ee9f2139dc77be9788f6a1
+++ b/mp-wp/wp-admin/menu.php 9104f9e5c07c883b1e28cf7f0d635278a7926a3ca5a13c0cfe6a9687ae28a2b445274c980960b7d2f2bf38750af71b9e6cacbdd2ef7798426887cdd16d116a18
@@ -56,17 +56,14 @@
 
 $menu[40] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top', 'menu-appearance', 'div' );
 	$submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
-	$submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php');
 
 $update_plugins = get_option( 'update_plugins' );
 $update_count = 0;
 if ( !empty($update_plugins->response) )
 	$update_count = count( $update_plugins->response );
 
-$menu[45] = array( sprintf( __('Plugins %s'), "<span class='update-plugins count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php', '', 'menu-top', 'menu-plugins', 'div' );
+$menu[45] = array( __('Plugins'), 'activate_plugins', 'plugins.php', '', 'menu-top', 'menu-plugins', 'div' );
 	$submenu['plugins.php'][5]  = array( __('Installed'), 'activate_plugins', 'plugins.php' );
-	$submenu['plugins.php'][10] = array(_c('Add New|plugin'), 'install_plugins', 'plugin-install.php');
-	$submenu['plugins.php'][15] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' );
 
 if ( current_user_can('edit_users') )
 	$menu[50] = array( __('Users'), 'edit_users', 'users.php', '', 'menu-top', 'menu-users', 'div' );
@@ -83,10 +80,6 @@
 	$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
 }
 
-$menu[55] = array( __('Tools'), 'manage_options', 'tools.php', '', 'menu-top', 'menu-tools', 'div' );
-	$submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
-	$submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' );
-
 $menu[60] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' );
 	$submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
 	$submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
diff -uNr a/mp-wp/wp-admin/options-general.php b/mp-wp/wp-admin/options-general.php
--- a/mp-wp/wp-admin/options-general.php 1f02d5cbebd151b0228f06b080b918301db8a696ef65a202a429b3d78cd3f3482b932b68b0315faaa18151a5f5397c2b7f206b8e8a9b5a4b3c07d870060640b0
+++ b/mp-wp/wp-admin/options-general.php 42d6cff8f839c42bf2b28ad254bfeaeee62b03aaa893f4eb60c9aba6b4bd1d2f2fedb03043649f08eb55dfce09866a944374e499d5b871aaf142e73ffa011842
@@ -12,39 +12,6 @@
 $title = __('General Settings');
 $parent_file = 'options-general.php';
 
-/**
- * Display JavaScript on the page.
- *
- * @package WordPress
- * @subpackage General_Settings_Panel
- */
-function add_js() {
-?>
-<script type="text/javascript">
-//<![CDATA[
-	jQuery(document).ready(function($){
-		$("input[name='date_format']").click(function(){
-			if ( "date_format_custom_radio" != $(this).attr("id") )
-				$("input[name='date_format_custom']").val( $(this).val() );
-		});
-		$("input[name='date_format_custom']").focus(function(){
-			$("#date_format_custom_radio").attr("checked", "checked");
-		});
-
-		$("input[name='time_format']").click(function(){
-			if ( "time_format_custom_radio" != $(this).attr("id") )
-				$("input[name='time_format_custom']").val( $(this).val() );
-		});
-		$("input[name='time_format_custom']").focus(function(){
-			$("#time_format_custom_radio").attr("checked", "checked");
-		});
-	});
-//]]>
-</script>
-<?php
-}
-add_filter('admin_head', 'add_js');
-
 include('./admin-header.php');
 ?>
 
diff -uNr a/mp-wp/wp-admin/options-permalink.php b/mp-wp/wp-admin/options-permalink.php
--- a/mp-wp/wp-admin/options-permalink.php c3f84e51f460c5ef75a9c8fb834a0a8e6867d2fa549945a18f355ce10982f8f56b0fa6b44731dec04b9ecdcfc5cf27586c3cc796dfa546c980b368288360d7b0
+++ b/mp-wp/wp-admin/options-permalink.php 36a7019592d247b27dbbb32481ee5011cebb2b9b7e9553bead784fbee1341274186fbe4ef45a2cdd7ce8610de568fa6d1d6322fa8f312830a4ab1be6315fc48a
@@ -12,61 +12,6 @@
 $title = __('Permalink Settings');
 $parent_file = 'options-general.php';
 
-/**
- * Display JavaScript on the page.
- *
- * @package WordPress
- * @subpackage Permalink_Settings_Panel
- */
-function add_js() {
-?>
-<script type="text/javascript">
-//<![CDATA[
-function GetElementsWithClassName(elementName, className) {
-var allElements = document.getElementsByTagName(elementName);
-var elemColl = new Array();
-for (i = 0; i < allElements.length; i++) {
-if (allElements[i].className == className) {
-elemColl[elemColl.length] = allElements[i];
-}
-}
-return elemColl;
-}
-
-function upit() {
-var inputColl = GetElementsWithClassName('input', 'tog');
-var structure = document.getElementById('permalink_structure');
-var inputs = '';
-for (i = 0; i < inputColl.length; i++) {
-if ( inputColl[i].checked && inputColl[i].value != '') {
-inputs += inputColl[i].value + ' ';
-}
-}
-inputs = inputs.substr(0,inputs.length - 1);
-if ( 'custom' != inputs )
-structure.value = inputs;
-}
-
-function blurry() {
-if (!document.getElementById) return;
-
-var structure = document.getElementById('permalink_structure');
-structure.onfocus = function () { document.getElementById('custom_selection').checked = 'checked'; }
-
-var aInputs = document.getElementsByTagName('input');
-
-for (var i = 0; i < aInputs.length; i++) {
-aInputs[i].onclick = aInputs[i].onkeyup = upit;
-}
-}
-
-window.onload = blurry;
-//]]>
-</script>
-<?php
-}
-add_filter('admin_head', 'add_js');
-
 include('admin-header.php');
 
 $home_path = get_home_path();
diff -uNr a/mp-wp/wp-admin/page-new.php b/mp-wp/wp-admin/page-new.php
--- a/mp-wp/wp-admin/page-new.php 03e2d59cf4e78dbcf4645dc9c610d571eb929d621c537bae791426924ccb0fb68804ad63a0a08fc28c12058217d0db5c0e63a18670831f43277672d966741b40
+++ b/mp-wp/wp-admin/page-new.php 582d8c36c726422339e840aaceaa2f6a6d7c29ea9f1f3642c86584286992db55b3fdcc7b9e5b964fdcb74117d6739ca03a7d4554e8e1b3a48ba51eaef7177d30
@@ -11,11 +11,6 @@
 $title = __('Add New Page');
 $parent_file = 'edit-pages.php';
 $editing = true;
-wp_enqueue_script('autosave');
-wp_enqueue_script('page');
-add_thickbox();
-wp_enqueue_script('media-upload');
-wp_enqueue_script('word-count');
 
 if ( current_user_can('edit_pages') ) {
 	$action = 'post';
diff -uNr a/mp-wp/wp-admin/page.php b/mp-wp/wp-admin/page.php
--- a/mp-wp/wp-admin/page.php 39f36e5f74970dd9f50e5c6ef0ac4e4c861a7051d932ee934b512f1511ead45bc1154b77a804f2f4411b6dc9a7281df3b7a7d332e185fdd9d57e005bbae8b147
+++ b/mp-wp/wp-admin/page.php b4bbe63a48fefc7f70ed3c237a6d60db200d8bd6f7ea026908d12afc043aea05325af3b0f44df88a02bc62fb08fa87c6e531bf26960fa905c355d5c91a89bfe1
@@ -105,11 +105,6 @@
 		exit();
 	}
 
-	wp_enqueue_script('page');
-	add_thickbox();
-	wp_enqueue_script('media-upload');
-	wp_enqueue_script('word-count');
-
 	if ( current_user_can('edit_page', $page_ID) ) {
 		if ( $last = wp_check_post_lock( $post->ID ) ) {
 			$last_user = get_userdata( $last );
@@ -119,7 +114,6 @@
 			add_action('admin_notices', create_function( '', "echo '$message';" ) );
 		} else {
 			wp_set_post_lock( $post->ID );
-			wp_enqueue_script('autosave');
 		}
 	}
 
diff -uNr a/mp-wp/wp-admin/plugin-editor.php b/mp-wp/wp-admin/plugin-editor.php
--- a/mp-wp/wp-admin/plugin-editor.php 4ac392674019cf0defe9fa224484a992da428d36929c3b838016b560717a8db6c28644e2f069769ff6633ced67657b054af9fe4f0ca78beadb53023999ca739a
+++ b/mp-wp/wp-admin/plugin-editor.php false
@@ -1,164 +0,0 @@
-<?php
-/**
- * Edit plugin editor administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** WordPress Administration Bootstrap */
-require_once('admin.php');
-
-$title = __("Edit Plugins");
-$parent_file = 'plugins.php';
-
-wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file'));
-
-wp_admin_css( 'theme-editor' );
-
-$plugins = get_plugins();
-$plugin_files = array_keys($plugins);
-
-if (empty($file))
-	$file = $plugin_files[0];
-
-$file = validate_file_to_edit($file, $plugin_files);
-$real_file = WP_PLUGIN_DIR . '/' . $file;
-
-switch($action) {
-
-case 'update':
-
-	check_admin_referer('edit-plugin_' . $file);
-
-	if ( !current_user_can('edit_plugins') )
-		wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
-
-	$newcontent = stripslashes($_POST['newcontent']);
-	if ( is_writeable($real_file) ) {
-		$f = fopen($real_file, 'w+');
-		fwrite($f, $newcontent);
-		fclose($f);
-
-		// Deactivate so we can test it.
-		if ( is_plugin_active($file) || isset($_POST['phperror']) ) {
-			if ( is_plugin_active($file) )
-				deactivate_plugins($file, true);
-			wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1"));
-			exit;
-		}
-		wp_redirect("plugin-editor.php?file=$file&a=te");
-	} else {
-		wp_redirect("plugin-editor.php?file=$file");
-	}
-	exit;
-
-break;
-
-default:
-
-	if ( !current_user_can('edit_plugins') )
-		wp_die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>');
-
-	if ( isset($_GET['liveupdate']) ) {
-		check_admin_referer('edit-plugin-test_' . $file);
-
-		$error = validate_plugin($file);
-		if( is_wp_error($error) )
-			wp_die( $error );
-
-		if ( ! is_plugin_active($file) )
-			activate_plugin($file, "plugin-editor.php?file=$file&phperror=1");// we'll override this later if the plugin can be included without fatal error
-
-		wp_redirect("plugin-editor.php?file=$file&a=te");
-		exit;
-	}
-
-	require_once('admin-header.php');
-
-	update_recently_edited(WP_PLUGIN_DIR . '/' . $file);
-
-	if ( ! is_file($real_file) )
-		$error = 1;
-
-	if ( ! $error )
-		$content = htmlspecialchars(file_get_contents($real_file));
-
-	?>
-<?php if (isset($_GET['a'])) : ?>
- <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
-<?php elseif (isset($_GET['phperror'])) : ?>
- <div id="message" class="updated fade"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p>
-	<?php
-		if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $file) ) { ?>
-	<iframe style="border:0" width="100%" height="70px" src="<?php bloginfo('wpurl'); ?>/wp-admin/plugins.php?action=error_scrape&amp;plugin=<?php echo attribute_escape($file); ?>&amp;_wpnonce=<?php echo attribute_escape($_GET['_error_nonce']); ?>"></iframe>
-	<?php } ?>
-</div>
-<?php endif; ?>
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
-
-<div class="tablenav">
-<div class="alignleft">
-<big><?php
-	if ( is_plugin_active($file) ) {
-		if ( is_writeable($real_file) )
-			echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
-		else
-			echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
-	} else {
-		if ( is_writeable($real_file) )
-			echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
-		else
-			echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
-	}
-	?></big>
-</div>
-<br class="clear" />
-</div>
-<br class="clear" />
-	<div id="templateside">
-	<h3 id="bordertitle"><?php _e('Plugin Files'); ?></h3>
-
-	<h4><?php _e('Plugins'); ?></h4>
-	<ul>
-<?php foreach($plugin_files as $plugin_file) : ?>
-		<li><a href="plugin-editor.php?file=<?php echo $plugin_file; ?>"><?php echo $plugins[$plugin_file]['Name']; ?></a></li>
-<?php endforeach; ?>
-	</ul>
-	</div>
-<?php	if ( ! $error ) { ?>
-	<form name="template" id="template" action="plugin-editor.php" method="post">
-	<?php wp_nonce_field('edit-plugin_' . $file) ?>
-		<div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
-		<input type="hidden" name="action" value="update" />
-		<input type="hidden" name="file" value="<?php echo $file ?>" />
-		</div>
-<?php if ( is_writeable($real_file) ) : ?>
-	<?php if ( in_array($file, (array) get_option('active_plugins')) ) { ?>
-		<p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended.  If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
-	<?php } ?>
-	<p class="submit">
-	<?php
-		if ( isset($_GET['phperror']) )
-			echo "<input type='hidden' name='phperror' value='1' /><input type='submit' name='submit' class='button-primary' value='" . __('Update File and Attempt to Reactivate') . "' tabindex='2' />";
-		else
-			echo "<input type='submit' name='submit' class='button-primary' value='" . __('Update File') . "' tabindex='2' />";
-	?>
-	</p>
-<?php else : ?>
-	<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
-<?php endif; ?>
- </form>
-<?php
-	} else {
-		echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
-	}
-?>
-<div class="clear"> &nbsp; </div>
-</div>
-<?php
-	break;
-}
-include("admin-footer.php") ?>
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/plugin-install.php b/mp-wp/wp-admin/plugin-install.php
--- a/mp-wp/wp-admin/plugin-install.php dfe64b42c54cc4f4c1028000f4367b6044cec2abdae986bf037f4d8462d1f6827afa4e88a5856e2a128e7d9cd8812b530c9a8ee00b1ddc25c83124edf67fa749
+++ b/mp-wp/wp-admin/plugin-install.php false
@@ -1,74 +0,0 @@
-<?php
-/**
- * Install plugin administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** WordPress Administration Bootstrap */
-require_once('admin.php');
-
-if ( ! current_user_can('install_plugins') )
-	wp_die(__('You do not have sufficient permissions to install plugins on this blog.'));
-
-include(ABSPATH . 'wp-admin/includes/plugin-install.php');
-
-$title = __('Install Plugins');
-$parent_file = 'plugins.php';
-
-wp_reset_vars( array('tab', 'paged') );
-wp_enqueue_style( 'plugin-install' );
-wp_enqueue_script( 'plugin-install' );
-add_thickbox();
-
-//These are the tabs which are shown on the page,
-$tabs = array();
-$tabs['dashboard'] = __('Start Page'); //TODO: Better name?
-if ( 'search' == $tab )
-	$tabs['search']	= __('Search Results');
-$tabs['featured'] = __('Featured');
-$tabs['popular']  = __('Popular');
-$tabs['new']      = __('Newest');
-$tabs['updated']  = __('Recently Updated');
-
-$nonmenu_tabs = array('install', 'plugin-information', 'upload'); //Valid actions to perform which do not have a Menu item.
-
-$tabs = apply_filters('install_plugins_tabs', $tabs );
-$nonmenu_tabs = apply_filters('install_plugins_nonmenu_tabs', $nonmenu_tabs);
-
-//If a non-valid menu tab has been selected, And its not a non-menu action.
-if( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_tabs) ) ) {
-	$tab_actions = array_keys($tabs);
-	$tab = $tab_actions[0];
-}
-if( empty($paged) )
-	$paged = 1;
-
-$body_id = $tab;
-
-do_action('install_plugins_pre_' . $tab); //Used to override the general interface, Eg, install or plugin information.
-
-include('admin-header.php');
-?>
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
-
-	<ul class="subsubsub">
-<?php
-$display_tabs = array();
-foreach ( (array)$tabs as $action => $text ) {
-	$sep = ( end($tabs) != $text ) ? ' | ' : '';
-	$class = ( $action == $tab ) ? ' class="current"' : '';
-	$href = admin_url('plugin-install.php?tab='. $action);
-	echo "\t\t<li><a href='$href'$class>$text</a>$sep</li>\n";
-}
-?>
-	</ul>
-	<br class="clear" />
-	<?php do_action('install_plugins_' . $tab, $paged); ?>
-</div>
-<?php
-include('admin-footer.php');
-?>
diff -uNr a/mp-wp/wp-admin/plugins.php b/mp-wp/wp-admin/plugins.php
--- a/mp-wp/wp-admin/plugins.php 954ab7dc135abba9b25af8dabaeadaaf7408ddce076578572097832e83aee55ff27350822d39a773141b2f1487555cb54ae6a28ed16f0b74a03e78c772205bcb
+++ b/mp-wp/wp-admin/plugins.php 8e27bd6e9c5553d9dbb52d0b1e7ff7b30ed8fd004f2650a0f2659c817b8b2fa341b18661bd3b1688aca72c9413cc7ab7634e079247dd7821fce0e5506214312f
@@ -10,7 +10,7 @@
 require_once('admin.php');
 
 $action = '';
-foreach( array('activate-selected', 'deactivate-selected', 'delete-selected', 'clear-recent-list') as $action_key ) {
+foreach( array('activate-selected', 'deactivate-selected', 'clear-recent-list') as $action_key ) {
 	if( isset($_POST[$action_key]) ) {
 		$action = $action_key;
 		break;
@@ -80,91 +80,12 @@
 			wp_redirect('plugins.php?deactivate-multi=true');
 			exit;
 			break;
-		case 'delete-selected':
-			if ( ! current_user_can('delete_plugins') )
-				wp_die(__('You do not have sufficient permissions to delete plugins for this blog.'));
-
-			check_admin_referer('bulk-manage-plugins');
-
-			$plugins = $_REQUEST['checked']; //$_POST = from the plugin form; $_GET = from the FTP details screen.
-
-			$title = __('Delete Plugin');
-			$parent_file = 'plugins.php';
-
-			if ( ! isset($_REQUEST['verify-delete']) ) {
-				wp_enqueue_script('jquery');
-				require_once('admin-header.php');
-				?>
-			<div class="wrap">
-				<h2><?php _e('Delete Plugin(s)'); ?></h2>
-				<?php
-					$files_to_delete = $plugin_info = array();
-					foreach ( (array) $plugins as $plugin ) {
-						if ( '.' == dirname($plugin) ) {
-							$files_to_delete[] = WP_PLUGIN_DIR . '/' . $plugin;
-							if( $data = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin) )
-								$plugin_info[ $plugin ] = $data;
-						} else {
-							//Locate all the files in that folder:
-							$files = list_files( WP_PLUGIN_DIR . '/' . dirname($plugin) );
-							if( $files ) {
-								$files_to_delete = array_merge($files_to_delete, $files);
-							}
-							//Get plugins list from that folder
-							if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) )
-								$plugin_info = array_merge($plugin_info, $folder_plugins);
-						}
-					}
-				?>
-				<p><?php _e('Deleting the selected plugins will remove the following plugin(s) and their files:'); ?></p>
-					<ul>
-						<?php
-						foreach ( $plugin_info as $plugin )
-							echo '<li>', sprintf(__('%s by %s'), $plugin['Name'], $plugin['Author']), '</li>';
-						?>
-					</ul>
-				<p><?php _e('Are you sure you wish to delete these files?') ?></p>
-				<form method="post" action="<?php echo clean_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
-					<input type="hidden" name="verify-delete" value="1" />
-					<input type="hidden" name="delete-selected" value="1" />
-					<?php
-						foreach ( (array)$plugins as $plugin )
-							echo '<input type="hidden" name="checked[]" value="' . attribute_escape($plugin) . '" />';
-					?>
-					<?php wp_nonce_field('bulk-manage-plugins') ?>
-					<input type="submit" name="submit" value="<?php _e('Yes, Delete these files') ?>" class="button" />
-				</form>
-				<form method="post" action="<?php echo clean_url(wp_get_referer()); ?>" style="display:inline;">
-					<input type="submit" name="submit" value="<?php _e('No, Return me to the plugin list') ?>" class="button" />
-				</form>
-
-				<p><a href="#" onclick="jQuery('#files-list').toggle(); return false;"><?php _e('Click to view entire list of files which will be deleted'); ?></a></p>
-				<div id="files-list" style="display:none;">
-					<ul>
-					<?php
-						foreach ( (array)$files_to_delete as $file )
-							echo '<li>' . str_replace(WP_PLUGIN_DIR, '', $file) . '</li>';
-					?>
-					</ul>
-				</div>
-			</div>
-				<?php
-				require_once('admin-footer.php');
-				exit;
-			} //Endif verify-delete
-			$delete_result = delete_plugins($plugins);
-
-			wp_cache_delete('plugins', 'plugins');
-			break;
 		case 'clear-recent-list':
 			update_option('recently_activated', array());
 			break;
 	}
 }
 
-wp_enqueue_script('plugin-install');
-add_thickbox();
-
 $title = __('Manage Plugins');
 require_once('admin-header.php');
 
@@ -183,12 +104,6 @@
 		}
 	?>
 	</div>
-<?php elseif ( 'delete-selected' == $action ) :
-		if ( is_wp_error($delete_result) ) : ?>
-		<div id="message" class="updated fade"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
-		<?php else : ?>
-		<div id="message" class="updated fade"><p><?php _e('The selected plugins have been <strong>deleted</strong>.'); ?></p></div>
-		<?php endif; ?>
 <?php elseif ( isset($_GET['activate']) ) : ?>
 	<div id="message" class="updated fade"><p><?php _e('Plugin <strong>activated</strong>.') ?></p></div>
 <?php elseif (isset($_GET['activate-multi'])) : ?>
@@ -249,24 +164,13 @@
 <table class="widefat" cellspacing="0" id="<?php echo $context ?>-plugins-table">
 	<thead>
 	<tr>
-		<th scope="col" class="check-column"><input type="checkbox" /></th>
+		<th scope="col" class="check-column">&nbsp;</th>
 		<th scope="col"><?php _e('Plugin'); ?></th>
 		<th scope="col" class="num"><?php _e('Version'); ?></th>
 		<th scope="col"><?php _e('Description'); ?></th>
 		<th scope="col" class="action-links"><?php _e('Action'); ?></th>
 	</tr>
 	</thead>
-
-	<tfoot>
-	<tr>
-		<th scope="col" class="check-column"><input type="checkbox" /></th>
-		<th scope="col"><?php _e('Plugin'); ?></th>
-		<th scope="col" class="num"><?php _e('Version'); ?></th>
-		<th scope="col"><?php _e('Description'); ?></th>
-		<th scope="col" class="action-links"><?php _e('Action'); ?></th>
-	</tr>
-	</tfoot>
-
 	<tbody class="plugins">
 <?php
 
@@ -283,15 +187,12 @@
 		else //Inactive or Recently deactivated
 			$action_links[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
 
-		if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
-			$action_links[] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . __('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
-
 		$action_links = apply_filters( 'plugin_action_links', $action_links, $plugin_file, $plugin_data, $context );
 		$action_links = apply_filters( "plugin_action_links_$plugin_file", $action_links, $plugin_file, $plugin_data, $context );
 
 		echo "
 	<tr class='$context'>
-		<th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . attribute_escape($plugin_file) . "' /></th>
+		<td scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . attribute_escape($plugin_file) . "' /></td>
 		<td class='name'>{$plugin_data['Title']}</td>
 		<td class='vers'>{$plugin_data['Version']}</td>
 		<td class='desc'><p>{$plugin_data['Description']}</p></td>
@@ -325,9 +226,6 @@
 	<?php if ( 'active' == $context ) : ?>
 			<option value="deactivate-selected"><?php _e('Deactivate'); ?></option>
 	<?php endif; ?>
-	<?php if( current_user_can('delete_plugins') && ( 'recent' == $context || 'inactive' == $context ) ) : ?>
-			<option value="delete-selected"><?php _e('Delete'); ?></option>
-	<?php endif; ?>
 		</select>
 		<input type="submit" name="doaction_active" value="<?php _e('Apply'); ?>" class="button-secondary action" />
 	<?php if( 'recent' == $context ) : ?>
@@ -384,11 +282,6 @@
 <p><?php _e('You do not appear to have any plugins available at this time.') ?></p>
 <?php endif; ?>
 
-<h2><?php _e('Get More Plugins'); ?></h2>
-<p><?php _e('You can find additional plugins for your site by using the new <a href="plugin-install.php">Plugin Browser/Installer</a> functionality, Or by browsing the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> directly and installing manually.'); ?></p>
-<p><?php printf(__('To <em>manually</em> install a plugin you generally just need to upload the plugin file into your <code>%s</code> directory.'), WP_PLUGIN_DIR); ?></p>
-<p><?php _e('Once a plugin has been installed, you may activate it here.'); ?></p>
-
 </div>
 
 <?php
diff -uNr a/mp-wp/wp-admin/post-new.php b/mp-wp/wp-admin/post-new.php
--- a/mp-wp/wp-admin/post-new.php 570352a7a904f4bb9efe9f23f8331c9233168ee572dcddb4a804802905a302c1a3988a0c3270078321275ca5617225278fe0c3ae8c2695816b94c6f54bf6622e
+++ b/mp-wp/wp-admin/post-new.php 300aa4d585611ee944d3f19ae8c47585fc3b7432a0d74b0e38f594544a633a3f6ead8fce06fc3080269e25553202be3301973f2c3494e576419977061c1ca482
@@ -11,11 +11,6 @@
 $title = __('Add New Post');
 $parent_file = 'edit.php';
 $editing = true;
-wp_enqueue_script('autosave');
-wp_enqueue_script('post');
-add_thickbox();
-wp_enqueue_script('media-upload');
-wp_enqueue_script('word-count');
 
 if ( ! current_user_can('edit_posts') ) {
 	require_once ('./admin-header.php'); ?>
diff -uNr a/mp-wp/wp-admin/post.php b/mp-wp/wp-admin/post.php
--- a/mp-wp/wp-admin/post.php 70ceffb697d263832d4007de3de8d8aed4eaddf8092e2a6ddbe53ba0685f54051d50f8a1ac97281dc7d42317483731c86f2f9093aff529f14e2eba3ffa8ea25c
+++ b/mp-wp/wp-admin/post.php 9581534c5e27c73b37ff7d1c3469cf87afb937fafc799c1b6bc7eb4f1f4d9c01fd1e7a30b38400657933b5fbf030a20d8b9736b324aa107a5a6c5ddbdde541e3
@@ -138,13 +138,6 @@
 		exit();
 	}
 
-	wp_enqueue_script('post');
-	add_thickbox();
-	wp_enqueue_script('media-upload');
-	wp_enqueue_script('word-count');
-	wp_enqueue_script( 'admin-comments' );
-	enqueue_comment_hotkeys_js();
-
 	if ( current_user_can('edit_post', $post_ID) ) {
 		if ( $last = wp_check_post_lock( $post->ID ) ) {
 			$last_user = get_userdata( $last );
@@ -154,7 +147,6 @@
 			add_action('admin_notices', create_function( '', "echo '$message';" ) );
 		} else {
 			wp_set_post_lock( $post->ID );
-			wp_enqueue_script('autosave');
 		}
 	}
 
diff -uNr a/mp-wp/wp-admin/rtl.css b/mp-wp/wp-admin/rtl.css
--- a/mp-wp/wp-admin/rtl.css 52a0de9489cbfd0a34141cd595c031436cd52828943bdccfd02bdf6be0506a2ba2473667a73bea012a0801a872d66a7ff4924c7f5290575f03e7a968410c9179
+++ b/mp-wp/wp-admin/rtl.css false
@@ -1,529 +0,0 @@
-/* 0 - 200
-=================================== */
-td.available-theme {
-	text-align: right;
-}
-#current-theme img {
-	float: right;
-	margin-right: 0;
-	margin-left: 1em;
-}
-.quicktags, .search {
-	font-family: Tahoma, "Times New Roman";
-}
-/* 200 - 500
-=================================== */
-#save-post {
-	float: right;
-}
-.preview {
-	float: left;
-}
-#sticky-span {
-	margin-left: 0;
-	margin-right: 18px;
-}
-#post-body .misc-pub-section {
-	border-right-width: 0;
-	border-left-width: 1;
-	border-right-style: none;
-	border-left-style: solid;
-	float: right;
-}
-#post-body .misc-pub-section-last {
-	border-left: 0;
-}
-#delete-action {
-	text-align: right;
-	float: right;
-}
-#publishing-action {
-	text-align: left;
-	float: left;
-}
-.side-info ul {
-	padding-left: 0;
-	padding-right: 18px;
-}
-.submit input,
-.button,
-.button-primary,
-.button-secondary,
-.button-highlighted,
-#postcustomstuff .submit input {
-	font-family: Tahoma, "Times New Roman";
-}
-#wpcontent select {
-	font-family: Tahoma, "Times New Roman";
-}
-#quicktags {
-	background-position: right top;
-}
-/* 500 - 700
-=================================== */
-#template div {
-	margin-right: 0;
-	margin-left: 190px;
-}
-* html #template div {
-	margin-left: 0;
-}
-#your-profile legend {
-	font-family: "Times New Roman", Tahoma;
-}
-#ajax-response.alignleft {
-	margin-left: 0;
-	margin-right: 2em;
-}
-.page-numbers {
-	margin-right: 0;
-	margin-left: 1px;
-}
-.column-author img, .column-username img {
-	float: right;
-	margin-right: 0;
-	margin-left: 10px;
-}
-.tablenav a.button-secondary {
-	margin: 8px 0 0 8px;
-}
-.tablenav .tablenav-pages {
-	float: left;
-}
-.tablenav .displaying-num {
-	margin-right: 0;
-	margin-left: 10px;
-	font-family: Tahoma, "Times New Roman";
-}
-#postcustomstuff table input,
-#postcustomstuff table select,
-#postcustomstuff table textarea {
-	margin: 8px 8px 8px 0;
-}
-/* 700 - 1000
-=================================== */
-#pass-strength-result {
-	float: right;
-	margin: 12px 1px 5px 5px;
-}
-/* Admin Header */
-#user_info {
-	float: left;
-}
-#header-logo {
-	float: right;
-	margin: 7px 15px 0 0;
-}
-#wphead h1 {
-	font-family: "Times New Roman", Tahoma;
-	float: right;
-}
-#wphead h1.long-title {
-	font-family: "Times New Roman", Tahoma;
-}
-#adminmenu .wp-submenu a {
-	padding-left: 0;
-	padding-right: 12px;
-	border-width: 0 0 0 1px;
-	border-style: none none none solid;
-	font-family: Tahoma, "Times New Roman";
-}
-#adminmenu a.menu-top,
-#adminmenu .wp-submenu-head {
-	font-family: Tahoma, "Times New Roman";
-}
-#adminmenu img.wp-menu-image {
-	float: right;
-}
-.folded #adminmenu img.wp-menu-image {
-	padding: 7px 6px 0 0;
-}
-#adminmenu .wp-submenu .wp-submenu-head {
-	padding: 6px 10px 6px 4px;
-}
-.folded #adminmenu .wp-submenu {
-	margin: -1px 28px 0 0;
-}
-.folded #adminmenu .wp-submenu a {
-	padding-left: 0;
-	padding-right: 10px;
-}
-.folded #adminmenu a.wp-has-submenu {
-	margin-left: 0;
-	margin-right: 40px;
-}
-#adminmenu .wp-menu-toggle {
-	float: left;
-	padding: 1px 0 0 2px;
-	clear: left;
-}
-#adminmenu div.wp-menu-image {
-	float: right;
-}
-#wphead-info {
-	margin: 0 15px 0 0;
-	padding-right:0;
-	padding-left: 15px;
-}
-/* end side admin menu */
-/* 1000 - 1300
-=================================== */
-#adminmenu #awaiting-mod,
-#adminmenu span.update-plugins,
-#sidemenu li a span.update-plugins {
-	font-family: tahoma;
-	margin-left: 0;
-	margin-right: 2px;
-}
-#adminmenu li #awaiting-mod span,
-#adminmenu li span.update-plugins span,
-#sidemenu li a span.update-plugins span {
-	float: right;
-}
-.post-com-count-wrapper {
-	font-family: tahoma;
-}
-.column-response .post-com-count {
-	float: right;
-	margin-right: 0;
-	margin-left: 5px;
-}
-/* Tables used on comment.php and option/setting pages */
-.form-table th,
-#wpbody-content .describe th {
-	text-align: right;
-}
-.form-table input.tog {
-	margin-right: 0;
-	margin-left: 2px;
-	float: right;
-}
-.form-table table.color-palette {
-	float: right;
-}
-/* Post Screen */
-/* 1300 - 1500
-=================================== */
-#normal-sortables .postbox .submit {
-	float: left;
-}
-#post-body #tagsdiv #newtag {
-	margin-right: 0;
-	margin-left: 5px;
-}
-#post-status-info {
-	padding: 0 7px 0 15px;
-}
-#comment-status-radio input {
-	margin: 2px 0 5px 3px;
-}
-#tagchecklist {
-	margin-left: 0;
-	margin-right: 10px;
-}
-#tagchecklist strong {
-	margin-left: 0;
-	margin-right: -8px;
-}
-#tagchecklist span {
-	float: right;
-}
-#tagchecklist span a {
-	margin: 6px -9px 0 0;
-	float: right;
-}
-.ac_results li {
-	text-align: right;
-}
-#poststuff h2 {
-	clear: right;
-}
-.setting-description, .form-wrap p {
-	font-family: Tahoma, Arial;
-}
-/* 1500 - 1800
-=================================== */
-.meta-box-sortables .postbox .handlediv {
-	float: left;
-}
-.howto {
-	font-family: Tahoma, Arial;
-}
-.postarea h3 label {
-	float: right;
-}
-.postarea #add-media-button {
-	float: left;
-	right: auto;
-	left: 10px;
-}
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
-	margin: 5px 0 0 5px;
-	float: left;
-}
-#poststuff #edButtonHTML {
-	margin-right: 0;
-	margin-left: 15px;
-}
-#media-buttons a {
-	padding: 0 10px 5px 0;
-}
-.submitbox .submit {
-	text-align: right;
-}
-
-.inside-submitbox #post_status {
-	margin: 2px -2px 2px 0;
-}
-.submitbox .submit input {
-	margin-right: 0;
-	margin-left: 4px;
-}
-/* Categories */
-#category-adder {
-	margin-left: 0;
-	margin-right: 120px;
-}
-#post-body ul#category-tabs li.ui-tabs-selected {
-	-moz-border-radius: 0 3px 3px 0;
-	-webkit-border-top-left-radius: 0;
-	-webkit-border-top-right-radius: 3px;
-	-webkit-border-bottom-left-radius: 0;
-	-webkit-border-bottom-right-radius: 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 3px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 3px;
-}
-#post-body ul#category-tabs {
-	float: right;
-	text-align: left;
-	margin: 0 0 0 -120px;
-}
-#post-body #categorydiv div.ui-tabs-panel,
-#post-body #linkcategorydiv div.ui-tabs-panel {
-	margin: 0 120px 0 5px;
-}
-/* 1800 - 2000
-=================================== */
-#side-info-column #category-tabs li {
-	padding-right: 0;
-	padding-left: 8px;
-}
-#categorydiv ul.categorychecklist ul,
-#linkcategorydiv ul.categorychecklist ul {
-	margin-left: 0;
-	margin-right: 18px;
-}
-/* positioning etc. */
-p.search-box {
-	float: left;
-}
-#posts-filter fieldset {
-	float: right;
-	margin: 0 0 1em 1.5ex;
-}
-#posts-filter fieldset legend {
-	padding: 0 1px .2em 0;
-}
-.view-switch {
-	float: left;
-}
-.filter {
-	float: right;
-	margin: -5px 10px 0 0;
-}
-#the-comment-list td.comment p.comment-author {
-	margin-right: 0;
-}
-#the-comment-list p.comment-author img {
-	float: right;
-	margin-right: 0;
-	margin-left: 8px;
-}
-.tablenav .delete {
-	margin-right: 0;
-	margin-left: 20px;
-}
-td.action-links, th.action-links {
-	text-align: left;
-}
-/* 2000 - 2300
-=================================== */
-.filter .subsubsub {
-	margin-left: 0;
-	margin-right: -10px;
-}
-#wp-word-count {
-	margin-right: 10px;
-}
-.tool-box .title {
-	font-family: "Times New Roman", Tahoma;
-}
-.settings-toggle {
-	text-align: left;
-	margin: 5px 0 15px 7px;
-}
-.curtime #timestamp {
-	background-position: right top;
-	padding-left: 0;
-	padding-right: 18px;
-}
-/* media popup 0819 */
-#sidemenu {
-	margin: -30px 315px 0 15px;
-	float: left;
-	padding-left: 0;
-	padding-right: 10px;
-}
-#sidemenu a {
-	float: right;
-}
-#replysubmit .button {
-	margin-right: 0;
-	margin-left: 5px;
-}
-/* 2300 - 2500
-=================================== */
-#edithead .inside {
-	float: right;
-	margin: 3px 5px 2px 0;
-}
-#replyrow #ed_reply_toolbar input {
-	margin: 1px 1px 1px 2px;
-}
-/* show/hide settings */
-#screen-meta-links {
-	margin: 0 0 0 9px;
-}
-#screen-options-link-wrap,
-#contextual-help-link-wrap {
-	float: left;
-	font-family: Tahoma, "Times New Roman";
-	margin: 0 0 0 6px;
-}
-.metabox-prefs label {
-	padding-right: 0;
-	padding-left: 15px;
-}
-.metabox-prefs label input {
-	margin: 0 2px 0 5px;
-}
-.inline-editor .save,
-.inline-editor .cancel {
-	margin-right: 0;
-	margin-left: 5px;
-}
-/* 2500 - 2700
-=================================== */
-#bulk-titles div a {
-	float: right;
-	margin: 3px -2px 0 3px;
-}
-#wpbody-content .filename {
-	margin-left: 0;
-	margin-right: 10px;
-}
-#wpbody-content .inline-edit-row fieldset {
-	float: right;
-}
-#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col {
-	border-left: 0 none;
-	border-right: 1px solid;
-}
-#wpbody-content .bulk-edit-row .inline-edit-col-bottom {
-	float: left;
-}
-.inline-edit-row fieldset label span.title {
-	float: right;
-}
-.inline-edit-row fieldset label span.input-text-wrap {
-	margin-left: 0;
-	margin-right: 5em;
-}
-.quick-edit-row-post fieldset.inline-edit-col-right label span.title {
-	padding-right: 0;
-	padding-left: 0.5em;
-}
-#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child {
-	margin-right: 0;
-	margin-left: 0.5em;
-}
-/* 2700 - 3000
-=================================== */
-.inline-edit-row fieldset span.title,
-.inline-edit-row fieldset span.checkbox-title {
-	font-family: Tahoma, "Times New Roman";
-}
-.inline-edit-row fieldset .inline-edit-date {
-	float: right;
-}
-.inline-edit-row fieldset ul.cat-checklist label,
-.inline-edit-row .catshow,
-.inline-edit-row .cathide,
-.inline-edit-row #bulk-titles div {
-	font-family: Tahoma, "Times New Roman";
-}
-.quick-edit-row-post fieldset label.inline-edit-status {
-	float: right;
-}
-.describe-toggle-on, .describe-toggle-off {
-	float: left;
-	margin-right: 0;
-	margin-left: 20px;
-}
-#wpbody-content #media-items .filename {
-	float: right;
-	margin-left: 0;
-	margin-right: 10px;
-}
-.media-item .pinkynail {
-	float: right;
-}
-#find-posts-response .found-radio {
-	padding: 8px 8px 0 0;
-}
-.find-box-buttons {
-	left: auto;
-	right: 12px;
-}
-.find-box-search label {
-	padding-right: 0;
-	padding-left: 6px;
-}
-/* favorite-actions */
-#favorite-actions {
-	float: left;
-}
-#favorite-first {
-	padding: 3px 12px 4px 30px;
-}
-#favorite-inside {
-}
-#favorite-inside a {
-	padding: 3px 10px 3px 5px;
-}
-#favorite-toggle {
-	right: auto;
-	left: 0;
-	background:transparent url(images/fav-arrow-rtl.svg) no-repeat 10px -4px;
-}
-#utc-time, #local-time {
-	padding-left: 0;
-	padding-right: 25px;
-	font-family: Tahoma, Arial;
-}
-.icon32 {
-	float: right;
-	margin: 14px 0 0 6px;
-}
-.subtitle {
-	padding-left: 0;
-	padding-right: 25px;
-}
-/* ltr
-=================================== */
-#author-email, #author-url, #rss-url-1, #edit-slug-box, #post_name, #trackback_url, #metakeyinput, #post_password, #slug, #category_nicename, #link_url, #link_image, #rss_uri, #menu_order, #email, #newcomment_author_url, #pages-exclude, #template textarea, #user_login, #url, #pass1, #pass2, #aim, #yim, #jabber, #siteurl, #home, #admin_email, #gmt_offset, #default_post_edit_rows, #mailserver_url, #mailserver_login, #mailserver_pass, #mailserver_port, #ping_sites, #posts_per_page, #posts_per_rss, #blog_charset, #close_comments_days_old, #comments_per_page, #comment_max_links, #moderation_keys, #blacklist_keys, #thumbnail_size_w, #thumbnail_size_h, #medium_size_w, #medium_size_h, #large_size_w, #large_size_h, #permalink_structure, #category_base, #tag_base, #upload_path, #upload_url_path, #rules {
-	direction: ltr;
-}
diff -uNr a/mp-wp/wp-admin/setup-config.php b/mp-wp/wp-admin/setup-config.php
--- a/mp-wp/wp-admin/setup-config.php c5b8c57cc414d7ca6062b21b76b6a7cf4fb9b93456fd96a937a0429687c01dc239daea0813a73831ba0b6b5e7d892b06f454a95cd31bad1074f25611b0e0b91a
+++ b/mp-wp/wp-admin/setup-config.php f54f7ba38a4d89ab295145336b06f548a3461d6709ea53776bfc2a46b15129f9255e42b66a9a36487b867080678a41a8ea4b56e73835401b2231e1f53132a4b2
@@ -71,7 +71,7 @@
 
 </head>
 <body>
-<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.svg" /></h1>
+<h1 id="logo">MP-WP</h1>
 <?php
 }//end function display_header();
 
diff -uNr a/mp-wp/wp-admin/sidebar.php b/mp-wp/wp-admin/sidebar.php
--- a/mp-wp/wp-admin/sidebar.php d5b0d20c4886a5910cd945d27c796e8b1cf89910e1507062e8a2543165e25ebb1c383533d7a5f1f36fd24b77357284bc5398db7fd511ba48f52c930cab35f704
+++ b/mp-wp/wp-admin/sidebar.php 9adb8722ee027eb320147d1a684d8c182d5b09363e46af42ee017282cecc70204f8109bd44c64201f70f36267aecfacb13132fa1a9e5a761570f2773c3c9a281
@@ -62,7 +62,6 @@
 	line-height: 1.5em;
 	border: 1px solid #80b5d0;
 	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	cursor: pointer;
diff -uNr a/mp-wp/wp-admin/theme-editor.php b/mp-wp/wp-admin/theme-editor.php
--- a/mp-wp/wp-admin/theme-editor.php 81cb33ef33c091cc01d1a4600337f6ca5fd9696fd264452238a1002e1819e83cfa6a04058b9f3869adf9dc449e199212a1a4bf5243f15b76587a7fabce4bca46
+++ b/mp-wp/wp-admin/theme-editor.php false
@@ -1,214 +0,0 @@
-<?php
-/**
- * Theme editor administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** WordPress Administration Bootstrap */
-require_once('admin.php');
-
-$title = __("Edit Themes");
-$parent_file = 'themes.php';
-
-wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme'));
-
-wp_admin_css( 'theme-editor' );
-
-$themes = get_themes();
-
-if (empty($theme)) {
-	$theme = get_current_theme();
-} else {
-	$theme = stripslashes($theme);
- }
-
-
-if ( ! isset($themes[$theme]) )
-	wp_die(__('The requested theme does not exist.'));
-
-$allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files']);
-
-if (empty($file)) {
-	$file = $allowed_files[0];
-}
-
-$file = validate_file_to_edit($file, $allowed_files);
-$real_file = get_real_file_to_edit($file);
-
-$file_show = basename( $file );
-
-switch($action) {
-
-case 'update':
-
-	check_admin_referer('edit-theme_' . $file . $theme);
-
-	if ( !current_user_can('edit_themes') )
-		wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
-
-	$newcontent = stripslashes($_POST['newcontent']);
-	$theme = urlencode($theme);
-	if (is_writeable($real_file)) {
-		//is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
-		$f = fopen($real_file, 'w+');
-		if ($f !== FALSE) {
-			fwrite($f, $newcontent);
-			fclose($f);
-			$location = "theme-editor.php?file=$file&theme=$theme&a=te";
-		} else {
-			$location = "theme-editor.php?file=$file&theme=$theme";
-		}
-	} else {
-		$location = "theme-editor.php?file=$file&theme=$theme";
-	}
-
-	$location = wp_kses_no_null($location);
-	$strip = array('%0d', '%0a');
-	$location = str_replace($strip, '', $location);
-	header("Location: $location");
-	exit();
-
-break;
-
-default:
-
-	if ( !current_user_can('edit_themes') )
-		wp_die('<p>'.__('You do not have sufficient permissions to edit themes for this blog.').'</p>');
-
-	require_once('admin-header.php');
-
-	update_recently_edited($file);
-
-	if (!is_file($real_file))
-		$error = 1;
-
-	if (!$error && filesize($real_file) > 0) {
-		$f = fopen($real_file, 'r');
-		$content = fread($f, filesize($real_file));
-		$content = htmlspecialchars($content);
-	}
-
-	?>
-<?php if (isset($_GET['a'])) : ?>
- <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
-<?php endif;
-
-$description = get_file_description($file);
-$desc_header = ( $description != $file_show ) ? "$description</strong> (%s)" : "%s";
-?>
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
-<div class="bordertitle">
-	<form id="themeselector" action="theme-editor.php" method="post">
-		<strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
-		<select name="theme" id="theme">
-<?php
-	foreach ($themes as $a_theme) {
-	$theme_name = $a_theme['Name'];
-	if ($theme_name == $theme) $selected = " selected='selected'";
-	else $selected = '';
-	$theme_name = attribute_escape($theme_name);
-	echo "\n\t<option value=\"$theme_name\" $selected>$theme_name</option>";
-}
-?>
-		</select>
-		<input type="submit" name="Submit" value="<?php _e('Select') ?>" class="button" />
-	</form>
-</div>
-<div class="tablenav">
-<div class="alignleft">
-<big><strong><?php echo sprintf($desc_header, $file_show); ?></big>
-</div>
-<br class="clear" />
-</div>
-<br class="clear" />
-	<div id="templateside">
-	<h3 id="bordertitle"><?php _e("Theme Files"); ?></h3>
-
-<?php
-if ($allowed_files) :
-?>
-	<h4><?php _e('Templates'); ?></h4>
-	<ul>
-<?php
-	$template_mapping = array();
-	$template_dir = $themes[$theme]['Template Dir'];
-	foreach($themes[$theme]['Template Files'] as $template_file) {
-		$description = trim( get_file_description($template_file) );
-		$template_show = basename($template_file);
-		$filedesc = ( $description != $template_file ) ? "$description <span class='nonessential'>($template_show)</span>" : "$description";
-		$filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($template_show)</span></span>" : $filedesc;
-
-		// If we have two files of the same name prefer the one in the Template Directory
-		// This means that we display the correct files for child themes which overload Templates as well as Styles
-		if( array_key_exists($description, $template_mapping ) ) {
-			if ( false !== strpos( $template_file, $template_dir ) )  {
-				$template_mapping[ $description ] = array( $template_file, $filedesc );
-			}
-		} else {
-			$template_mapping[ $description ] = array( $template_file, $filedesc );
-		}
-	}
-	ksort( $template_mapping );
-	while ( list( $template_sorted_key, list( $template_file, $filedesc ) ) = each( $template_mapping ) ) :
-	?>
-		<li><a href="theme-editor.php?file=<?php echo "$template_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo $filedesc ?></a></li>
-<?php endwhile; ?>
-	</ul>
-	<h4><?php echo _c('Styles|Theme stylesheets in theme editor'); ?></h4>
-	<ul>
-<?php
-	$template_mapping = array();
-	foreach($themes[$theme]['Stylesheet Files'] as $style_file) {
-		$description = trim( get_file_description($style_file) );
-		$style_show = basename($style_file);
-		$filedesc = ( $description != $style_file ) ? "$description <span class='nonessential'>($style_show)</span>" : "$description";
-		$filedesc = ( $style_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($style_show)</span></span>" : $filedesc;
-		$template_mapping[ $description ] = array( $style_file, $filedesc );
-	}
-	ksort( $template_mapping );
-	while ( list( $template_sorted_key, list( $style_file, $filedesc ) ) = each( $template_mapping ) ) :
-		?>
-		<li><a href="theme-editor.php?file=<?php echo "$style_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo $filedesc ?></a></li>
-<?php endwhile; ?>
-	</ul>
-<?php endif; ?>
-</div>
-	<?php
-	if (!$error) {
-	?>
-	<form name="template" id="template" action="theme-editor.php" method="post">
-	<?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
-		 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
-		 <input type="hidden" name="action" value="update" />
-		 <input type="hidden" name="file" value="<?php echo $file ?>" />
-		 <input type="hidden" name="theme" value="<?php echo $theme ?>" />
-		 </div>
-
-		<div>
-<?php if ( is_writeable($real_file) ) : ?>
-			<p class="submit">
-<?php
-	echo "<input type='submit' name='submit' class='button-primary' value='" . __('Update File') . "' tabindex='2' />";
-?>
-</p>
-<?php else : ?>
-<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
-<?php endif; ?>
-		</div>
-	</form>
-	<?php
-	} else {
-		echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
-	}
-	?>
-<div class="clear"> &nbsp; </div>
-</div>
-<?php
-break;
-}
-
-include("admin-footer.php") ?>
diff -uNr a/mp-wp/wp-admin/themes.php b/mp-wp/wp-admin/themes.php
--- a/mp-wp/wp-admin/themes.php 70e37396b6d1248880f83859c3639df7ea4e8c863bb1760466d73f86c8230c079edfce08c8a4d2de557af801965a5e0e1afca46b2ee28992d201201f84c94925
+++ b/mp-wp/wp-admin/themes.php 80b10f66b9830ed00f992cc3a0c18f082463fbcbd7cde1ed50b6508282d041af97515c6a42190c54a13d9cca54692b7d0c5cc478436a0cc241175693c01d094f
@@ -22,9 +22,6 @@
 $title = __('Manage Themes');
 $parent_file = 'themes.php';
 
-add_thickbox();
-wp_enqueue_script( 'theme-preview' );
-
 require_once('admin-header.php');
 ?>
 
@@ -137,16 +134,15 @@
 	$preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true', 'width' => 600, 'height' => 400 ), $preview_link ) );
 	$preview_text = attribute_escape( sprintf( __('Preview of "%s"'), $title ) );
 	$tags = $themes[$theme_name]['Tags'];
-	$thickbox_class = 'thickbox';
 	$activate_link = wp_nonce_url("themes.php?action=activate&amp;template=".urlencode($template)."&amp;stylesheet=".urlencode($stylesheet), 'switch-theme_' . $template);
 	$activate_text = attribute_escape( sprintf( __('Activate "%s"'), $title ) );
 ?>
-		<a href="<?php echo $activate_link; ?>" class="<?php echo $thickbox_class; ?> screenshot">
+		<a href="<?php echo $activate_link; ?>" class="screenshot">
 <?php if ( $screenshot ) : ?>
 			<img src="<?php echo WP_CONTENT_URL . $stylesheet_dir . '/' . $screenshot; ?>" alt="" />
 <?php endif; ?>
 		</a>
-		<h3><a class="<?php echo $thickbox_class; ?>" href="<?php echo $activate_link; ?>"><?php echo $title; ?></a></h3>
+		<h3><a href="<?php echo $activate_link; ?>"><?php echo $title; ?></a></h3>
 		<p><?php echo $description; ?></p>
 <?php if ( $tags ) : ?>
 		<p><?php _e('Tags:'); ?> <?php echo join(', ', $tags); ?></p>
@@ -209,9 +205,6 @@
 }
 ?>
 
-<h2><?php _e('Get More Themes'); ?></h2>
-<p><?php _e('You can find additional themes for your site in the <a href="http://wordpress.org/extend/themes/">WordPress theme directory</a>. To install a theme you generally just need to upload the theme folder into your <code>wp-content/themes</code> directory. Once a theme is uploaded, you should see it on this page.'); ?></p>
-
 </div>
 
 <?php require('admin-footer.php'); ?>
diff -uNr a/mp-wp/wp-admin/upload.php b/mp-wp/wp-admin/upload.php
--- a/mp-wp/wp-admin/upload.php 5403c9ff616259f4927cc55a812b565e3d66a3d2940e069e470a0d773a0662f102d3edce7328bfcb76eb4f87eba1b4b9be7c05887a8b896ae4d6f9839b7fbe36
+++ b/mp-wp/wp-admin/upload.php 4d859251298afa201efb8030ad57c8358e9d93f50cc19c0cc7460387cc79f090a13a565a06e06f483766d6749942b4336806a3510e3f3d7b58cb50bf67cfe0ab
@@ -8,9 +8,6 @@
 
 /** WordPress Administration Bootstrap */
 require_once('admin.php');
-wp_enqueue_script( 'wp-ajax-response' );
-wp_enqueue_script( 'jquery-ui-draggable' );
-wp_enqueue_script( 'jquery-ui-resizable' );
 
 if (!current_user_can('upload_files'))
 	wp_die(__('You do not have permission to upload files.'));
@@ -68,9 +65,9 @@
 		exit;
 	}
 
-} elseif ( isset($_GET['action']) && isset($_GET['media']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) {
+} elseif ( isset($_GET['action']) && isset($_GET['media']) && -1 != $_GET['action'] ) {
 	check_admin_referer('bulk-media');
-	$doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2'];
+	$doaction = $_GET['action'];
 
 	if ( 'delete' == $doaction ) {
 		foreach( (array) $_GET['media'] as $post_id_del ) {
@@ -200,7 +197,6 @@
 	$type_links[] = "<li><a href='upload.php?post_mime_type=$mime_type'$class>" . sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</a>';
 }
 $class = isset($_GET['detached']) ? ' class="current"' : '';
-$type_links[] = '<li><a href="upload.php?detached=1"' . $class . '>' . __('Unattached') . '</a>';
 
 echo implode( " |</li>\n", $type_links) . '</li>';
 unset($type_links);
@@ -230,22 +226,19 @@
 	'current' => $_GET['paged']
 ));
 
-if ( $page_links ) : ?>
+if ( $page_links ) { ?>
 <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
 	number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
 	number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
 	number_format_i18n( $wp_query->found_posts ),
 	$page_links
 ); echo $page_links_text; ?></div>
-<?php endif; ?>
+<?php } ?>
 
 <div class="alignleft actions">
 <select name="action" class="select-action">
 <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
-<?php if ( isset($orphans) ) { ?>
-<option value="attach"><?php _e('Attach to a post'); ?></option>
-<?php } ?>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-media'); ?>
@@ -299,22 +292,12 @@
 <table class="widefat" cellspacing="0">
 <thead>
 <tr>
-	<th scope="col" class="check-column"><input type="checkbox" /></th>
+	<th scope="col" class="check-column">&nbsp;</th>
 	<th scope="col"></th>
 	<th scope="col"><?php echo _c('Media|media column header'); ?></th>
 	<th scope="col"><?php echo _c('Date Added|media column header'); ?></th>
 </tr>
 </thead>
-
-<tfoot>
-<tr>
-	<th scope="col" class="check-column"><input type="checkbox" /></th>
-	<th scope="col"></th>
-	<th scope="col"><?php echo _c('Media|media column header'); ?></th>
-	<th scope="col"><?php echo _c('Date Added|media column header'); ?></th>
-</tr>
-</tfoot>
-
 <tbody id="the-list" class="list:post">
 <?php
 	if ( $orphans ) {
@@ -323,7 +306,7 @@
 			$att_title = wp_specialchars( _draft_or_post_title($post->ID) );
 ?>
 	<tr id='post-<?php echo $post->ID; ?>' class='<?php echo $class; ?>' valign="top">
-		<th scope="row" class="check-column"><input type="checkbox" name="media[]" value="<?php echo $post->ID; ?>" /></th>
+		<td scope="row" class="check-column"><input type="checkbox" name="media[]" value="<?php echo $post->ID; ?>" /></td>
 
 		<td class="media-icon"><?php
 		if ( $thumb = wp_get_attachment_image( $post->ID, array(80, 60), true ) ) { ?>
@@ -339,10 +322,8 @@
 		if ( current_user_can('edit_post', $post->ID) )
 			$actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
 		if ( current_user_can('delete_post', $post->ID) )
-			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "'>" . __('Delete') . "</a>";
 		$actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . attribute_escape(sprintf(__('View "%s"'), $title)) . '" rel="permalink">' . __('View') . '</a>';
-		if ( current_user_can('edit_post', $post->ID) )
-			$actions['attach'] = '<a href="#the-list" onclick="findPosts.open(\'media[]\',\''.$post->ID.'\');return false;">'.__('Attach').'</a>';
 		$action_count = count($actions);
 		$i = 0;
 		foreach ( $actions as $action => $link ) {
@@ -377,58 +358,27 @@
 </tbody>
 </table>
 
-<?php find_posts_div();
-
+<?php
 } else {
 	include( 'edit-attachment-rows.php' );
 } ?>
 
-<div id="ajax-response"></div>
-
+<?php if ( $page_links ) { ?>
+<div class="tablenav">
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
+	number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
+	number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
+	number_format_i18n( $wp_query->found_posts ),
+	$page_links
+); echo $page_links_text; ?></div>
 <div class="tablenav">
-
-<?php
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links_text</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2" class="select-action">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-<?php if ( isset($orphans) ) { ?>
-<option value="attach"><?php _e('Attach to a post'); ?></option>
 <?php } ?>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-</div>
 
-<br class="clear" />
-</div>
 </form>
 <br class="clear" />
 
 </div>
 
-<script type="text/javascript">
-/* <![CDATA[ */
-(function($){
-	$(document).ready(function(){
-		$('#doaction, #doaction2').click(function(e){
-			if ( $('select[name^="action"]').val() == 'delete' ) {
-				var m = '<?php echo js_escape(__("You are about to delete the selected attachments.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
-				return showNotice.warn(m);
-			} else if ( $('select[name^="action"]').val() == 'attach' ) {
-				e.preventDefault();
-				findPosts.open();
-			}
-		});
-	});
-})(jQuery);
-columns.init('upload');
-/* ]]> */
-</script>
-
 <?php
 
 include('admin-footer.php');
diff -uNr a/mp-wp/wp-admin/user-edit.php b/mp-wp/wp-admin/user-edit.php
--- a/mp-wp/wp-admin/user-edit.php a324350a555e58f3b0ad3f90eb42221f7c16672925a02c1714573e2141ca4fa7fb36105906c98b1c60eba1a3a9eac655f5d841e361a81cfe17a29d4330cc0825
+++ b/mp-wp/wp-admin/user-edit.php 209d66ab03788c276df00eb43de5dc5610305f655d48699ed07b52e4f909901bc4ea9c4741dfc6194ad1dc3eaf83fc8187f4fe96465ececbd283fa2f7f8a9054
@@ -14,69 +14,6 @@
 else
 	$is_profile_page = false;
 
-/**
- * Display JavaScript for profile page.
- *
- * @since 2.5.0
- */
-function profile_js ( ) {
-?>
-<script type="text/javascript">
-(function($){
-
-	function check_pass_strength () {
-
-		var pass = $('#pass1').val();
-		var user = $('#user_login').val();
-
-		$('#pass-strength-result').removeClass('short bad good strong');
-		if ( ! pass ) {
-			$('#pass-strength-result').html( pwsL10n.empty );
-			return;
-		}
-
-		var strength = passwordStrength(pass, user);
-
-		if ( 2 == strength )
-			$('#pass-strength-result').addClass('bad').html( pwsL10n.bad );
-		else if ( 3 == strength )
-			$('#pass-strength-result').addClass('good').html( pwsL10n.good );
-		else if ( 4 == strength )
-			$('#pass-strength-result').addClass('strong').html( pwsL10n.strong );
-		else
-			// this catches 'Too short' and the off chance anything else comes along
-			$('#pass-strength-result').addClass('short').html( pwsL10n.short );
-
-	}
-
-	function update_nickname () {
-
-		var nickname = $('#nickname').val();
-		var display_nickname = $('#display_nickname').val();
-
-		if ( nickname == '' ) {
-			$('#display_nickname').remove();
-		}
-		$('#display_nickname').val(nickname).html(nickname);
-
-	}
-
-	$(document).ready( function() {
-		$('#nickname').blur(update_nickname);
-		$('#pass1').val('').keyup( check_pass_strength );
-		$('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')});
-    });
-})(jQuery);
-</script>
-<?php
-}
-
-if ( $is_profile_page ) {
-	add_action('admin_head', 'profile_js');
-	wp_enqueue_script('jquery');
-	wp_enqueue_script('password-strength-meter');
-}
-
 $title = $is_profile_page? __('Profile') : __('Edit User');
 if ( current_user_can('edit_users') && !$is_profile_page )
 	$submenu_file = 'users.php';
@@ -192,35 +129,11 @@
 <h3><?php _e('Personal Options'); ?></h3>
 
 <table class="form-table">
-<?php if (count($_wp_admin_css_colors) > 1 ) : ?>
-<tr>
-<th scope="row"><?php _e('Admin Color Scheme')?></th>
-<td><fieldset><legend class="hidden"><?php _e('Admin Color Scheme')?></legend>
-<?php
-$current_color = get_user_option('admin_color', $user_id);
-if ( empty($current_color) )
-	$current_color = 'fresh';
-foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
-<div class="color-option"><input name="admin_color" id="admin_color_<?php echo $color; ?>" type="radio" value="<?php echo $color ?>" class="tog" <?php checked($color, $current_color); ?> />
-	<table class="color-palette">
-	<tr>
-	<?php foreach ( $color_info->colors as $html_color ): ?>
-	<td style="background-color: <?php echo $html_color ?>" title="<?php echo $color ?>">&nbsp;</td>
-	<?php endforeach; ?>
-	</tr>
-	</table>
-
-	<label for="admin_color_<?php echo $color; ?>"><?php echo $color_info->name ?></label>
-</div>
-	<?php endforeach; ?>
-</fieldset></td>
-</tr>
 <tr>
 <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
 <td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( !empty($profileuser->comment_shortcuts) ) checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e( 'Enable keyboard shortcuts for comment moderation. <a href="http://codex.wordpress.org/Keyboard_Shortcuts">More information</a>' ); ?></label></td>
 </tr>
 <?php
-endif;
 do_action('personal_options', $profileuser);
 ?>
 </table>
diff -uNr a/mp-wp/wp-admin/user-new.php b/mp-wp/wp-admin/user-new.php
--- a/mp-wp/wp-admin/user-new.php cc6c5caef32096d22f7344d3542cdcfbeddbeffe5c09ffde7b7111572983a275e24a42361d15ba7c9c7b67fa23fb868d1b64fd4628c276e7410336dff3a61e93
+++ b/mp-wp/wp-admin/user-new.php bfbf97a3f8b6300c86d25ffe14ebf86a0a697472342e2176d41b19dbd95546d83495157c483f1e8108d363bdf6412c995791c579b0f7e055a03598a0a71842d4
@@ -36,8 +36,6 @@
 $title = __('Add New User');
 $parent_file = 'users.php';
 
-wp_enqueue_script('admin-users');
-
 require_once ('admin-header.php');
 
 ?>
@@ -69,7 +67,6 @@
 		?>
 	</div>
 <?php endif; ?>
-<div id="ajax-response"></div>
 
 <?php
 	if ( get_option('users_can_register') )
@@ -140,4 +137,4 @@
 
 <?php
 include('admin-footer.php');
-?>
\ No newline at end of file
+?>
diff -uNr a/mp-wp/wp-admin/users.php b/mp-wp/wp-admin/users.php
--- a/mp-wp/wp-admin/users.php 127d96ac709e20becdc00726237152d9b09655d090a2b6c08003351bb518c58a52568a62a673dcda043916d72f59b1fcc378830a0674dc4b6ed695e3f6b93822
+++ b/mp-wp/wp-admin/users.php 4c1d067525f6c72f0bec36d0ec519f4223a7edde319209e40ed3238b72cb73d70f7830de100e0d22e7e825f2c9aeeb2170cad9d929879e0050e6234b747a5f45
@@ -20,7 +20,7 @@
 
 $update = $doaction = '';
 if ( isset($_REQUEST['action']) )
-	$doaction = $_REQUEST['action'] ? $_REQUEST['action'] : $_REQUEST['action2'];
+	$doaction = $_REQUEST['action'];
 
 if ( empty($doaction) ) {
 	if ( isset($_GET['changeit']) && !empty($_GET['new_role']) )
@@ -185,8 +185,6 @@
 		exit;
 	}
 
-	wp_enqueue_script('admin-users');
-
 	include('admin-header.php');
 
 	$usersearch = isset($_GET['usersearch']) ? $_GET['usersearch'] : null;
@@ -340,13 +338,6 @@
 <?php print_column_headers('users') ?>
 </tr>
 </thead>
-
-<tfoot>
-<tr class="thead">
-<?php print_column_headers('users', false) ?>
-</tr>
-</tfoot>
-
 <tbody id="users" class="list:user user-list">
 <?php
 $style = '';
@@ -362,23 +353,6 @@
 </tbody>
 </table>
 
-<div class="tablenav">
-
-<?php if ( $wp_user_search->results_are_paged() ) : ?>
-	<div class="tablenav-pages"><?php $wp_user_search->page_links(); ?></div>
-<?php endif; ?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-</div>
-
-<br class="clear" />
-</div>
-
 <?php endif; ?>
 
 </form>
diff -uNr a/mp-wp/wp-admin/widgets.php b/mp-wp/wp-admin/widgets.php
--- a/mp-wp/wp-admin/widgets.php d41f6da17520e87f2974d32425467f9d417fa00230a2369b974ec198b4e1e5587e81c4a53238e9999996c303045e6df423fca0f29677e0ba385487edf787182b
+++ b/mp-wp/wp-admin/widgets.php f7793e26f6609e7ebf9a4dd46054410fd648ea0f171a66dcdefb7ff3873c604f5602d8d237dd2448f56e94a140866e9b733c4e5c8cee612a6996630afd050acd
@@ -15,7 +15,6 @@
 if ( ! current_user_can('switch_themes') )
 	wp_die( __( 'Cheatin&#8217; uh?' ));
 
-wp_enqueue_script( array( 'wp-lists', 'admin-widgets' ) );
 wp_admin_css( 'widgets' );
 
 do_action( 'sidebar_admin_setup' );
diff -uNr a/mp-wp/wp-admin/wp-admin.css b/mp-wp/wp-admin/wp-admin.css
--- a/mp-wp/wp-admin/wp-admin.css 310db6ed07d6f444552841e3bcaca5c4b8841e1488d1cb17074d3fc09e98af2a369013d7ed258ad787a7f9a519b15caea536271f06c126dad14019a170b80240
+++ b/mp-wp/wp-admin/wp-admin.css false
@@ -1,2893 +0,0 @@
-
-p, ul, ol, blockquote { font-size: 12px; }
-
-.plugins .name,
-#pass-strength-result.strong,
-#pass-strength-result.short,
-.button-highlighted,
-#quicktags #ed_strong,
-#ed_reply_toolbar #ed_reply_strong {
-	font-weight: bold;
-}
-
-.plugins p {
-	margin: 0 4px;
-	padding: 0;
-}
-
-.plugins .togl {
-	width: 150px;
-}
-
-.import-system {
-	font-size: 16px;
-}
-
-.anchors {
-	margin: 10px 20px 10px 20px;
-}
-
-table#availablethemes {
-	border-spacing: 0;
-	border-width: 1px 0;
-	border-style: solid none;
-	margin: 10px auto;
-	width: 100%;
-}
-
-td.available-theme {
-	vertical-align: top;
-	width: 240px;
-	margin: 0;
-	padding: 20px;
-	text-align: left;
-}
-
-table#availablethemes td {
-	border-width: 0 1px 1px;
-	border-style: none solid solid;
-}
-
-table#availablethemes td.right,
-table#availablethemes td.left  {
-	border-right: 0 none;
-	border-left: 0 none;
-}
-
-table#availablethemes td.bottom {
-	border-bottom: 0 none;
-}
-
-.available-theme a.screenshot {
-	width: 240px;
-	height: 180px;
-	display: block;
-	border-width: 1px;
-	border-style: solid;
-	margin-bottom: 10px;
-	overflow: hidden;
-}
-
-.available-theme img {
-	width: 240px;
-}
-
-.available-theme h3 {
-	margin: 15px 0 5px;
-}
-
-#current-theme {
-	margin: 1em 0 1.5em;
-}
-
-#current-theme a {
-	border-bottom: none;
-}
-
-#current-theme h3 {
-	font-size: 17px;
-	font-weight: normal;
-	margin: 0;
-}
-
-#current-theme .description {
-	margin-top: 5px;
-}
-
-#current-theme img {
-	float: left;
-	border-width: 1px;
-	border-style: solid;
-	margin-right: 1em;
-	margin-bottom: 1.5em;
-	width: 150px;
-}
-
-#TB_window #TB_title a.tb-theme-preview-link,
-#TB_window #TB_title a.tb-theme-preview-link:visited {
-	font-weight: bold;
-	text-decoration: none;
-}
-
-.checkbox {
-	border: none;
-	margin: 0;
-	padding: 0;
-}
-
-.code, code {
-	font-family: Consolas, Monaco, Courier, monospace;
-}
-
-kbd, code {
-	padding: 1px 3px;
-	margin: 0 1px;
-	font-size: 11px;
-}
-
-.commentlist li {
-	padding: 1em 1em .2em;
-	margin: 0;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-.commentlist li li {
-	border-bottom: 0;
-	padding: 0;
-}
-
-.commentlist p {
-	padding: 0;
-	margin: 0 0 .8em;
-}
-
-.post-categories {
-	display: inline;
-	margin: 0;
-	padding: 0;
-}
-
-.post-categories li {
-	display: inline;
-}
-
-.quicktags, .search {
-	font: 12px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-}
-
-.submit {
-	padding: 1.5em 0;
-	margin: 5px 0;
-	-moz-border-radius: 0 0 3px 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	-webkit-border-bottom-right-radius: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-	-khtml-border-bottom-right-radius: 3px;
-	border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
-}
-
-form p.submit a.cancel:hover {
-	text-decoration: none;
-}
-
-#submitdiv h3,
-#pagesubmitdiv h3 {
-	margin-bottom: 0 !important;
-}
-
-#misc-publishing-actions {
-	padding: 6px 0 16px 0;
-}
-
-.misc-pub-section {
-	padding: 6px;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-.misc-pub-section-last {
-	border-bottom: 0 none;
-}
-
-#minor-publishing-actions {
-	padding: 6px;
-	text-align: right;
-}
-
-#minor-publishing {
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-#save-post {
-	float: left;
-}
-
-.preview {
-	float: right;
-}
-
-#major-publishing-actions {
-	padding: 6px;
-	clear: both;
-	border-top: none;
-}
-
-#minor-publishing-actions input,
-#major-publishing-actions input,
-#minor-publishing-actions .preview {
-	min-width: 80px;
-	text-align: center;
-}
-
-#delete-action {
-	line-height: 25px;
-	vertical-align: middle;
-	text-align: left;
-	float: left;
-}
-
-#publishing-action {
-	text-align: right;
-	float: right;
-}
-
-#post-body #minor-publishing {
-	padding-bottom: 10px;
-}
-
-#post-body #misc-publishing-actions {
-	padding: 0;
-}
-
-#post-body .misc-pub-section {
-	border-right-width: 1px;
-	border-right-style: solid;
-	border-bottom: 0 none;
-	min-height: 30px;
-	float: left;
-	max-width: 32%;
-}
-
-#post-body .misc-pub-section-last {
-	border-right: 0;
-}
-
-#sticky-span {
-	margin-left: 18px;
-}
-
-.side-info {
-	margin: 0;
-	padding: 4px;
-	font-size: 11px;
-}
-
-.side-info h5 {
-	padding-bottom: 7px;
-	font-size: 14px;
-	margin: 12px 2px 5px;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-.side-info ul {
-	margin: 0;
-	padding-left: 18px;
-	list-style: square;
-}
-
-.submit input,
-.button,
-.button-primary,
-.button-secondary,
-.button-highlighted,
-#postcustomstuff .submit input {
-	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-	text-decoration: none;
-	font-size: 11px !important;
-	line-height: 16px;
-	padding: 2px 8px;
-	cursor: pointer;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 11px;
-	-khtml-border-radius: 11px;
-	-webkit-border-radius: 11px;
-	border-radius: 11px;
-	-moz-box-sizing: content-box;
-	-webkit-box-sizing: content-box;
-	-khtml-box-sizing: content-box;
-	box-sizing: content-box;
-}
-
-a.button,
-a.button-primary,
-a.button-secondary {
-	line-height: 1.2em;
-	-webkit-border-radius: 10px;
-	padding: 4px 10px;
-}
-
-#doaction,
-#doaction2 {
-	margin-right: 8px;
-}
-
-.tablenav select[name="action"],
-.tablenav select[name="action2"] {
-	width: 120px;
-}
-
-.tablenav select[name="m"] {
-	width: 120px;
-}
-
-.tablenav select#cat {
-	width: 150px;
-}
-
-#wpcontent select {
-	font: 11px/20px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-	padding: 2px;
-	border-width: 1px;
-	border-style: solid;
-	height: 2em;
-	vertical-align: top;
-}
-
-#wpcontent option {
-	padding: 2px;
-}
-
-.approve {
-	display: none;
-}
-
-.unapproved .approve, .spam .approve {
-	display: inline;
-}
-
-.unapproved .unapprove {
-	display: none;
-}
-
-.narrow {
-	width: 70%;
-	margin-bottom: 40px;
-}
-
-.narrow p {
-	line-height: 150%;
-}
-
-table .vers {
-	text-align: center;
-}
-
-textarea.all-options, input.all-options {
-	width: 250px;
-}
-
-#namediv table {
-	width: 100%;
-}
-
-#namediv td.first {
-	width: 10px;
-	white-space: nowrap;
-}
-
-#namediv input {
-	width: 98%;
-}
-
-#namediv p {
-	margin: 10px 0;
-}
-
-#wpbody-content .metabox-holder {
-	padding-top: 10px;
-}
-
-#content {
-	margin: 0;
-	width: 100%;
-}
-
-#editorcontainer #content {
-	padding: 6px;
-	line-height: 150%;
-	border: 0 none;
-	outline: none;
-	-moz-box-sizing: border-box;
-	-webkit-box-sizing: border-box;
-	-khtml-box-sizing: border-box;
-	box-sizing: border-box;
-}
-
-#editorcontainer,
-#quicktags {
-	border-style: solid;
-	border-width: 1px;
-	border-collapse: separate;
-	-moz-border-radius: 6px 6px 0 0;
-	-webkit-border-top-right-radius: 6px;
-	-webkit-border-top-left-radius: 6px;
-	-khtml-border-top-right-radius: 6px;
-	-khtml-border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-	border-top-left-radius: 6px;
-}
-
-#quicktags {
-	padding: 0;
-	margin-bottom: -3px;
-	border-bottom-width: 3px;
-	background-image: url("images/ed-bg.svg");
-	background-position: left top;
-	background-repeat: repeat-x;
-}
-
-#quicktags #ed_toolbar {
-	padding: 2px 4px 0;
-}
-
-#ed_toolbar input {
-	margin: 3px 1px 4px;
-	line-height: 18px;
-	display: inline-block;
-	border-width: 1px;
-	border-style: solid;
-	min-width: 26px;
-	padding: 2px 4px;
-	font-size: 12px;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-#quicktags #ed_link,
-#ed_reply_toolbar #ed_reply_link {
-	text-decoration: underline;
-}
-
-#quicktags #ed_del,
-#ed_reply_toolbar #ed_reply_del {
-	text-decoration: line-through;
-}
-
-#quicktags #ed_em,
-#ed_reply_toolbar #ed_reply_em {
-	font-style: italic;
-}
-
-#excerpt, .attachmentlinks {
-	margin: 0;
-	height: 4em;
-	width: 98%;
-}
-
-/* post meta postbox */
-#postcustomstuff table,
-#postcustomstuff input,
-#postcustomstuff textarea {
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-#postcustomstuff .updatemeta,
-#postcustomstuff .deletemeta {
-	margin: auto;
-}
-
-#postcustomstuff thead th {
-	padding: 5px 8px 8px;
-}
-
-#postcustom #postcustomstuff .submit,
-#pagecustomdiv #postcustomstuff .submit {
-	border: 0 none;
-	float: none;
-	padding: 5px 8px;
-}
-
-#side-sortables #postcustom #postcustomstuff .submit,
-#side-sortables #pagecustomdiv #postcustomstuff .submit {
-	padding: 0 5px;
-}
-
-#side-sortables #postcustom #postcustomstuff td.left input,
-#side-sortables #pagecustomdiv #postcustomstuff td.left input {
-	margin: 3px 3px 0;
-}
-
-#side-sortables #postcustom #postcustomstuff #the-list textarea,
-#side-sortables #pagecustomdiv #postcustomstuff #the-list textarea {
-	height: 85px;
-	margin: 3px;
-}
-
-#postcustomstuff table {
-	margin: 0;
-	width: 100%;
-	border-width: 1px;
-	border-style: solid;
-	border-spacing: 0;
-}
-
-#postcustomstuff table input,
-#postcustomstuff table select,
-#postcustomstuff table textarea {
-	width: 95%;
-	margin: 8px 0 8px 8px;
-}
-
-#postcustomstuff th.left,
-#postcustomstuff td.left {
-	width: 38%;
-}
-
-#postcustomstuff .submit input {
-	width: auto;
-}
-
-#postcustomstuff #newmeta .submit {
-	padding: 0 8px;
-}
-
-#postcustomstuff table #addmetasub {
-	width: auto;
-}
-
-#postcustomstuff #newmetaleft {
-	vertical-align: top;
-}
-
-#postcustomstuff #newmetaleft a {
-	padding: 0 10px;
-	text-decoration: none;
-}
-
-#save {
-	width: 15em;
-}
-
-#template div {
-	margin-right: 190px;
-}
-
-* html #template div {
-	margin-right: 0;
-}
-
-/* A handy div class for hiding controls.
-Some browsers will disable them when you
-set display: none; */
-.zerosize {
-	height: 0;
-	width: 0;
-	margin: 0;
-	border: 0;
-	padding: 0;
-	overflow: hidden;
-	position: absolute;
-}
-
-* html #themeselect {
-	padding: 0 3px;
-	height: 22px;
-}
-
-#your-profile legend {
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-size: 22px;
-}
-
-#howto {
-	font-size: 11px;
-	margin: 0 5px;
-	display: block;
-}
-
-#ajax-response.alignleft {
-	margin-left: 2em;
-}
-
-div.nav {
-	height: 2em;
-	padding: 7px 10px;
-	vertical-align: text-top;
-	margin: 5px 0;
-}
-
-.nav .button-secondary {
-	padding: 2px 4px;
-}
-
-a.page-numbers {
-	border-bottom-style: solid;
-	border-bottom-width: 2px;
-	font-weight: bold;
-	margin-right: 1px;
-	padding: 0 2px;
-}
-
-p.pagenav {
-	margin: 0;
-	display: inline;
-}
-
-.pagenav span {
-	font-weight: bold;
-	margin: 0 6px;
-}
-
-.row-title {
-	font-size: 12px !important;
-	font-weight: bold;
-}
-
-.column-comment p {
-	margin: 0.6em 0;
-}
-
-.column-author img, .column-username img {
-	float: left;
-	margin-right: 10px;
-	margin-top: 3px;
-}
-
-.tablenav a.button-secondary {
-	display: block;
-	margin: 3px 8px 0 0;
-}
-
-.tablenav {
-	clear: both;
-	height: 30px;
-	margin: 6px 0 4px;
-	vertical-align: middle;
-}
-
-.tablenav .tablenav-pages {
-	float: right;
-	display: block;
-	cursor: default;
-	height: 30px;
-	line-height: 30px;
-	font-size: 11px;
-}
-
-.tablenav .tablenav-pages a, .tablenav-pages span.current  {
-	text-decoration: none;
-	border: none;
-	padding: 3px 6px;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 5px;
-	-khtml-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.tablenav .displaying-num {
-	margin-right: 10px;
-	font-size: 12px;
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-style: italic;
-}
-
-.tablenav .actions {
-	padding: 2px 8px 0 0;
-}
-
-td.media-icon {
-	vertical-align: middle;
-	text-align: center;
-	width: 80px;
-}
-
-td.media-icon img {
-	max-width: 80px;
-	max-height: 60px;
-}
-
-#update-nag, .plugin-update {
-	line-height: 29px;
-	font-size: 12px;
-	text-align: center;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	border-top-width: 1px;
-	border-top-style: solid;
-}
-
-#update-nag a, .plugin-update a {
-	font-size: 1.1em;
-}
-
-#pass-strength-result {
-	border-style: solid;
-	border-width: 1px;
-	float: left;
-	margin: 12px 5px 5px 1px;
-	padding: 3px 5px;
-	text-align: center;
-	width: 200px;
-}
-
-.row-actions {
-	visibility: hidden;
-	padding: 2px 0 0;
-}
-
-tr:hover .row-actions,
-div.comment-item:hover .row-actions {
-	visibility: visible;
-}
-
-/* Admin Header */
-#wphead-info {
-	margin: 0 0 0 15px;
-	padding-right: 15px;
-}
-
-#user_info {
-	float: right;
-	font-size: 12px;
-	line-height: 46px;
-	height: 46px;
-}
-
-#user_info p {
-	margin: 0;
-	padding: 0;
-	line-height: 46px;
-}
-
-#wphead {
-	height: 46px;
-}
-
-#wphead a,
-#adminmenu a,
-#sidemenu a,
-#taglist a,
-#catlist a,
-#show-settings a {
-	text-decoration: none;
-}
-
-#header-logo {
-	float: left;
-	margin: 7px 0 0 15px;
-}
-
-#wphead h1 {
-	font: normal 22px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	padding: 10px 8px 5px;
-	margin: 0;
-	float: left;
-}
-
-#wphead h1.long-title {
-	font: normal 18px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	padding: 12px 10px 5px;
-}
-
-#wphead h1 span {
-	font-size: 50%;
-}
-
-/* side admin menu */
-#adminmenu * {
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-khtml-user-select: none;
-	user-select: none;
-}
-
-#adminmenu .wp-submenu {
-	display: none;
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	position: relative;
-	z-index: 2;
-	border-width: 1px 0 0;
-	border-style: solid none none;
-}
-
-#adminmenu .wp-submenu a {
-	font: normal 11px/18px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-}
-
-#adminmenu .wp-submenu li.current,
-#adminmenu .wp-submenu li.current a,
-#adminmenu .wp-submenu li.current a:hover {
-	font-weight: bold;
-}
-
-#adminmenu a.menu-top,
-#adminmenu .wp-submenu-head {
-	font: normal 13px/18px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-}
-
-#adminmenu div.wp-submenu-head {
-	display: none;
-}
-
-.folded #adminmenu div.wp-submenu-head,
-.folded #adminmenu li.wp-has-submenu div.sub-open {
-	display: block;
-}
-
-.folded #adminmenu a.menu-top,
-.folded #adminmenu .wp-submenu,
-.folded #adminmenu li.wp-menu-open .wp-submenu,
-.folded #adminmenu div.wp-menu-toggle {
-	display: none;
-}
-
-#adminmenu li.wp-menu-open .wp-submenu {
-	display: block;
-}
-
-#adminmenu div.wp-menu-image {
-	float: left;
-	width: 28px;
-	height: 28px;
-}
-
-#adminmenu li {
-	margin: 0;
-	padding: 0;
-	cursor: pointer;
-}
-
-#adminmenu a {
-	display: block;
-	line-height: 18px;
-	padding: 1px 5px 3px;
-}
-
-#adminmenu li.menu-top {
-	min-height: 26px;
-}
-
-#adminmenu a.menu-top {
-	line-height: 18px;
-	min-width: 10em;
-	padding: 5px 5px;
-	border-width: 1px 1px 0;
-	border-style: solid solid none;
-}
-
-#adminmenu .wp-submenu a {
-	margin: 0;
-	padding-left: 12px;
-	border-width: 0 1px 0 0;
-	border-style: none solid none none;
-}
-
-#adminmenu .menu-top-last ul.wp-submenu {
-	border-width: 0 0 1px;
-	border-style: none none solid;
-}
-
-#adminmenu .wp-submenu li {
-	padding: 0;
-	margin: 0;
-}
-
-.folded #adminmenu li.menu-top {
-	width: 28px;
-	height: 30px;
-	overflow: hidden;
-	border-width: 1px 1px 0;
-	border-style: solid solid none;
-}
-
-#adminmenu .menu-top-first a.menu-top,
-.folded #adminmenu li.menu-top-first,
-#adminmenu .wp-submenu .wp-submenu-head {
-	border-width: 1px 1px 0;
-	border-style: solid solid none;
-	-moz-border-radius-topleft :6px;
-	-moz-border-radius-topright: 6px;
-	-webkit-border-top-right-radius: 6px;
-	-webkit-border-top-left-radius: 6px;
-	-khtml-border-top-right-radius: 6px;
-	-khtml-border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-	border-top-left-radius: 6px;
-}
-
-#adminmenu .menu-top-last a.menu-top,
-.folded #adminmenu li.menu-top-last {
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius-bottomleft: 6px;
-	-moz-border-radius-bottomright: 6px;
-	-webkit-border-bottom-right-radius: 6px;
-	-webkit-border-bottom-left-radius: 6px;
-	-khtml-border-bottom-right-radius: 6px;
-	-khtml-border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-#adminmenu li.wp-menu-open a.menu-top-last {
-	border-bottom: 0 none;
-	-moz-border-radius-bottomright: 0;
-	-moz-border-radius-bottomleft: 0;
-	-webkit-border-bottom-right-radius: 0;
-	-webkit-border-bottom-left-radius: 0;
-	-khtml-border-bottom-right-radius: 0;
-	-khtml-border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-#adminmenu img.wp-menu-image {
-	float: left;
-	padding: 8px 6px 0;
-	opacity: 0.6;
-	filter: alpha(opacity=60);
-}
-
-#adminmenu li.menu-top:hover img.wp-menu-image,
-#adminmenu li.wp-has-current-submenu img.wp-menu-image {
-	opacity: 1;
-	filter: alpha(opacity=100);
-}
-
-.folded #adminmenu img.wp-menu-image {
-	padding: 7px 0 0 6px;
-}
-
-#adminmenu li.wp-menu-separator {
-	height: 21px;
-	padding: 0;
-	margin: 0;
-	cursor: w-resize;
-}
-
-.folded #adminmenu li.wp-menu-separator {
- 	cursor: e-resize;
-}
-
-#adminmenu .wp-menu-separator-last {
-	height: 10px;
-	width: 1px;
-}
-
-#adminmenu .wp-submenu .wp-submenu-head {
-	border-width: 1px;
-	border-style: solid;
-	padding: 6px 4px 6px 10px;
-	cursor: default;
-}
-
-.folded #adminmenu .wp-submenu {
-	position: absolute;
-	margin: -1px 0 0 28px;
-	padding: 0 8px 8px;
-	z-index: 999;
-	border: 0 none;
-}
-
-.folded #adminmenu .wp-submenu ul {
-	width: 140px;
-	border-width: 0 0 1px;
-	border-style: none none solid;
-}
-
-.folded #adminmenu .wp-submenu li.wp-first-item {
-	border-top: 0 none;
-}
-
-.folded #adminmenu .wp-submenu a {
-	padding-left: 10px;
-}
-
-.folded #adminmenu a.wp-has-submenu {
-	margin-left: 40px;
-}
-
-#adminmenu li.menu-top-last .wp-submenu ul {
-	border-width: 0 0 1px;
-	border-style: none none solid;
-}
-
-#adminmenu .wp-menu-toggle {
-	width: 22px;
-	clear: right;
-	float: right;
-	margin: 1px 0 0;
-	height: 27px;
-	padding: 1px 2px 0 0;
-	cursor: default;
-}
-
-#adminmenu li.wp-has-current-submenu ul {
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-/* end side admin menu */
-
-/* comments/plugins bubble in menu */
-#adminmenu #awaiting-mod,
-#adminmenu span.update-plugins,
-#sidemenu li a span.update-plugins {
-	position: absolute;
-	font-family: Helvetica, Arial, sans-serif;
-	font-size: 7pt;
-	font-weight: bold;
-	margin-top: 2px;
-	margin-left: 2px;
-	-moz-border-radius: 7px;
-	-khtml-border-radius: 7px;
-	-webkit-border-radius: 7px;
-	border-radius: 7px;
-}
-
-#adminmenu li #awaiting-mod span,
-#adminmenu li span.update-plugins span,
-#sidemenu li a span.update-plugins span {
-	float: left;
-	display: block;
-	height: 1.6em;
-	line-height: 1.6em;
-	padding: 0 6px;
-}
-
-#adminmenu li span.count-0,
-#sidemenu li a .count-0 {
-	display: none;
-}
-/* end menu stuff */
-
-/* comments bubble */
-.post-com-count-wrapper {
-	min-width: 22px;
-	font-family: Helvetica, Arial, sans-serif;
-}
-
-.post-com-count {
-	height: 1.3em;
-	line-height: 1.1em;
-	display: block;
-	text-decoration: none;
-	padding: 0 0 6px;
-	cursor: pointer;
-	background-position: center -80px;
-	background-repeat: no-repeat;
-}
-
-.post-com-count span {
-	font-size: 9px;
-	font-weight: bild;
-	height: 1.7em;
-	line-height: 1.70em;
-	min-width: 0.7em;
-	padding: 0 6px;
-	display: inline-block;
-	cursor: pointer;
-	-moz-border-radius: 5px;
-	-khtml-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-
-strong .post-com-count {
-	background-position: center -55px;
-}
-
-.post-com-count:hover {
-	background-position: center -3px;
-}
-
-.column-response .post-com-count {
-	float: left;
-	margin-right: 5px;
-	text-align: center;
-}
-
-.response-links {
-	margin: 4px 0;
-}
-
-/* Admin Footer */
-#footer {
-	margin-top: -45px;
-}
-
-#footer,
-#footer a {
-	font-size: 12px;
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-style: italic;
-}
-
-#footer p {
-	margin: 0;
-	padding: 15px;
-	line-height: 15px;
-}
-
-#footer a {
-	text-decoration: none;
-}
-
-#footer a:hover {
-	text-decoration: underline;
-}
-
-/* Tables used on comment.php and option/setting pages */
-
-.form-table {
-	border-collapse: collapse;
-	margin-top: 0.5em;
-	width: 100%;
-	margin-bottom: -8px;
-	clear: both;
-}
-
-.form-table td,
-#wpbody-content .describe td {
-	margin-bottom: 9px;
-	padding: 4px 10px 12px;
-	line-height: 20px;
-	font-size: 11px;
-}
-
-.form-table th,
-.form-wrap label {
-	font-weight: normal;
-	text-shadow: rgba(255,255,255,1) 0 1px 0;
-}
-
-.form-table th,
-#wpbody-content .describe th {
-	vertical-align: top;
-	text-align: left;
-	padding: 10px;
-	width: 200px;
-}
-
-.form-table th.th-full {
-	width: auto;
-}
-
-.form-table input,
-.form-table textarea,
-#wpbody-content .describe input,
-#wpbody-content .describe textarea {
-	border-width: 1px;
-	border-style: solid;
-}
-
-.form-table div.color-option {
-	display: block;
-	clear: both;
-	margin-top: 12px;
-}
-
-.form-table input.tog {
-	margin-top: 2px;
-	margin-right: 2px;
-	float: left;
-}
-
-.form-table table.color-palette {
-	vertical-align: bottom;
-	float: left;
-	margin: -8px 3px 8px;
-}
-
-.form-table .color-palette td {
-	border-width: 1px 1px 0;
-	border-stile: solid solid none;
-	height: 10px;
-	line-height: 20px;
-	width: 10px;
-}
-
-textarea.large-text {
-	width: 99%;
-}
-
-.form-table input.regular-text {
-	width: 325px;
-}
-
-.form-table input.small-text {
-	width: 50px;
-}
-
-#profile-page .form-table textarea {
-	width: 500px;
-	margin-bottom: 6px;
-}
-
-#profile-page .form-table input[type=text] {
-	width: 300px;
-}
-
-.form-table .pre {
-	padding: 8px;
-	margin: 0;
-}
-
-.pre {
-	/* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
-	white-space: pre-wrap; /* css-3 */
-	white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
-	white-space: -pre-wrap; /* Opera 4-6 */
-	white-space: -o-pre-wrap; /* Opera 7 */
-	word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-
-table.form-table td .updated {
-	font-size: 13px;
-}
-
-/* divs for cats and tags pages */
-
-.form-wrap {
-	margin: 10px 0;
-	width: 97%;
-}
-
-.form-wrap p,
-.form-wrap label {
-	font-size: 11px;
-}
-
-.form-wrap label {
-	display: block;
-	padding: 2px;
-	font-size: 12px;
-}
-
-.form-field input,
-.form-field textarea {
-	border-style: solid;
-	border-width: 1px;
-	width: 95%;
-}
-
-.form-wrap p {
-	margin: 2px 0 5px;
-}
-
-.setting-description, .form-wrap p {
-	font-style: italic;
-	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-}
-
-.form-wrap .form-field {
-	margin: 0 0 10px;
-	padding: 8px;
-}
-
-.col-wrap h3 {
-	margin: 12px 0;
-	font-size: 1.1em;
-}
-
-.col-wrap p.submit {
-	margin-top: -10px;
-}
-
-.tagcloud {
-	width: 97%;
-	margin: 0 0 40px;
-}
-
-.tagcloud h3 {
-	margin: 2px 0 12px;
-}
-
-/* Post Screen */
-#normal-sortables {
-	min-height: 50px;
-}
-
-.postbox {
-	position: relative;
-	min-width: 255px;
-	width: 99.5%;
-}
-
-#trackback_url {
-	width: 99%;
-}
-
-#normal-sortables .postbox .submit {
-	background: transparent none;
-	border: 0 none;
-	float: right;
-	padding: 0 12px;
-	margin: 0;
-}
-
-#normal-sortables .postbox #replyrow .submit {
-	float: none;
-	margin: 0;
-	padding: 3px 7px;
-}
-
-#side-sortables {
-	min-height: 300px;
-}
-
-#side-sortables .submitbox .submit input,
-#side-sortables .submitbox .submit .preview,
-#side-sortables .submitbox .submit a.preview:hover {
-	border: 0 none;
-}
-
-#side-sortables .inside-submitbox .insidebox,
-.stuffbox .insidebox {
-	margin: 11px 0;
-}
-
-#side-sortables .comments-box,
-#side-sortables #show-comments {
-	display: none;
-}
-
-#post-body #tagsdiv #newtag {
-	margin-right: 5px;
-	width: 16em;
-}
-
-#side-info-column input#post_password {
-	width: 94%
-}
-
-#side-info-column #tagsdiv #newtag {
-	width: 68%;
-}
-
-#post-status-info {
-	font-size: 12px;
-	line-height: 2;
-	padding: 0 15px 0 7px;
-	border-width: 0 1px 1px;
-	border-style: none solid solid;
-	-moz-border-radius: 0 0 6px 6px;
-	-webkit-border-bottom-left-radius: 6px;
-	-webkit-border-bottom-right-radius: 6px;
-	-khtml-border-bottom-left-radius: 6px;
-	-khtml-border-bottom-right-radius: 6px;
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-#editorcontent #post-status-info {
-	border: none;
-}
-
-#pagesubmitdiv div.inside,
-#linksubmitdiv div.inside,
- div.inside {
-	padding: 0;
-	margin: 0;
-}
-
-#comment-status-radio p {
-	margin: 3px 0 5px;
-}
-
-#comment-status-radio input {
-	margin: 2px 3px 5px 0;
-	vertical-align: middle;
-}
-
-#comment-status-radio label {
-	padding: 5px 0;
-}
-
-#tagchecklist {
-	margin-left: 10px;
-	font-size: 12px;
-	overflow: auto;
-}
-
-#tagchecklist strong {
-	margin-left: -8px;
-	position: absolute;
-}
-
-#tagchecklist span {
-	margin-right: 25px;
-	display: block;
-	float: left;
-	font-size: 11px;
-	line-height: 1.8em;
-	white-space: nowrap;
-	cursor: default;
-}
-
-#tagchecklist span a {
-	margin: 6px 0pt 0pt -9px;
-	cursor: pointer;
-	width: 10px;
-	height: 10px;
-	display: block;
-	float: left;
-	text-indent: -9999px;
-	overflow: hidden;
-	position: absolute;
-}
-
-.howto {
-	font-style: italic;
-	display: block;
-	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-}
-
-.ac_results {
-	padding: 0;
-	margin: 0;
-	list-style: none;
-	position: absolute;
-	z-index: 10000;
-	display: none;
-	border-width: 1px;
-	border-style: solid;
-}
-
-.ac_results li {
-	padding: 2px 5px;
-	white-space: nowrap;
-	text-align: left;
-}
-
-.ac_over {
-	cursor: pointer;
-}
-
-.ac_match {
-	text-decoration: underline;
-}
-
-#poststuff h2 {
-	margin-top: 20px;
-	font-size: 1.5em;
-	margin-bottom: 15px;
-	padding: 0 0 3px;
-	clear: left;
-}
-
-.ui-sortable .postbox h3 {
-	cursor: pointer;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-khtml-user-select: none;
-	user-select: none;
-}
-
-.ui-sortable .postbox .hndle span {
-	padding: 6px 0;
-}
-
-.ui-sortable .postbox .hndle {
-	cursor: move;
-}
-
-.hndle a {
-	font-size: 11px;
-	font-weight: normal;
-}
-
-.meta-box-sortables .postbox .handlediv {
-	float: right;
-	width: 23px;
-	height: 26px;
-}
-
-.sortable-placeholder {
-	border-width: 1px;
-	border-style: dashed;
-	z-index: -1;
-}
-
-#poststuff h3,
-.metabox-holder h3 {
-	font-size: 12px;
-	font-weight: bold;
-	padding: 7px 9px;
-	margin: 0;
-	line-height: 1;
-}
-
-.metabox-holder .postbox,
-#poststuff .postbox,
-#poststuff .stuffbox {
-	margin-bottom: 20px;
-	border-width: 1px;
-	border-style: solid;
-	line-height: 1;
-	-moz-border-radius: 6px;
-	-khtml-border-radius: 6px;
-	-webkit-border-radius: 6px;
-	border-radius: 6px;
-}
-
-.metabox-holder .postbox h3,
-#poststuff .postbox h3,
-#poststuff .stuffbox h3 {
-	-moz-border-radius: 6px 6px 0 0;
-	-webkit-border-top-right-radius: 6px;
-	-webkit-border-top-left-radius: 6px;
-	-khtml-border-top-right-radius: 6px;
-	-khtml-border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-	border-top-left-radius: 6px;
-}
-
-.postbox table.form-table {
-	margin-bottom: 0;
-}
-
-.postbox input[type="text"],
-.postbox textarea,
-.stuffbox input[type="text"],
-.stuffbox textarea {
-	border-width: 1px;
-	border-style: solid;
-}
-
-#poststuff .inside,
-#poststuff .inside p {
-	font-size: 11px;
-	margin: 6px;
-}
-
-#poststuff .inside .submitbox p {
-	margin: 1em 0;
-}
-
-#post-visibility-select {
-	line-height: 1.5em;
-	margin-top: 3px;
-}
-
-#poststuff #submitdiv .inside {
-	margin: 0;
-}
-
-#titlediv, #poststuff .postarea {
-	margin-bottom: 20px;
-}
-
-#titlediv {
-	margin-bottom: 20px;
-}
-#titlediv label { cursor: text; }
-
-#titlediv div.inside {
-	margin: 0;
-}
-
-#poststuff #titlewrap {
-	border: 0;
-	padding: 0;
-
-}
-
-#titlediv #title {
-	padding: 3px 4px;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 6px;
-	-khtml-border-radius: 6px;
-	-webkit-border-radius: 6px;
-	border-radius: 6px;
-	font-size: 1.7em;
-	width: 100%;
-	outline: none;
-}
-
-#poststuff .inside-submitbox,
-#side-info-column .inside-submitbox {
-	margin: 0 3px;
-	font-size: 11px;
-}
-
-input#link_description,
-input#link_url {
-	width: 98%;
-}
-
-#pending {
-	background: 0 none;
-	border: 0 none;
-	padding: 0;
-	font-size: 11px;
-	margin-top: -1px;
-}
-
-#edit-slug-box {
-	margin-top: 8px;
-	padding: 0 7px;
-}
-
-#editable-post-name-full {
-	display: none;
-}
-
-#editable-post-name input {
-	width: 16em;
-}
-
-.postarea h3 label {
-	float: left;
-}
-
-.postarea #add-media-button {
-	float: right;
-	margin: 7px 0pt 0pt;
-	position: relative;
-	right: 10px;
-}
-
-#poststuff #editor-toolbar {
-	height: 30px;
-}
-
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
-	display: block;
-	height: 18px;
-	margin: 5px 5px 0 0;
-	padding: 4px 5px 2px;
-	float: right;
-	cursor: pointer;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 3px 3px 0 0;
-	-webkit-border-top-right-radius: 3px;
-	-webkit-border-top-left-radius: 3px;
-	-khtml-border-top-right-radius: 3px;
-	-khtml-border-top-left-radius: 3px;
-	border-top-right-radius: 3px;
-	border-top-left-radius: 3px;
-}
-
-#poststuff #edButtonHTML {
-	margin-right: 15px;
-}
-
-#media-buttons {
-	cursor: default;
-	padding: 8px 8px 0;
-}
-
-#media-buttons a {
-	cursor: pointer;
-	padding: 0 0 5px 10px;
-}
-
-#media-buttons img {
-	vertical-align: middle;
-}
-
-.submitbox .submit {
-	text-align: left;
-	padding: 12px 10px 10px;
-	font-size: 11px;
-}
-
-.submitbox .submitdelete {
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	text-decoration: none;
-	padding: 1px 2px;
-}
-
-.inside-submitbox #post_status {
-	margin: 2px 0 2px -2px;
-}
-
-.submitbox .submit a:hover {
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-.submitbox .submit input {
-	margin-bottom: 8px;
-	margin-right: 4px;
-	padding: 6px;
-}
-
-#post-status-select {
-	line-height: 2.5em;
-	margin-top: 3px;
-}
-
-/* Categories */
-
-#category-adder {
-	margin-left: 120px;
-	padding: 4px 0;
-}
-
-#category-adder h4 {
-	margin: 0 0 8px;
-}
-
-#side-info-column #category-adder {
-	margin: 0;
-}
-
-#post-body #category-add input, #category-add select {
-	width: 30%;
-}
-
-#side-info-column #category-add input {
-	width: 94%;
-}
-
-#side-info-column #category-add select {
-	width: 100%;
-}
-
-#category-add input#category-add-sumbit {
-	width: auto;
-}
-
-#post-body ul#category-tabs {
-	float: left;
-	width: 120px;
-	text-align: right;
-	/* Negative margin for the sake of those without JS: all tabs display */
-	margin: 0 -120px 0 0;
-	padding: 0;
-}
-
-#post-body ul#category-tabs li {
-	padding: 8px;
-}
-
-#post-body ul#category-tabs li.ui-tabs-selected {
-	-moz-border-radius: 3px 0 0 3px;
-	-webkit-border-top-left-radius: 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	-khtml-border-top-left-radius: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-	border-top-left-radius: 3px;
-	border-bottom-left-radius: 3px;
-}
-
-#post-body ul#category-tabs li.ui-tabs-selected a {
-	font-weight: bold;
-	text-decoration: none;
-}
-
-#categorydiv div.ui-tabs-panel,
-#linkcategorydiv div.ui-tabs-panel {
-	height: 150px;
-	overflow: auto;
-	padding: 0.5em 0.9em;
-}
-
-#post-body #categorydiv div.ui-tabs-panel,
-#post-body #linkcategorydiv div.ui-tabs-panel {
-	margin: 0 5px 0 120px;
-	height: 10em;
-	overflow: auto;
-	border-width: 4px;
-	border-style: solid;
-}
-
-#side-info-column #category-tabs li {
-	display: inline;
-	padding-right: 8px;
-}
-
-#side-info-column #category-tabs a {
-	text-decoration: none;
-}
-
-#side-info-column #category-tabs {
-	margin-bottom: 3px;
-}
-
-#categorydiv ul,
-#linkcategorydiv ul {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-}
-
-#categorydiv ul.categorychecklist ul,
-#linkcategorydiv ul.categorychecklist ul {
-	margin-left: 18px;
-}
-
-ul.categorychecklist li {
-	margin: 0;
-	padding: 0;
-	line-height: 19px;
-}
-
-/* positioning etc. */
-
-form#tags-filter {
-	position: relative;
-}
-
-p.search-box {
-	float: right;
-	margin: -5px 0 0;
-}
-
-.search-input {
-	border-width: 1px;
-	border-style: solid;
-	padding: 2px;
-}
-
-#posts-filter fieldset {
-	float: left;
-	margin: 0 1.5ex 1em 0;
-	padding: 0;
-}
-
-#posts-filter fieldset legend {
-	padding: 0 0 .2em 1px;
-}
-
-.bordertitle {
-	padding-bottom: 5px;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-/* Edit posts */
-
-td.post-title strong {
-	display: block;
-	margin-bottom: .2em;
-}
-
-td.post-title p {
-	margin: 6px 0;
-}
-
-/* Global classes */
-
-.wp-hidden-children .wp-hidden-child,
-.ui-tabs-hide {
-	display: none;
-}
-
-.commentlist .avatar {
-	vertical-align: text-top;
-}
-
-.defaultavatarpicker .avatar {
-	margin: 2px 0;
-	vertical-align: middle;
-}
-
-body.wp-admin {
-	min-width: 785px;
-}
-
-.view-switch {
-	float: right;
-	margin: 6px 8px 0;
-}
-
-.view-switch a {
-	text-decoration: none;
-}
-
-.filter {
-	float: left;
-	margin: -5px 0 0 10px;
-}
-
-.filter .subsubsub {
-	margin-left: -10px;
-	margin-top: 13px;
-}
-
-#the-comment-list td.comment p.comment-author {
-	margin-top: 0;
-	margin-left: 0;
-}
-
-#the-comment-list p.comment-author img {
-	float: left;
-	margin-right: 8px;
-}
-
-#the-comment-list p.comment-author strong a {
-	border: none;
-}
-
-#the-comment-list td {
-	vertical-align: top;
-}
-
-#the-comment-list td.comment {
-	word-wrap: break-word;
-}
-
-#the-comment-list .check-column {
-	padding-top: 8px;
-}
-
-#templateside ul li a {
-	text-decoration: none;
-}
-
-.tablenav .delete {
-	margin-right: 20px;
-}
-
-td.action-links, th.action-links {
-	text-align: right;
-}
-
-/* Diff */
-
-table.diff {
-	width: 100%;
-}
-
-table.diff col.content {
-	width: 50%;
-}
-
-table.diff tr {
-	background-color: transparent;
-}
-
-table.diff td, table.diff th {
-	padding: .5em;
-	font-family: Consolas, Monaco, Courier, monospace;
-	border: none;
-}
-
-table.diff .diff-deletedline del, table.diff .diff-addedline ins {
-	text-decoration: none;
-}
-
-#wp-word-count {
-	display: block;
-}
-
-fieldset {
-	border: 0;
-	padding: 0;
-	margin: 0;
-}
-
-.tool-box {
-	margin: 15px 0 35px;
-}
-
-.tool-box .buttons {
-	margin: 15px 0;
-}
-
-.tool-box .title {
-	margin: 8px 0;
-	font: 18px/24px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-}
-
-.pressthis a {
-	font-size: 1.2em;
-}
-
-#wp_editbtns,
-#wp_gallerybtns {
-	padding: 2px;
-	position: absolute;
-	display: none;
-	z-index: 999998;
-}
-
-#wp_editimgbtn,
-#wp_delimgbtn,
-#wp_editgallery,
-#wp_delgallery {
-	margin: 2px;
-	padding: 2px;
-	border-width: 1px;
-	border-style: solid;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-.settings-toggle {
-	text-align: right;
-	margin: 5px 7px 15px 0;
-	font-size: 12px;
-}
-
-.settings-toggle h3 {
-	margin: 0;
-}
-
-#timestampdiv select {
-	height: 20px;
-	line-height: 20px;
-	padding: 0;
-}
-
-#jj, #hh, #mn {
-	width: 2em;
-	padding: 1px;
-	font-size: 12px;
-}
-
-#aa {
-	width: 3.4em;
-	padding: 1px;
-	font-size: 12px;
-}
-
-.curtime #timestamp {
-	background-repeat: no-repeat;
-	background-position: left top;
-	padding-left: 18px;
-}
-
-#timestampdiv {
-	padding-top: 5px;
-	line-height: 23px;
-}
-
-#timestampdiv p {
-	margin: 8px 0 6px;
-}
-
-#timestampdiv input {
-	border-width: 1px;
-	border-style: solid;
-}
-
-/* media popup 0819 */
-#sidemenu {
-	margin: -30px 15px 0 315px;
-	list-style: none;
-	position: relative;
-	float: right;
-	padding-left: 10px;
-	font-size: 12px;
-}
-
-#sidemenu a {
-	padding: 0 7px;
-	display: block;
-	float: left;
-	line-height: 28px;
-	border-top-width: 1px;
-	border-top-style: solid;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-#sidemenu li {
-	display: inline;
-	line-height: 200%;
-	list-style: none;
-	text-align: center;
-	white-space: nowrap;
-	margin: 0;
-	padding: 0;
-}
-
-#sidemenu a.current {
-	font-weight: normal;
-	padding-left: 6px;
-	padding-right: 6px;
-	-moz-border-radius: 4px 4px 0 0;
-	-webkit-border-top-left-radius: 4px;
-	-webkit-border-top-right-radius: 4px;
-	-khtml-border-top-left-radius: 4px;
-	-khtml-border-top-right-radius: 4px;
-	border-top-left-radius: 4px;
-	border-top-right-radius: 4px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-#sidemenu {
-	margin: -30px 15px 0 315px;
-	list-style: none;
-	position: relative;
-	float: right;
-	padding-left: 10px;
-	font-size: 12px;
-}
-
-#sidemenu a {
-	padding: 0 7px;
-	display: block;
-	float: left;
-	line-height: 28px;
-	border-top-width: 1px;
-	border-top-style: solid;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-#sidemenu li a .count-0 {
-	display: none;
-}
-
-/* reply to comments */
-#replyrow {
-	font-size: 11px;
-}
-
-#replyrow input {
-	border-width: 1px;
-	border-style: solid;
-}
-
-#replyrow td {
-	padding: 2px;
-}
-
-#replyrow #editorcontainer {
-	border: 0 none;
-}
-
-#replysubmit {
-	margin: 0;
-	padding: 3px 7px;
-}
-
-#replysubmit img.waiting,
-.inline-edit-save img.waiting,
-#commentstatusdiv img.waiting {
-	padding: 0 10px;
-	vertical-align: top;
-}
-
-#replysubmit .button {
-	margin-right: 5px;
-}
-
-#replyrow #editor-toolbar {
-	display: none;
-}
-
-#replyhead {
-	font-size: 12px;
-	font-weight: bold;
-	padding: 2px 10px 4px;
-}
-
-#edithead .inside {
-	float: left;
-	padding: 3px 0 2px 5px;
-	margin: 0;
-	text-align: center;
-	font-size: 11px;
-}
-
-#edithead .inside input {
-	width: 180px;
-	font-size: 11px;
-}
-
-#edithead label {
-	padding: 2px 0;
-}
-
-#replycontainer {
-	padding: 5px;
-	border: 0 none;
-	height: 120px;
-	overflow: hidden;
-	position: relative;
-}
-
-#replycontent {
-	resize: none;
-	margin: 0;
-	width: 100%;
-	height: 100%;
-	padding: 0;
-	line-height: 150%;
-	border: 0 none;
-	outline: none;
-	font-size: 12px;
-}
-
-#replyrow #ed_reply_toolbar {
-	margin: 0;
-	padding: 2px 3px;
-}
-
-#replyrow #ed_reply_toolbar input {
-	margin: 1px 2px 1px 1px;
-	min-width: 24px;
-	padding: 3px 4px;
-	font-size: 11px;
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-/* show/hide settings */
-
-#screen-meta {
-	position: relative;
-	clear: both;
-}
-
-#screen-meta-links {
-	margin: 0 9px 0 0;
-}
-
-#screen-meta .invisible {
-	visibility: hidden;
-}
-
-#screen-options-link-wrap,
-#contextual-help-link-wrap {
-	float: right;
-	background: transparent url( images/screen-options-left.svg ) no-repeat 0 0;
-	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-	height: 22px;
-	padding: 0;
-	margin: 0 6px 0 0;
-}
-
-#screen-meta a.show-settings {
-	text-decoration: none;
-	z-index: 1;
-	padding: 0 16px 0 6px;
-	height: 22px;
-	line-height: 22px;
-	font-size: 10px;
-	display: block;
-	background-repeat: no-repeat;
-	background-position: right bottom;
-}
-
-#screen-meta a.show-settings {
-	background-image: url( images/screen-options-right.svg );
-}
-
-#screen-meta a.show-settings:hover {
-	text-decoration: none;
-}
-
-#screen-options-wrap h5,
-#contextual-help-wrap h5 {
-	margin: 8px 0;
-	font-size: 13px;
-}
-
-#screen-options-wrap,
-#contextual-help-wrap {
-	border-style: none solid solid;
-	border-top: 0 none;
-	border-width: 0 1px 1px;
-	margin: 0 15px;
-	padding: 8px 12px 12px;
-	-moz-border-radius: 0 0 0 4px;
-	-webkit-border-bottom-left-radius: 4px;
-	-khtml-border-bottom-left-radius: 4px;
-	border-bottom-left-radius: 4px;
-}
-
-.metabox-prefs label {
-	padding-right: 15px;
-	white-space: nowrap;
-	line-height: 30px;
-}
-
-.metabox-prefs label input {
-	margin: 0 5px 0 2px;
-}
-
-.metabox-prefs label a {
-	display: none;
-}
-
-/* Inline Editor
-	.quick-edit* is for Quick Edit
-	.bulk-edit* is for Bulk Edit
-	.inline-edit* is for everything
-*/
-/*	Layout */
-tr.inline-edit-row td {
-	padding: 0 0.5em;
-}
-
-#wpbody-content .inline-edit-row fieldset {
-	font-size: 12px;
-	float: left;
-	margin: 0;
-	padding: 0;
-	width: 100%;
-}
-
-#wpbody-content .inline-edit-row fieldset .inline-edit-col {
-	padding: 0 0.5em;
-}
-
-#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col {
-	border-width: 0 0 0 1px;
-	border-style: none none none solid;
-}
-
-#wpbody-content .quick-edit-row-post .inline-edit-col-left {
-	width: 40%;
-}
-
-#wpbody-content .quick-edit-row-post .inline-edit-col-right {
-	width: 39%;
-}
-
-#wpbody-content .inline-edit-row-post .inline-edit-col-center {
-	width: 20%;
-}
-
-#wpbody-content .quick-edit-row-page .inline-edit-col-left {
-	width: 50%;
-}
-
-#wpbody-content .quick-edit-row-page .inline-edit-col-right,
-#wpbody-content .bulk-edit-row-post .inline-edit-col-right {
-	width: 49%;
-}
-
-#wpbody-content .bulk-edit-row .inline-edit-col-left {
-	width: 30%;
-}
-
-#wpbody-content .bulk-edit-row-page .inline-edit-col-right {
-	width: 69%;
-}
-
-#wpbody-content .bulk-edit-row .inline-edit-col-bottom {
-	float: right;
-	width: 69%;
-}
-
-#wpbody-content .inline-edit-row-page .inline-edit-col-right,
-#owpbody-content .bulk-edit-row-post .inline-edit-col-right {
-	margin-top: 27px;
-}
-
-.inline-edit-row fieldset .inline-edit-group {
-	clear: both;
-}
-
-.inline-edit-row fieldset .inline-edit-group:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-
-.inline-edit-row p.submit {
-	clear: both;
-	padding: 0.5em;
-	margin: 0.5em 0 0;
-}
-
-/*	Positioning */
-.inline-edit-row h4 {
-	margin: .2em 0;
-	padding: 0;
-	line-height: 23px;
-}
-.inline-edit-row fieldset span.title,
-.inline-edit-row fieldset span.checkbox-title {
-	margin: 0;
-	padding: 0;
-	line-height: 27px;
-}
-
-.inline-edit-row fieldset label,
-.inline-edit-row fieldset span.inline-edit-categories-label {
-	display: block;
-	margin: .2em 0;
-}
-
-.inline-edit-row fieldset label.inline-edit-tags {
-	margin-top: 0;
-}
-
-.inline-edit-row fieldset label.inline-edit-tags span.title {
-	margin: .2em 0;
-}
-
-.inline-edit-row fieldset label span.title {
-	display: block;
-	float: left;
-	width: 5em;
-}
-
-.inline-edit-row fieldset label span.input-text-wrap {
-	display: block;
-	margin-left: 5em;
-}
-
-.quick-edit-row-post fieldset.inline-edit-col-right label span.title {
-	width: auto;
-	padding-right: 0.5em;
-}
-
-.inline-edit-row .input-text-wrap input[type=text] {
-	width: 100%;
-}
-
-.inline-edit-row fieldset label input[type=checkbox] {
-	vertical-align: text-bottom;
-}
-
-.inline-edit-row fieldset label textarea {
-	width: 100%;
-	height: 4em;
-}
-
-#wpbody-content .bulk-edit-row fieldset .inline-edit-group label {
-	max-width: 50%;
-}
-
-#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child {
-	margin-right: 0.5em
-}
-
-/*	Styling */
-.inline-edit-row h4 {
-	text-transform: uppercase;
-}
-
-.inline-edit-row fieldset span.title,
-.inline-edit-row fieldset span.checkbox-title {
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-style: italic;
-	line-height: 1.8em;
-}
-
-/*	Specific Elements */
-.inline-edit-row fieldset input[type="text"],
-.inline-edit-row fieldset textarea {
-	border-style: solid;
-	border-width: 1px;
-}
-
-.inline-edit-row fieldset .inline-edit-date {
-	float: left;
-}
-
-.inline-edit-row fieldset input[name=jj],
-.inline-edit-row fieldset input[name=hh],
-.inline-edit-row fieldset input[name=mn] {
-	font-size: 12px;
-	width: 2.1em;
-}
-
-.inline-edit-row fieldset input[name=aa] {
-	font-size: 12px;
-	width: 3.5em;
-}
-
-.inline-edit-row fieldset label input.inline-edit-password-input {
-	width: 8em;
-}
-
-ul.cat-checklist {
-	height: 12em;
-	border-style: solid;
-	border-width: 1px;
-	overflow-y: scroll;
-	padding: 0 5px;
-	margin: 0 0 5px;
-}
-
-#bulk-titles {
-	display: block;
-	height: 12em;
-	border-style: solid;
-	border-width: 1px;
-	overflow-y: scroll;
-	padding: 0 5px;
-	margin: 0 0 5px;
-}
-
-.inline-edit-row fieldset ul.cat-checklist li,
-.inline-edit-row fieldset ul.cat-checklist input {
-	margin: 0;
-}
-
-.inline-edit-row fieldset ul.cat-checklist label,
-.inline-edit-row .catshow,
-.inline-edit-row .cathide,
-.inline-edit-row #bulk-titles div {
-	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-	font-style: normal;
-	font-size: 11px;
-}
-
-table .inline-edit-row fieldset ul.cat-hover {
-	height: auto;
-	max-height: 30em;
-	overflow-y: auto;
-	position: absolute;
-}
-
-.inline-edit-row fieldset label input.inline-edit-menu-order-input {
-	width: 3em;
-}
-
-.inline-edit-row fieldset label input.inline-edit-slug-input {
-	width: 75%;
-}
-
-.quick-edit-row-post fieldset label.inline-edit-status {
-	float: left;
-}
-
-#bulk-titles {
-	line-height: 140%;
-}
-#bulk-titles div {
-	margin: 0.2em 0.3em;
-}
-
-#bulk-titles div a {
-	cursor: pointer;
-	display: block;
-	float: left;
-	height: 10px;
-	margin: 3px 3px 0 -2px;
-	overflow: hidden;
-	position: relative;
-	text-indent: -9999px;
-	width: 10px;
-}
-
-/* Media library */
-#wpbody-content #media-items .describe {
-	border-collapse: collapse;
-	width: 100%;
-	border-top-style: solid;
-	border-top-width: 1px;
-	clear: both;
-	cursor: default;
-	padding: 5px;
-	width: 100%;
-}
-
-#wpbody-content .describe .media-item-info tr {
-	background-color: transparent;
-}
-
-#wpbody-content .filename {
-	margin-left: 10px;
-}
-
-#wpbody-content .media-item .thumbnail {
-	max-height: 128px;
-	max-width: 128px;
-}
-
-#wpbody-content .media-upload-form label {
-	display: block;
-	font-size: 13px;
-	margin: 0.5em;
-}
-
-abbr.required {
-	border: medium none;
-	text-decoration: none;
-}
-
-#wpbody-content .describe input[type="text"],
-#wpbody-content .describe textarea {
-	width: 460px;
-}
-
-#wpbody-content .describe p.help {
-	margin: 0;
-	padding: 0;
-}
-
-.describe-toggle-on, .describe-toggle-off {
-	display: block;
-	line-height: 36px;
-	float: right;
-	margin-right: 20px;
-}
-
-.describe-toggle-off {
-	display: none;
-}
-
-#wpbody-content .media-item {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	min-height: 36px;
-	position: relative;
-	width: 100%;
-}
-
-#wpbody-content #media-items {
-	border-style: solid solid none;
-	border-width: 1px;
-	width: 670px;
-}
-
-#wpbody-content #media-items .filename {
-	float: left;
-	line-height: 36px;
-	margin-left: 10px;
-	max-width: 430px;
-	overflow: hidden;
-}
-
-.media-item .pinkynail {
-	float: left;
-	height: 32px;
-	margin: 2px;
-	max-width: 40px;
-	max-height: 40px;
-}
-
-.media-item  .startopen,
-.media-item .startclosed {
-	display: none;
-}
-
-/* find posts */
-.find-box {
-	width: 400px;
-	height: 250px;
-	overflow: hidden;
-	padding: 33px 5px 50px;
-	position: absolute;
-	z-index: 1000;
-}
-
-.find-box-head {
-	cursor: move;
-	font-weight: bold;
-	height: 2em;
-	line-height: 2em;
-	padding: 1px 12px;
-	position: absolute;
-	top: 5px;
-	width: 100%;
-}
-
-.find-box-inside {
-	overflow: auto;
-	width: 100%;
-	height: 100%;
-}
-
-.find-box-search {
-	padding: 12px;
-	border-width: 1px;
-	border-style: none none solid;
-}
-
-#find-posts-response {
-	margin: 8px 0;
-	padding: 0 1px;
-}
-
-#find-posts-response table {
-	width: 100%;
-}
-
-#find-posts-response .found-radio {
-	padding: 8px 0 0 8px;
-	width: 15px;
-}
-
-.find-box-buttons {
-	bottom: 12px;
-	left: 12px;
-	position: absolute;
-}
-
-.find-box-search label {
-	padding-right: 6px;
-}
-
-/* favorite-actions */
-#favorite-actions {
-	float: right;
-	margin: 11px 12px 0;
-	min-width: 130px;
-	position: relative;
-}
-
-#favorite-first {
-	-moz-border-radius: 12px;
-	-khtml-border-radius: 12px;
-	-webkit-border-radius: 12px;
-	border-radius: 12px;
-	line-height: 15px;
-	padding: 3px 30px 4px 12px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-#favorite-inside {
-	margin: 0 0 0 0px;
-	padding: 0 1px 6px 1px;
-	border-width: 1px;
-	border-style: solid;
-	position: absolute;
-	z-index: 11;
-	display: none;
-	-moz-border-radius: 0 0 12px 12px;
-	-webkit-border-bottom-right-radius: 12px;
-	-webkit-border-bottom-left-radius: 12px;
-	-khtml-border-bottom-right-radius: 12px;
-	-khtml-border-bottom-left-radius: 12px;
-	border-bottom-right-radius: 12px;
-	border-bottom-left-radius: 12px;
-}
-
-#favorite-actions a {
-	display: block;
-	text-decoration: none;
-	font-size: 11px;
-}
-
-#favorite-inside a {
-	padding: 3px 5px 3px 10px;
-}
-
-#favorite-toggle {
-	height: 22px;
-	position: absolute;
-	right: 0;
-	top: 1px;
-	width: 28px;
-}
-
-#favorite-actions .slide-down {
-	background-image: url(images/fav-top.svg);
-	background-repeat: repeat-x;
-	background-position: 0 top;
-	-moz-border-radius: 12px 12px 0 0;
-	-webkit-border-bottom-right-radius: 0;
-	-webkit-border-bottom-left-radius: 0;
-	-khtml-border-bottom-right-radius: 0;
-	-khtml-border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-#utc-time, #local-time {
-	padding-left: 25px;
-	font-style: italic;
-	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-}
-
-ul#dismissed-updates {
-	display: none;
-}
-form.upgrade {
-	margin-top: 8px;
-}
-
-#tagsdiv #the-tagcloud {
-	margin: 5px 5px 10px;
-	padding: 8px;
-	border-width: 1px;
-	border-style: solid;
-	line-height: 1.8em;
-	word-spacing: 3px;
-	-moz-border-radius: 6px;
-	-khtml-border-radius: 6px;
-	-webkit-border-radius: 6px;
-	border-radius: 6px;
-}
-
-br.clear {
-	height: 2px;
-	line-height: 2px;
-}
-
-.swfupload {
-	margin: 5px 10px;
-	vertical-align: middle;
-}
-
-/* table.fixed column width */
-table.fixed {
-	table-layout: fixed;
-}
-
-.fixed .column-date,
-.fixed .column-parent,
-.fixed .column-visible,
-.fixed .column-links {
-	width: 10%;
-}
-
-.fixed .column-response,
-.fixed .column-author,
-.fixed .column-categories,
-.fixed .column-tags,
-.fixed .column-rel,
-.fixed .column-role {
-	width: 15%;
-}
-
-.fixed .column-comments {
-	width: 4em;
-}
-
-.fixed .column-slug {
-	width: 25%;
-}
-
-.fixed .column-posts {
-	width: 10%;
-}
-
-.fixed .column-icon {
-	width: 80px;
-}
-
-#commentstatusdiv .fixed .column-author,
-#comments-form .fixed .column-author,
-#commentstatusdiv .fixed .column-date {
-	width: 20%;
-}
-
-.widefat th,
-.widefat td {
-	overflow: hidden;
-}
-
-.widefat th {
-	text-shadow: rgba(255,255,255,0.8) 0 1px 0;
-}
-
-.icon32 {
-	float: left;
-	height: 36px;
-	margin: 14px 6px 0 0;
-	width: 36px;
-}
-
-.key-labels label {
-	line-height: 24px;
-}
-
-.subtitle {
-	font-size: 0.75em;
-	line-height: 1;
-	padding-left: 25px;
-}
diff -uNr a/mp-wp/wp-content/plugins/footnotes.php b/mp-wp/wp-content/plugins/footnotes.php
--- a/mp-wp/wp-content/plugins/footnotes.php 5f8bedbdaf66b24223d250d56acc0050ad7df6b7abade9d7834e835142ec46a5baff035c48fece400e10db78116d2af885d2ebfb8522f4ffcee876d58a0969a3
+++ b/mp-wp/wp-content/plugins/footnotes.php 08b3ee019a622247dc87083980dc20fea7083b985094d6b5952ffa5a96f96f653e67e40edb841fde11691cf842403c1db58d3d89dab65866a6a8b947740e9d07
@@ -299,7 +299,7 @@
 				word-break: break-all;
 			}
 			span.line-added { color: green; }
-			span.line-removed { color:red; }
+			span.line-removed { color: red; }
 			
 			<?php if ($this->options['list_style_type'] != 'symbol'): ?>
 			ol.footnotes li { list-style-type: <?php echo $this->options['list_style_type']; ?>; }
diff -uNr a/mp-wp/wp-content/themes/classic/comments-popup.php b/mp-wp/wp-content/themes/classic/comments-popup.php
--- a/mp-wp/wp-content/themes/classic/comments-popup.php 720cdb5387afd7d31abdeb5c04ee8aa5081cdd972b1349f3783a9e0a570e38057b31a9c288ddcc73b2c072061f35460e7eb159bb09df51aa2db356e408fe752b
+++ b/mp-wp/wp-content/themes/classic/comments-popup.php false
@@ -1,126 +0,0 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Classic_Theme
- */
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-     <title><?php echo get_option('blogname'); ?> - <?php echo sprintf(__("Comments on %s"), the_title('','',false)); ?></title>
-
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-	<style type="text/css" media="screen">
-		@import url( <?php bloginfo('stylesheet_url'); ?> );
-		body { margin: 3px; }
-	</style>
-
-</head>
-<body id="commentspopup">
-
-<h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
-
-<?php
-/* Don't remove these lines. */
-add_filter('comment_text', 'popuplinks');
-if ( have_posts() ) :
-while( have_posts()) : the_post();
-?>
-
-<h2 id="comments"><?php _e("Comments"); ?></h2>
-
-<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
-
-<?php if ('open' == $post->ping_status) { ?>
-<p><?php _e("The <abbr title=\"Universal Resource Locator\">URL</abbr> to TrackBack this entry is:"); ?> <em><?php trackback_url() ?></em></p>
-<?php } ?>
-
-<?php
-// this line is WordPress' motor, do not delete it.
-$commenter = wp_get_current_commenter();
-extract($commenter);
-$comments = get_approved_comments($id);
-$commentstatus = get_post($id);
-if ( post_password_required($commentstatus) ) {  // and it doesn't match the cookie
-	echo(get_the_password_form());
-} else { ?>
-
-<?php if ($comments) { ?>
-<ol id="commentlist">
-<?php foreach ($comments as $comment) { ?>
-	<li id="comment-<?php comment_ID() ?>">
-	<?php comment_text() ?>
-	<p><cite><?php comment_type(_c('Comment|noun'), __('Trackback'), __('Pingback')); ?> <?php _e("by"); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
-	</li>
-
-<?php } // end for each comment ?>
-</ol>
-<?php } else { // this is displayed if there are no comments so far ?>
-	<p><?php _e("No comments yet."); ?></p>
-<?php } ?>
-
-<?php if ('open' == $commentstatus->comment_status) { ?>
-<h2><?php _e("Leave a comment"); ?></h2>
-<p><?php _e("Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed:"); ?> <code><?php echo allowed_tags(); ?></code></p>
-
-<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
-<?php if ( $user_ID ) : ?>
-<p><?php printf(__('Logged in as %s.'), '<a href="'.get_option('siteurl').'/wp-admin/profile.php">'.$user_identity.'</a>'); ?> <a href="<?php echo wp_logout_url(); ?>" title="<?php echo attribute_escape(__('Log out of this account')); ?>"><?php _e('Log out &raquo;'); ?></a></p>
-<?php else : ?>
-	<p>
-	  <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
-	   <label for="author"><?php _e("Name"); ?></label>
-	</p>
-
-	<p>
-	  <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
-	   <label for="email"><?php _e("E-mail"); ?></label>
-	</p>
-
-	<p>
-	  <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
-	   <label for="url"><?php _e("<abbr title=\"Universal Resource Locator\">URL</abbr>"); ?></label>
-	</p>
-<?php endif; ?>
-
-	<p>
-	  <label for="comment"><?php _e("Your Comment"); ?></label>
-	<br />
-	  <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
-	</p>
-
-	<p>
-	  <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-	  <input type="hidden" name="redirect_to" value="<?php echo attribute_escape($_SERVER["REQUEST_URI"]); ?>" />
-	  <input name="submit" type="submit" tabindex="5" value="<?php _e("Say It!"); ?>" />
-	</p>
-	<?php do_action('comment_form', $post->ID); ?>
-</form>
-<?php } else { // comments are closed ?>
-<p><?php _e("Sorry, the comment form is closed at this time."); ?></p>
-<?php }
-} // end password check
-?>
-
-<div><strong><a href="javascript:window.close()"><?php _e("Close this window."); ?></a></strong></div>
-
-<?php // if you delete this the sky will fall on your head
-endwhile; //endwhile have_posts()
-else: //have_posts()
-?>
-<p>Sorry, no posts matched your criteria.</p>
-<?php endif; ?>
-
-<!-- // this is just the end of the motor - don't touch that line either :) -->
-<?php //} ?>
-<p class="credit"><?php timer_stop(1); ?> <?php echo sprintf(__("<cite>Powered by <a href=\"http://wordpress.org\" title=\"%s\"><strong>WordPress</strong></a></cite>"),__("Powered by WordPress, state-of-the-art semantic personal publishing platform.")); ?></p>
-<?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
-<script type="text/javascript">
-<!--
-document.onkeypress = function esc(e) {
-	if(typeof(e) == "undefined") { e=event; }
-	if (e.keyCode == 27) { self.close(); }
-}
-// -->
-</script>
-</body>
-</html>
diff -uNr a/mp-wp/wp-content/themes/classic/rtl.css b/mp-wp/wp-content/themes/classic/rtl.css
--- a/mp-wp/wp-content/themes/classic/rtl.css ddfdb660f9951906b3013cd103a3b0f5492587724181f20e2862eb8ff0d3671d2fb2a4c2b155b244d93bc0900fba0a953ebd1a796a4a40d96e30fe4232f03e6b
+++ b/mp-wp/wp-content/themes/classic/rtl.css false
@@ -1,92 +0,0 @@
-/* Based on Arabic (RTL) version of WordPress Classic theme, converted by Serdal (Serdal.com) */
-
-#menu ul ul, #wp-calendar caption, #wp-calendar #prev a { text-align: right; }
-#wp-calendar #next a, .feedback { text-align: left; }
-
-blockquote {
-	border-left: 0;
-	border-right: 5px solid #ccc;
-	margin-left: auto;
-	margin-right: 1.5em;
-	padding-left: 0;
-	padding-right: 5px;
-}
-
-body { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; }
-
-h2 { font: 95% 'Al Bayan', 'Traditional Arabic', "Times New Roman", Times, serif; }
-
-p, li, .feedback {
-	font: 90%/175% 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	text-align: justify;
-}
-
-acronym, abbr, span.caps, h2, p, li, #header, #menu ul li, #menu ul ul li, #wp-calendar td, .feedback, .meta, .meta a { letter-spacing: normal; }
-
-#commentlist li ul {
-	border-left: 0;
-	border-right: 1px solid #ddd;
-}
-
-#commentlist li .avatar {
-	margin-right: 0;
-	margin-left: 12px;
-}
-
-#commentlist li .avatar {
-	margin-right: 0;
-	margin-left: 12px;
-}
-
-#content {
-	margin: 30px 3em 0 13em;
-	padding-right: 0;
-	padding-left: 60px;
-}
-
-#header {
-	border-left: solid 1px #9a9;
-	border-right: solid 1px #565;
-	font: normal normal 230% 'Al Bayan', 'Traditional Arabic', 'Times New Roman', Times, serif;
-	padding: 15px 60px 15px 10px;
-}
-
-#menu {
-	border-left: 0;
-	border-right: 1px dotted #ccc;
-	padding: 20px 30px 10px 0;
-	right: auto;
-	left: 2px;
-}
-
-#menu form { margin: 0 13px 0 0; }
-
-#menu ul {
-	padding-left: 0;
-	padding-right: 3px;
-}
-
-#menu ul li { font: normal normal 110% 'Geeza Pro', Tahoma, 'Times New Roman', Times, serif; }
-
-#menu ul ul li {
-	font: normal normal 12px/115% 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	padding-left: 0;
-	padding-right: 12px;
-}
-
-#menu ul ul ul.children {
-	padding-left: 0;
-	padding-right: 4px;
-}
-
-#wp-calendar #next a {
-	padding-right: 0;
-	padding-left: 10px;
-}
-
-#wp-calendar #prev a {
-	padding-left: 0;
-	padding-right: 10px;
-}
-
-#wp-calendar td { font: normal normal 12px 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; }
diff -uNr a/mp-wp/wp-content/themes/classic/style.css b/mp-wp/wp-content/themes/classic/style.css
--- a/mp-wp/wp-content/themes/classic/style.css d5961fa49353447e5065c12d322083faab1bfb4744d8e6eeee4fb12bf1b883debfc83cd303c8dd9c1551b7cd7d45e75087349dd6d14e3426be8dc8b692fdcddd
+++ b/mp-wp/wp-content/themes/classic/style.css 52aa1fd09b41d5618edaac4b1d38243a7eb6265324246745dc7c88155cfa2d31bd64284b2a2f8129aab9a85c0878a238023d98c79b05037d1001b8a49d3e0a83
@@ -29,7 +29,7 @@
 }
 
 acronym, abbr {
-	border-bottom: 1px dashed #333;
+	border-bottom: 1px dashed #303434;
 }
 
 acronym, abbr, span.caps {
@@ -146,7 +146,7 @@
 
 #commentform #author, #commentform #email, #commentform #url, #commentform textarea {
 	background: #fff;
-	border: 1px solid #333;
+	border: 1px solid #303434;
 	padding: .2em;
 }
 
@@ -289,7 +289,7 @@
 
 #wp-calendar a:hover {
 	background: #e0e6e0;
-	color: #333;
+	color: #303434;
 }
 
 #wp-calendar caption {
@@ -343,7 +343,6 @@
 	padding-top: 4px;
 	margin: 10px;
 	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
diff -uNr a/mp-wp/wp-content/themes/default/comments-popup.php b/mp-wp/wp-content/themes/default/comments-popup.php
--- a/mp-wp/wp-content/themes/default/comments-popup.php 10367854b5e3954b6e037469e5fece559a76ed62d0f13ae8f1662264b257dff416a111ecd9cefdea99209f655b5cce3f318c679ce143993b2ed271776823e300
+++ b/mp-wp/wp-content/themes/default/comments-popup.php false
@@ -1,126 +0,0 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Default_Theme
- */
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-     <title><?php echo get_option('blogname'); ?> - Comments on <?php the_title(); ?></title>
-
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-	<style type="text/css" media="screen">
-		@import url( <?php bloginfo('stylesheet_url'); ?> );
-		body { margin: 3px; }
-	</style>
-
-</head>
-<body id="commentspopup">
-
-<h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
-
-<?php
-/* Don't remove these lines. */
-add_filter('comment_text', 'popuplinks');
-if ( have_posts() ) :
-while ( have_posts() ) : the_post();
-?>
-<h2 id="comments">Comments</h2>
-
-<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
-
-<?php if ('open' == $post->ping_status) { ?>
-<p>The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
-<?php } ?>
-
-<?php
-// this line is WordPress' motor, do not delete it.
-$commenter = wp_get_current_commenter();
-extract($commenter);
-$comments = get_approved_comments($id);
-$post = get_post($id);
-if ( post_password_required($post) ) {  // and it doesn't match the cookie
-	echo(get_the_password_form());
-} else { ?>
-
-<?php if ($comments) { ?>
-<ol id="commentlist">
-<?php foreach ($comments as $comment) { ?>
-	<li id="comment-<?php comment_ID() ?>">
-	<?php comment_text() ?>
-	<p><cite><?php comment_type('Comment', 'Trackback', 'Pingback'); ?> by <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
-	</li>
-
-<?php } // end for each comment ?>
-</ol>
-<?php } else { // this is displayed if there are no comments so far ?>
-	<p>No comments yet.</p>
-<?php } ?>
-
-<?php if ('open' == $post->comment_status) { ?>
-<h2>Leave a comment</h2>
-<p>Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
-
-<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
-<?php if ( $user_ID ) : ?>
-	<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
-<?php else : ?>
-	<?php $suffix = substr(md5(date('Y-m-d').COMMENT_SALT),0,6); ?>
-	<p>
-	  <input type="text" name="author<?php echo $suffix;?>" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
-	   <label for="author">Name</label>
-	</p>
-
-	<p>
-	  <input type="text" name="email<?php echo $suffix;?>" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
-	   <label for="email">E-mail</label>
-	</p>
-
-	<p>
-	  <input type="text" name="url<?php echo $suffix;?>" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
-	   <label for="url"><abbr title="Universal Resource Locator">URL</abbr></label>
-	</p>
-<?php endif; ?>
-
-	<p>
-	  <label for="comment">Your Comment</label>
-	<br />
-	  <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
-	</p>
-
-	<p>
-      <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-	  <input type="hidden" name="comment_post_time" value="<?php echo time(),"-",$_SERVER['REMOTE_ADDR']; ?>" />
-	  <input type="hidden" name="redirect_to" value="<?php echo attribute_escape($_SERVER["REQUEST_URI"]); ?>" />
-	  <input name="submit" type="submit" tabindex="5" value="Say It!" />
-	</p>
-	<?php do_action('comment_form', $post->ID); ?>
-</form>
-<?php } else { // comments are closed ?>
-<p>Sorry, the comment form is closed at this time.</p>
-<?php }
-} // end password check
-?>
-
-<div><strong><a href="javascript:window.close()">Close this window.</a></strong></div>
-
-<?php // if you delete this the sky will fall on your head
-endwhile; //endwhile have_posts()
-else: //have_posts()
-?>
-<p>Sorry, no posts matched your criteria.</p>
-<?php endif; ?>
-<!-- // this is just the end of the motor - don't touch that line either :) -->
-<?php //} ?>
-<p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a></cite></p>
-<?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
-<script type="text/javascript">
-<!--
-document.onkeypress = function esc(e) {
-	if(typeof(e) == "undefined") { e=event; }
-	if (e.keyCode == 27) { self.close(); }
-}
-// -->
-</script>
-</body>
-</html>
diff -uNr a/mp-wp/wp-content/themes/default/functions.php b/mp-wp/wp-content/themes/default/functions.php
--- a/mp-wp/wp-content/themes/default/functions.php 6399a2b7affebc933cdbbe699a806131411ed87dd6509b6ad68a679130b78f32aa628bc8045d95c7edcf7a3ca9217aa048f703fbed526c13f29070fc5dc5e0bb
+++ b/mp-wp/wp-content/themes/default/functions.php d998fa47a199b7d39163b5a076de094d21e4074bb82830150103882127ad4a347040e6855d4f501763fa2db7086aff7d4616ce6871e411eaf8444ef79aedf145
@@ -11,412 +11,4 @@
         'before_title' => '<h2 class="widgettitle">',
         'after_title' => '</h2>',
     ));
-
-/** @ignore */
-function kubrick_head() {
-	$head = "<style type='text/css'>\n<!--";
-	$output = '';
-	if ( kubrick_header_image() ) {
-		$url =  kubrick_header_image_url() ;
-		$output .= "#header { background: url('$url') no-repeat bottom center; }\n";
-	}
-	if ( false !== ( $color = kubrick_header_color() ) ) {
-		$output .= "#headerimg h1 a, #headerimg h1 a:visited, #headerimg .description { color: $color; }\n";
-	}
-	if ( false !== ( $display = kubrick_header_display() ) ) {
-		$output .= "#headerimg { display: $display }\n";
-	}
-	$foot = "--></style>\n";
-	if ( '' != $output )
-		echo $head . $output . $foot;
-}
-
-add_action('wp_head', 'kubrick_head');
-
-function kubrick_header_image() {
-	return apply_filters('kubrick_header_image', get_option('kubrick_header_image'));
-}
-
-function kubrick_upper_color() {
-	if (strpos($url = kubrick_header_image_url(), 'header-img.php?') !== false) {
-		parse_str(substr($url, strpos($url, '?') + 1), $q);
-		return $q['upper'];
-	} else
-		return '69aee7';
-}
-
-function kubrick_lower_color() {
-	if (strpos($url = kubrick_header_image_url(), 'header-img.php?') !== false) {
-		parse_str(substr($url, strpos($url, '?') + 1), $q);
-		return $q['lower'];
-	} else
-		return '4180b6';
-}
-
-function kubrick_header_image_url() {
-	if ( $image = kubrick_header_image() )
-		$url = get_template_directory_uri() . '/images/' . $image;
-	else
-		$url = get_template_directory_uri() . '/images/kubrickheader.svg';
-
-	return $url;
-}
-
-function kubrick_header_color() {
-	return apply_filters('kubrick_header_color', get_option('kubrick_header_color'));
-}
-
-function kubrick_header_color_string() {
-	$color = kubrick_header_color();
-	if ( false === $color )
-		return 'white';
-
-	return $color;
-}
-
-function kubrick_header_display() {
-	return apply_filters('kubrick_header_display', get_option('kubrick_header_display'));
-}
-
-function kubrick_header_display_string() {
-	$display = kubrick_header_display();
-	return $display ? $display : 'inline';
-}
-
-add_action('admin_menu', 'kubrick_add_theme_page');
-
-function kubrick_add_theme_page() {
-	if ( isset( $_GET['page'] ) && $_GET['page'] == basename(__FILE__) ) {
-		if ( isset( $_REQUEST['action'] ) && 'save' == $_REQUEST['action'] ) {
-			check_admin_referer('kubrick-header');
-			if ( isset($_REQUEST['njform']) ) {
-				if ( isset($_REQUEST['defaults']) ) {
-					delete_option('kubrick_header_image');
-					delete_option('kubrick_header_color');
-					delete_option('kubrick_header_display');
-				} else {
-					if ( '' == $_REQUEST['njfontcolor'] )
-						delete_option('kubrick_header_color');
-					else {
-						$fontcolor = preg_replace('/^.*(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['njfontcolor']);
-						update_option('kubrick_header_color', $fontcolor);
-					}
-					if ( preg_match('/[0-9A-F]{6}|[0-9A-F]{3}/i', $_REQUEST['njuppercolor'], $uc) && preg_match('/[0-9A-F]{6}|[0-9A-F]{3}/i', $_REQUEST['njlowercolor'], $lc) ) {
-						$uc = ( strlen($uc[0]) == 3 ) ? $uc[0]{0}.$uc[0]{0}.$uc[0]{1}.$uc[0]{1}.$uc[0]{2}.$uc[0]{2} : $uc[0];
-						$lc = ( strlen($lc[0]) == 3 ) ? $lc[0]{0}.$lc[0]{0}.$lc[0]{1}.$lc[0]{1}.$lc[0]{2}.$lc[0]{2} : $lc[0];
-						update_option('kubrick_header_image', "header-img.php?upper=$uc&lower=$lc");
-					}
-
-					if ( isset($_REQUEST['toggledisplay']) ) {
-						if ( false === get_option('kubrick_header_display') )
-							update_option('kubrick_header_display', 'none');
-						else
-							delete_option('kubrick_header_display');
-					}
-				}
-			} else {
-
-				if ( isset($_REQUEST['headerimage']) ) {
-					check_admin_referer('kubrick-header');
-					if ( '' == $_REQUEST['headerimage'] )
-						delete_option('kubrick_header_image');
-					else {
-						$headerimage = preg_replace('/^.*?(header-img.php\?upper=[0-9a-fA-F]{6}&lower=[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['headerimage']);
-						update_option('kubrick_header_image', $headerimage);
-					}
-				}
-
-				if ( isset($_REQUEST['fontcolor']) ) {
-					check_admin_referer('kubrick-header');
-					if ( '' == $_REQUEST['fontcolor'] )
-						delete_option('kubrick_header_color');
-					else {
-						$fontcolor = preg_replace('/^.*?(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['fontcolor']);
-						update_option('kubrick_header_color', $fontcolor);
-					}
-				}
-
-				if ( isset($_REQUEST['fontdisplay']) ) {
-					check_admin_referer('kubrick-header');
-					if ( '' == $_REQUEST['fontdisplay'] || 'inline' == $_REQUEST['fontdisplay'] )
-						delete_option('kubrick_header_display');
-					else
-						update_option('kubrick_header_display', 'none');
-				}
-			}
-			//print_r($_REQUEST);
-			wp_redirect("themes.php?page=functions.php&saved=true");
-			die;
-		}
-		add_action('admin_head', 'kubrick_theme_page_head');
-	}
-	add_theme_page(__('Customize Header'), __('Header Image and Color'), 'edit_themes', basename(__FILE__), 'kubrick_theme_page');
-}
-
-function kubrick_theme_page_head() {
 ?>
-<script type="text/javascript" src="../wp-includes/js/colorpicker.js"></script>
-<script type='text/javascript'>
-// <![CDATA[
-	function pickColor(color) {
-		ColorPicker_targetInput.value = color;
-		kUpdate(ColorPicker_targetInput.id);
-	}
-	function PopupWindow_populate(contents) {
-		contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" class="button-secondary" value="<?php echo attribute_escape(__('Close Color Picker')); ?>" onclick="cp.hidePopup(\'prettyplease\')"></input></p>';
-		this.contents = contents;
-		this.populated = false;
-	}
-	function PopupWindow_hidePopup(magicword) {
-		if ( magicword != 'prettyplease' )
-			return false;
-		if (this.divName != null) {
-			if (this.use_gebi) {
-				document.getElementById(this.divName).style.visibility = "hidden";
-			}
-			else if (this.use_css) {
-				document.all[this.divName].style.visibility = "hidden";
-			}
-			else if (this.use_layers) {
-				document.layers[this.divName].visibility = "hidden";
-			}
-		}
-		else {
-			if (this.popupWindow && !this.popupWindow.closed) {
-				this.popupWindow.close();
-				this.popupWindow = null;
-			}
-		}
-		return false;
-	}
-	function colorSelect(t,p) {
-		if ( cp.p == p && document.getElementById(cp.divName).style.visibility != "hidden" )
-			cp.hidePopup('prettyplease');
-		else {
-			cp.p = p;
-			cp.select(t,p);
-		}
-	}
-	function PopupWindow_setSize(width,height) {
-		this.width = 162;
-		this.height = 210;
-	}
-
-	var cp = new ColorPicker();
-	function advUpdate(val, obj) {
-		document.getElementById(obj).value = val;
-		kUpdate(obj);
-	}
-	function kUpdate(oid) {
-		if ( 'uppercolor' == oid || 'lowercolor' == oid ) {
-			uc = document.getElementById('uppercolor').value.replace('#', '');
-			lc = document.getElementById('lowercolor').value.replace('#', '');
-			hi = document.getElementById('headerimage');
-			hi.value = 'header-img.php?upper='+uc+'&lower='+lc;
-			document.getElementById('header').style.background = 'url("<?php echo get_template_directory_uri(); ?>/images/'+hi.value+'") center no-repeat';
-			document.getElementById('advuppercolor').value = '#'+uc;
-			document.getElementById('advlowercolor').value = '#'+lc;
-		}
-		if ( 'fontcolor' == oid ) {
-			document.getElementById('header').style.color = document.getElementById('fontcolor').value;
-			document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value;
-		}
-		if ( 'fontdisplay' == oid ) {
-			document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value;
-		}
-	}
-	function toggleDisplay() {
-		td = document.getElementById('fontdisplay');
-		td.value = ( td.value == 'none' ) ? 'inline' : 'none';
-		kUpdate('fontdisplay');
-	}
-	function toggleAdvanced() {
-		a = document.getElementById('jsAdvanced');
-		if ( a.style.display == 'none' )
-			a.style.display = 'block';
-		else
-			a.style.display = 'none';
-	}
-	function kDefaults() {
-		document.getElementById('headerimage').value = '';
-		document.getElementById('advuppercolor').value = document.getElementById('uppercolor').value = '#69aee7';
-		document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#4180b6';
-		document.getElementById('header').style.background = 'url("<?php echo get_template_directory_uri(); ?>/images/kubrickheader.svg") center no-repeat';
-		document.getElementById('header').style.color = '#FFFFFF';
-		document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '';
-		document.getElementById('fontdisplay').value = 'inline';
-		document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value;
-	}
-	function kRevert() {
-		document.getElementById('headerimage').value = '<?php echo js_escape(kubrick_header_image()); ?>';
-		document.getElementById('advuppercolor').value = document.getElementById('uppercolor').value = '#<?php echo js_escape(kubrick_upper_color()); ?>';
-		document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#<?php echo js_escape(kubrick_lower_color()); ?>';
-		document.getElementById('header').style.background = 'url("<?php echo js_escape(kubrick_header_image_url()); ?>") center no-repeat';
-		document.getElementById('header').style.color = '';
-		document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '<?php echo js_escape(kubrick_header_color_string()); ?>';
-		document.getElementById('fontdisplay').value = '<?php echo js_escape(kubrick_header_display_string()); ?>';
-		document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value;
-	}
-	function kInit() {
-		document.getElementById('jsForm').style.display = 'block';
-		document.getElementById('nonJsForm').style.display = 'none';
-	}
-	addLoadEvent(kInit);
-// ]]>
-</script>
-<style type='text/css'>
-	#headwrap {
-		text-align: center;
-	}
-	#kubrick-header {
-		font-size: 80%;
-	}
-	#kubrick-header .hibrowser {
-		width: 780px;
-		height: 260px;
-		overflow: scroll;
-	}
-	#kubrick-header #hitarget {
-		display: none;
-	}
-	#kubrick-header #header h1 {
-		font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif;
-		font-weight: bold;
-		font-size: 4em;
-		text-align: center;
-		padding-top: 70px;
-		margin: 0;
-	}
-
-	#kubrick-header #header .description {
-		font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif;
-		font-size: 1.2em;
-		text-align: center;
-	}
-	#kubrick-header #header {
-		text-decoration: none;
-		color: <?php echo kubrick_header_color_string(); ?>;
-		padding: 0;
-		margin: 0;
-		height: 200px;
-		text-align: center;
-		background: url('<?php echo kubrick_header_image_url(); ?>') center no-repeat;
-	}
-	#kubrick-header #headerimg {
-		margin: 0;
-		height: 200px;
-		width: 100%;
-		display: <?php echo kubrick_header_display_string(); ?>;
-	}
-	#jsForm {
-		display: none;
-		text-align: center;
-	}
-	#jsForm input.submit, #jsForm input.button, #jsAdvanced input.button {
-		padding: 0px;
-		margin: 0px;
-	}
-	#advanced {
-		text-align: center;
-		width: 620px;
-	}
-	html>body #advanced {
-		text-align: center;
-		position: relative;
-		left: 50%;
-		margin-left: -380px;
-	}
-	#jsAdvanced {
-		text-align: right;
-	}
-	#nonJsForm {
-		position: relative;
-		text-align: left;
-		margin-left: -370px;
-		left: 50%;
-	}
-	#nonJsForm label {
-		padding-top: 6px;
-		padding-right: 5px;
-		float: left;
-		width: 100px;
-		text-align: right;
-	}
-	.defbutton {
-		font-weight: bold;
-	}
-	.zerosize {
-		width: 0px;
-		height: 0px;
-		overflow: hidden;
-	}
-	#colorPickerDiv a, #colorPickerDiv a:hover {
-		padding: 1px;
-		text-decoration: none;
-		border-bottom: 0px;
-	}
-</style>
-<?php
-}
-
-function kubrick_theme_page() {
-	if ( isset( $_REQUEST['saved'] ) ) echo '<div id="message" class="updated fade"><p><strong>'.__('Options saved.').'</strong></p></div>';
-?>
-<div class='wrap'>
-	<h2><?php _e('Customize Header'); ?></h2>
-	<div id="kubrick-header">
-		<div id="headwrap">
-			<div id="header">
-				<div id="headerimg">
-					<h1><?php bloginfo('name'); ?></h1>
-					<div class="description"><?php bloginfo('description'); ?></div>
-				</div>
-			</div>
-		</div>
-		<br />
-		<div id="nonJsForm">
-			<form method="post" action="">
-				<?php wp_nonce_field('kubrick-header'); ?>
-				<div class="zerosize"><input type="submit" name="defaultsubmit" value="<?php echo attribute_escape(__('Save')); ?>" /></div>
-					<label for="njfontcolor"><?php _e('Font Color:'); ?></label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo attribute_escape(kubrick_header_color()); ?>" /> <?php printf(__('Any CSS color (%s or %s or %s)'), '<code>red</code>', '<code>#FF0000</code>', '<code>rgb(255, 0, 0)</code>'); ?><br />
-					<label for="njuppercolor"><?php _e('Upper Color:'); ?></label><input type="text" name="njuppercolor" id="njuppercolor" value="#<?php echo attribute_escape(kubrick_upper_color()); ?>" /> <?php printf(__('HEX only (%s or %s)'), '<code>#FF0000</code>', '<code>#F00</code>'); ?><br />
-				<label for="njlowercolor"><?php _e('Lower Color:'); ?></label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo attribute_escape(kubrick_lower_color()); ?>" /> <?php printf(__('HEX only (%s or %s)'), '<code>#FF0000</code>', '<code>#F00</code>'); ?><br />
-				<input type="hidden" name="hi" id="hi" value="<?php echo attribute_escape(kubrick_header_image()); ?>" />
-				<input type="submit" name="toggledisplay" id="toggledisplay" value="<?php echo attribute_escape(__('Toggle Text')); ?>" />
-				<input type="submit" name="defaults" value="<?php echo attribute_escape(__('Use Defaults')); ?>" />
-				<input type="submit" class="defbutton" name="submitform" value="&nbsp;&nbsp;<?php _e('Save'); ?>&nbsp;&nbsp;" />
-				<input type="hidden" name="action" value="save" />
-				<input type="hidden" name="njform" value="true" />
-			</form>
-		</div>
-		<div id="jsForm">
-			<form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo attribute_escape($_SERVER['REQUEST_URI']); ?>">
-				<?php wp_nonce_field('kubrick-header'); ?>
-	<input type="button"  class="button-secondary" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php echo attribute_escape(__('Font Color')); ?>"></input>
-		<input type="button" class="button-secondary" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php echo attribute_escape(__('Upper Color')); ?>"></input>
-		<input type="button" class="button-secondary" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="<?php echo attribute_escape(__('Lower Color')); ?>"></input>
-				<input type="button" class="button-secondary" name="revert" value="<?php echo attribute_escape(__('Revert')); ?>" onclick="kRevert()" />
-				<input type="button" class="button-secondary" value="<?php echo attribute_escape(__('Advanced')); ?>" onclick="toggleAdvanced()" />
-				<input type="hidden" name="action" value="save" />
-				<input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo attribute_escape(kubrick_header_display()); ?>" />
-				<input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo attribute_escape(kubrick_header_color()); ?>" />
-				<input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo attribute_escape(kubrick_upper_color()); ?>" />
-				<input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo attribute_escape(kubrick_lower_color()); ?>" />
-				<input type="hidden" name="headerimage" id="headerimage" value="<?php echo attribute_escape(kubrick_header_image()); ?>" />
-				<p class="submit"><input type="submit" name="submitform" class="button-primary" value="<?php echo attribute_escape(__('Update Header')); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
-			</form>
-			<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div>
-			<div id="advanced">
-				<form id="jsAdvanced" style="display:none;" action="">
-					<?php wp_nonce_field('kubrick-header'); ?>
-					<label for="advfontcolor"><?php _e('Font Color (CSS):'); ?> </label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo attribute_escape(kubrick_header_color()); ?>" /><br />
-					<label for="advuppercolor"><?php _e('Upper Color (HEX):');?> </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo attribute_escape(kubrick_upper_color()); ?>" /><br />
-					<label for="advlowercolor"><?php _e('Lower Color (HEX):'); ?> </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo attribute_escape(kubrick_lower_color()); ?>" /><br />
-					<input type="button" class="button-secondary" name="default" value="<?php echo attribute_escape(__('Select Default Colors')); ?>" onclick="kDefaults()" /><br />
-					<input type="button" class="button-secondary" onclick="toggleDisplay();return false;" name="pick" id="pick" value="<?php echo attribute_escape(__('Toggle Text Display')); ?>"></input><br />
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-<?php } ?>
diff -uNr a/mp-wp/wp-content/themes/default/header.php b/mp-wp/wp-content/themes/default/header.php
--- a/mp-wp/wp-content/themes/default/header.php d8c5832d830dc1068bacc857351d3de47daede54ee76b0ba9851a980fb0d2d3ff36c6fbf1b52d2296325554aba8c1261440174e99567dcf2058cb57d4e00cdc6
+++ b/mp-wp/wp-content/themes/default/header.php 7efda3833c4bb2987be5ae7bb9a616215f59fdda921920a8628c97bfb739a9ea04870562d2e8f2ec62a1c9fc4974d5004e83af0c1774a0d437946ff93c249b5f
@@ -30,8 +30,6 @@
 
 </style>
 
-<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
-
 <?php wp_head(); ?>
 </head>
 <body>
diff -uNr a/mp-wp/wp-content/themes/default/images/kubrickbg-rtl.svg b/mp-wp/wp-content/themes/default/images/kubrickbg-rtl.svg
--- a/mp-wp/wp-content/themes/default/images/kubrickbg-rtl.svg 10533980dad27b77d98221b59719423ce5a89ee5c6d85548de582284e4363b0a3ed1c59bca93471bee5daee76ddb3ad01805fe86713a2e8edde342b67e411d25
+++ b/mp-wp/wp-content/themes/default/images/kubrickbg-rtl.svg false
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="760px" height="40px" viewBox="0 0 760 40" enable-background="new 0 0 760 40" xml:space="preserve">  <image id="image0" width="760" height="40" x="0" y="0"
-    xlink:href="data:image/png;base64,
-/9j/4AAQSkZJRgABAgAAZABkAAD/2wBDAAYEBAQFBAYFBQYJBgUGCQsIBgYICwwKCgsKCgwQDAwM
-DAwMEAwODxAPDgwTExQUExMcGxsbHB8fHx8fHx8fHx//2wBDAQcHBw0MDRgQEBgaFREVGh8fHx8f
-Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx//wAARCAAoAvgDAREA
-AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA
-AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3
-ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm
-p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA
-AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx
-BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK
-U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3
-uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD6If7j
-fQ0ASeFv+QLH/wBdbj/0okoA1aACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKA
-CgAoAKACgAoAnX7o+lAC0AFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQA
-UAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQ
-AUAFABQAUAFABQBkeLf+QFL/ANdbf/0ojoAqp9xfoKAB/uN9DQBJ4W/5Asf/AF1uP/SiSgDVoAKA
-CgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgCdfuj6UALQAUAFABQA
-UAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQ
-AUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFAGR4t/5AUv8A11t/
-/SiOgCqn3F+goAH+430NAEnhb/kCx/8AXW4/9KJKANWgAoAKACgAoAKACgAoAKACgAoAKACgAoAK
-ACgAoAKACgAoAKACgAoAKACgAoAKAJ1+6PpQAtABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQ
-AUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFAB
-QAUAFABQAUAFABQAUAFABQAUAFABQAUAZHi3/kBS/wDXW3/9KI6AKqfcX6CgAf7jfQ0ASeFv+QLH
-/wBdbj/0okoA1aACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA
-nX7o+lAC0AFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFAB
-QAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFA
-BQBkeLf+QFL/ANdbf/0ojoAqp9xfoKAB/uN9DQBJ4W/5Asf/AF1uP/SiSgDVoAKACgAoAKACgAoA
-KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgCdfuj6UALQAUAFABQAUAFABQAUAFAB
-QAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFA
-BQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFAGR4t/5AUv8A11t//SiOgCqn3F+g
-oA//2Q==
-" />
-</svg>
diff -uNr a/mp-wp/wp-content/themes/default/rtl.css b/mp-wp/wp-content/themes/default/rtl.css
--- a/mp-wp/wp-content/themes/default/rtl.css cdc85a8b49d2d936a612b38975c9aec8794f5f64783abe1e85ef8583aaa77ebc11cf08ed2f634fe7d134d87e9b51eda5e940a18c8b3a98a37f688a20ce38468a
+++ b/mp-wp/wp-content/themes/default/rtl.css false
@@ -1,106 +0,0 @@
-/*
-Theme name: WordPress Default - kubrick -
-Editors: Navid Kashani
-Persian Wordpress Project : wp-persian.com
-*/
-body, .commentlist li, #commentform input, #commentform textarea, #commentform p, #sidebar, #wp-calendar caption  {
-	font-family:tahoma, arial;
-}
-#page {
-	text-align:right;
-	direction:rtl;
-}
-h1, h2, h3, #sidebar h2 {
-	font-family:arial, tahoma;
-}
-.commentlist li .avatar {
-	float:left;
-}
-#header {
-	margin:0 1px 0 0;
-}
-.narrowcolumn {
-	float:right;
-	padding: 0 45px 20px 0;
-}
-.widecolumn {
-	margin: 5px 150px 0 0;
-}
-.widecolumn .smallattachment {
-	margin: 5px 0 5px 5px;
-}
-.postmetadata {
-	clear:right;
-}
-#sidebar {
-	margin-left: 0;
-	margin-right: 545px;
-}
-img.alignright {
-	margin: 0 7px 2px 0;
-}
-
-img.alignleft {
-	margin: 0 0 2px 7px;
-}
-
-.alignright {
-	float: left;
-}
-
-.alignleft {
-	float: right;
-}
-code {
-	display:block;
-	direction:ltr;
-	text-align:left;
-}
-acronym, abbr, span.caps {
-	letter-spacing:0; /* fix opera bug */
-}
-html>body .entry ul {
-	padding:0 10px 0 0;
-	text-indent:10px;
-}
-html>body .entry li {
-	margin: 7px 10px 8px 0;
-}
-.entry ol {
-	padding: 0 35px 0 0;
-}
-#sidebar ul ul, #sidebar ul ol {
-	margin: 5px 10px 0 0;
-}
-#sidebar ul ul ul, #sidebar ul ol {
-	margin: 0 10px 0 0;
-}
-#commentform input {
-	margin: 5px 0 1px 5px;
-}
-#commentform #submit {
-	float:left;
-}
-.commentlist p {
-	margin: 10px 0 10px 5px;
-}
-#wp-calendar #next a {
-	padding-right:0;
-	padding-left:10px;
-	text-align:left;
-}
-#wp-calendar #prev a {
-	padding-left:0;
-	padding-right:10px;
-	text-align:right;
-}
-blockquote {
-	margin: 15px 10px 0 30px;
-	padding-left: 0;
-	padding-right: 20px;
-	border-left: 0 none;
-	border-right: 5px solid #ddd;
-}
-#email, #url {
-	direction:ltr;
-}
\ No newline at end of file
diff -uNr a/mp-wp/wp-content/themes/default/style.css b/mp-wp/wp-content/themes/default/style.css
--- a/mp-wp/wp-content/themes/default/style.css 06218a0bbac6ad5ed2f6cc2ea3855f98eae264bbceddcbd02ce0ec6f2322ce2ff296ec351ffa7795eef87bf994c60452bfe6446533bdad10a85e5ad8e82a1aee
+++ b/mp-wp/wp-content/themes/default/style.css cfd881d2767493dbd09171bf2992e7dc3a3a739f3d45d437d48603dcecf776a9f8d70e8011f6ce86dc022b0f8149380f7eee76e998d32319df57c4af0fd2f5c3
@@ -25,7 +25,7 @@
 	font-size: 62.5%; /* Resets 1em to 10px */
 	font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif;
 	background: #d5d6d7 url('images/kubrickbgcolor.svg');
-	color: #333;
+	color: #303434;
 	text-align: center;
 	}
 
@@ -129,7 +129,7 @@
 	}
 
 h2, h2 a, h2 a:visited, h3, h3 a, h3 a:visited {
-	color: #333;
+	color: #303434;
 	}
 
 h2, h2 a, h2 a:hover, h2 a:visited, h3, h3 a, h3 a:hover, h3 a:visited, #sidebar h2, #wp-calendar caption, cite {
@@ -680,7 +680,6 @@
 	padding-top: 4px;
 	margin: 10px;
 	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
diff -uNr a/mp-wp/wp-includes/class.wp-scripts.php b/mp-wp/wp-includes/class.wp-scripts.php
--- a/mp-wp/wp-includes/class.wp-scripts.php d95199605a8ed528631af9f91d17bb3a20dcdb9c9b8bae0b0df224db9d8f4f400971e4f1e0e90d9e35d2b5673ab47122d3487463b31003c4ad826125873eb33f
+++ b/mp-wp/wp-includes/class.wp-scripts.php false
@@ -1,110 +0,0 @@
-<?php
-/**
- * BackPress Scripts enqueue.
- *
- * These classes were refactored from the WordPress WP_Scripts and WordPress
- * script enqueue API.
- *
- * @package BackPress
- * @since r16
- */
-
-/**
- * BackPress Scripts enqueue class.
- *
- * @package BackPress
- * @uses WP_Dependencies
- * @since r16
- */
-class WP_Scripts extends WP_Dependencies {
-	var $base_url; // Full URL with trailing slash
-	var $default_version;
-
-	function __construct() {
-		do_action_ref_array( 'wp_default_scripts', array(&$this) );
-	}
-
-	/**
-	 * Prints scripts
-	 *
-	 * Prints the scripts passed to it or the print queue.  Also prints all necessary dependencies.
-	 *
-	 * @param mixed handles (optional) Scripts to be printed.  (void) prints queue, (string) prints that script, (array of strings) prints those scripts.
-	 * @return array Scripts that have been printed
-	 */
-	function print_scripts( $handles = false ) {
-		return $this->do_items( $handles );
-	}
-
-	function print_scripts_l10n( $handle ) {
-		if ( empty($this->registered[$handle]->extra['l10n']) || empty($this->registered[$handle]->extra['l10n'][0]) || !is_array($this->registered[$handle]->extra['l10n'][1]) )
-			return false;
-
-		$object_name = $this->registered[$handle]->extra['l10n'][0];
-
-		echo "<script type='text/javascript'>\n";
-		echo "/* <![CDATA[ */\n";
-		echo "\t$object_name = {\n";
-		$eol = '';
-		foreach ( $this->registered[$handle]->extra['l10n'][1] as $var => $val ) {
-			if ( 'l10n_print_after' == $var ) {
-				$after = $val;
-				continue;
-			}
-			echo "$eol\t\t$var: \"" . js_escape( $val ) . '"';
-			$eol = ",\n";
-		}
-		echo "\n\t}\n";
-		echo isset($after) ? "\t$after\n" : '';
-		echo "/* ]]> */\n";
-		echo "</script>\n";
-
-		return true;
-	}
-
-	function do_item( $handle ) {
-		if ( !parent::do_item($handle) )
-			return false;
-
-		$ver = $this->registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version;
-		if ( isset($this->args[$handle]) )
-			$ver .= '&amp;' . $this->args[$handle];
-
-		$src = $this->registered[$handle]->src;
-		if ( !preg_match('|^https?://|', $src) && !preg_match('|^' . preg_quote(WP_CONTENT_URL) . '|', $src) ) {
-			$src = $this->base_url . $src;
-		}
-
-		$src = add_query_arg('ver', $ver, $src);
-		$src = clean_url(apply_filters( 'script_loader_src', $src, $handle ));
-
-		$this->print_scripts_l10n( $handle );
-
-		echo "<script type='text/javascript' src='$src'></script>\n";
-
-		return true;
-	}
-
-	/**
-	 * Localizes a script
-	 *
-	 * Localizes only if script has already been added
-	 *
-	 * @param string handle Script name
-	 * @param string object_name Name of JS object to hold l10n info
-	 * @param array l10n Array of JS var name => localized string
-	 * @return bool Successful localization
-	 */
-	function localize( $handle, $object_name, $l10n ) {
-		if ( !$object_name || !$l10n )
-			return false;
-		return $this->add_data( $handle, 'l10n', array( $object_name, $l10n ) );
-	}
-
-	function all_deps( $handles, $recursion = false ) {
-		$r = parent::all_deps( $handles, $recursion );
-		if ( !$recursion )
-			$this->to_do = apply_filters( 'print_scripts_array', $this->to_do );
-		return $r;
-	}
-}
diff -uNr a/mp-wp/wp-includes/class.wp-styles.php b/mp-wp/wp-includes/class.wp-styles.php
--- a/mp-wp/wp-includes/class.wp-styles.php 231dfac3cb1f3e6310de2886569510da3ad4c66d07975bb49e0e98747e8719e409bec7a52240b8bb5aee0c50c24e0003da7da77938772e658f3ee70f93a03bf2
+++ b/mp-wp/wp-includes/class.wp-styles.php 697d491af70103f46e6d4fae81eeea4c9ce84c076dc7ed993825484157956e52b484d07fb153da5713775bc6f03334c48b3c5f482d1ed36a8d5986c62481fa94
@@ -58,12 +58,6 @@
 
 		echo $end_cond;
 
-		// Could do something with $this->registered[$handle]->extra here to print out extra CSS rules
-//		echo "<style type='text/css'>\n";
-//		echo "/* <![CDATA[ */\n";
-//		echo "/* ]]> */\n";
-//		echo "</style>\n";
-
 		return true;
 	}
 
diff -uNr a/mp-wp/wp-includes/classes.php b/mp-wp/wp-includes/classes.php
--- a/mp-wp/wp-includes/classes.php 42a3d6baf466d997f62b27bd07f1dce43b164e39091cb05cfc9ecf20e5da094ebf46f4f297da4040e2b3df352ca36d45537eb7f5baa96758cb3773a7e9d40bd7
+++ b/mp-wp/wp-includes/classes.php 400e9fa6918eb20554548892fe6ada0940a73b906cff113644fe48c40c349430d258b06fd3d232405558874c67b09de631d9d56740c931a7e5c0a37463e7687a
@@ -1444,140 +1444,4 @@
 	}
 }
 
-/**
- * Send XML response back to AJAX request.
- *
- * @package WordPress
- * @since 2.1.0
- */
-class WP_Ajax_Response {
-	/**
-	 * Store XML responses to send.
-	 *
-	 * @since 2.1.0
-	 * @var array
-	 * @access private
-	 */
-	var $responses = array();
-
-	/**
-	 * PHP4 Constructor - Passes args to {@link WP_Ajax_Response::add()}.
-	 *
-	 * @since 2.1.0
-	 * @see WP_Ajax_Response::add()
-	 *
-	 * @param string|array $args Optional. Will be passed to add() method.
-	 * @return WP_Ajax_Response
-	 */
-	function WP_Ajax_Response( $args = '' ) {
-		if ( !empty($args) )
-			$this->add($args);
-	}
-
-	/**
-	 * Append to XML response based on given arguments.
-	 *
-	 * The arguments that can be passed in the $args parameter are below. It is
-	 * also possible to pass a WP_Error object in either the 'id' or 'data'
-	 * argument. The parameter isn't actually optional, content should be given
-	 * in order to send the correct response.
-	 *
-	 * 'what' argument is a string that is the XMLRPC response type.
-	 * 'action' argument is a boolean or string that acts like a nonce.
-	 * 'id' argument can be WP_Error or an integer.
-	 * 'old_id' argument is false by default or an integer of the previous ID.
-	 * 'position' argument is an integer or a string with -1 = top, 1 = bottom,
-	 * html ID = after, -html ID = before.
-	 * 'data' argument is a string with the content or message.
-	 * 'supplemental' argument is an array of strings that will be children of
-	 * the supplemental element.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param string|array $args Override defaults.
-	 * @return string XML response.
-	 */
-	function add( $args = '' ) {
-		$defaults = array(
-			'what' => 'object', 'action' => false,
-			'id' => '0', 'old_id' => false,
-			'position' => 1,
-			'data' => '', 'supplemental' => array()
-		);
-
-		$r = wp_parse_args( $args, $defaults );
-		extract( $r, EXTR_SKIP );
-		$position = preg_replace( '/[^a-z0-9:_-]/i', '', $position );
-
-		if ( is_wp_error($id) ) {
-			$data = $id;
-			$id = 0;
-		}
-
-		$response = '';
-		if ( is_wp_error($data) ) {
-			foreach ( (array) $data->get_error_codes() as $code ) {
-				$response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message($code) . "]]></wp_error>";
-				if ( !$error_data = $data->get_error_data($code) )
-					continue;
-				$class = '';
-				if ( is_object($error_data) ) {
-					$class = ' class="' . get_class($error_data) . '"';
-					$error_data = get_object_vars($error_data);
-				}
-
-				$response .= "<wp_error_data code='$code'$class>";
-
-				if ( is_scalar($error_data) ) {
-					$response .= "<![CDATA[$error_data]]>";
-				} elseif ( is_array($error_data) ) {
-					foreach ( $error_data as $k => $v )
-						$response .= "<$k><![CDATA[$v]]></$k>";
-				}
-
-				$response .= "</wp_error_data>";
-			}
-		} else {
-			$response = "<response_data><![CDATA[$data]]></response_data>";
-		}
-
-		$s = '';
-		if ( is_array($supplemental) ) {
-			foreach ( $supplemental as $k => $v )
-				$s .= "<$k><![CDATA[$v]]></$k>";
-			$s = "<supplemental>$s</supplemental>";
-		}
-
-		if ( false === $action )
-			$action = $_POST['action'];
-
-		$x = '';
-		$x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action
-		$x .=	"<$what id='$id' " . ( false === $old_id ? '' : "old_id='$old_id' " ) . "position='$position'>";
-		$x .=		$response;
-		$x .=		$s;
-		$x .=	"</$what>";
-		$x .= "</response>";
-
-		$this->responses[] = $x;
-		return $x;
-	}
-
-	/**
-	 * Display XML formatted responses.
-	 *
-	 * Sets the content type header to text/xml.
-	 *
-	 * @since 2.1.0
-	 */
-	function send() {
-		header('Content-Type: text/xml');
-		echo "<?xml version='1.0' standalone='yes'?><wp_ajax>";
-		foreach ( (array) $this->responses as $response )
-			echo $response;
-		echo '</wp_ajax>';
-		die();
-	}
-}
-
 ?>
diff -uNr a/mp-wp/wp-includes/comment-template.php b/mp-wp/wp-includes/comment-template.php
--- a/mp-wp/wp-includes/comment-template.php 024eb09a7a1a5ca5f6b74d2b79c670a866817a4d3433c6d6fc3c439d91f4df5bc1b0de26c63b6dca5d7fc91fc6f2868db42451af38778ffdd0943974a025ead2
+++ b/mp-wp/wp-includes/comment-template.php 00ecf9abe29f093f2e0f902bbd56b4a039e4b1ee79f81bc9014a0bcd5e1ead803fdbff57ef81c0634a2d37396dcbeffc157665cf9ac6fcd0e8c03959060d6016
@@ -717,7 +717,7 @@
 		echo '    dc:identifier="';
 		the_permalink();
 		echo '"'."\n";
-		echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', wptexturize(strip_tags(get_the_title()))).'"'."\n";
+		echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', strip_tags(get_the_title())).'"'."\n";
 		echo '    trackback:ping="'.get_trackback_url().'"'." />\n";
 		echo '</rdf:RDF>';
 	}
@@ -861,37 +861,6 @@
 }
 
 /**
- * Displays the JS popup script to show a comment.
- *
- * If the $file parameter is empty, then the home page is assumed. The defaults
- * for the window are 400px by 400px.
- *
- * For the comment link popup to work, this function has to be called or the
- * normal comment link will be assumed.
- *
- * @since 0.71
- * @global string $wpcommentspopupfile The URL to use for the popup window
- * @global int $wpcommentsjavascript Whether to use JavaScript or not. Set when function is called
- *
- * @param int $width Optional. The width of the popup window
- * @param int $height Optional. The height of the popup window
- * @param string $file Optional. Sets the location of the popup window
- */
-function comments_popup_script($width=400, $height=400, $file='') {
-	global $wpcommentspopupfile, $wpcommentsjavascript;
-
-	if (empty ($file)) {
-		$wpcommentspopupfile = '';  // Use the index.
-	} else {
-		$wpcommentspopupfile = $file;
-	}
-
-	$wpcommentsjavascript = 1;
-	$javascript = "<script type='text/javascript'>\nfunction wpopen (macagna) {\n    window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n";
-	echo $javascript;
-}
-
-/**
  * Displays the link to the comments popup window for the current post ID.
  *
  * Is not meant to be displayed on single posts and pages. Should be used on the
@@ -899,8 +868,6 @@
  *
  * @since 0.71
  * @uses $id
- * @uses $wpcommentspopupfile
- * @uses $wpcommentsjavascript
  * @uses $post
  *
  * @param string $zero The string to display when no comments
@@ -911,7 +878,7 @@
  * @return null Returns null on single posts and pages.
  */
 function comments_popup_link( $zero = 'No Comments', $one = '1 Comment', $more = '% Comments', $css_class = '', $none = 'Comments Off' ) {
-	global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post;
+	global $id, $post;
 
 	if ( is_single() || is_page() )
 		return;
@@ -929,20 +896,11 @@
 	}
 
 	echo '<a href="';
-	if ( $wpcommentsjavascript ) {
-		if ( empty( $wpcommentspopupfile ) )
-			$home = get_option('home');
-		else
-			$home = get_option('siteurl');
-		echo $home . '/' . $wpcommentspopupfile . '?comments_popup=' . $id;
-		echo '" onclick="wpopen(this.href); return false"';
-	} else { // if comments_popup_script() is not in the template, display simple comment link
-		if ( 0 == $number )
-			echo get_permalink() . '#respond';
-		else
-			comments_link();
-		echo '"';
-	}
+	if ( 0 == $number )
+		echo get_permalink() . '#respond';
+	else
+		comments_link();
+	echo '"';
 
 	if ( !empty( $css_class ) ) {
 		echo ' class="'.$css_class.'" ';
@@ -999,7 +957,7 @@
 		$link = '<a  href="' . site_url('wp-login.php?redirect_to=' . get_permalink()) . '">' . $login_text . '</a>';
 	else
 // Removed rel="nofollow" from here
-		$link = "<a  href='" . wp_specialchars( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
+		$link = "<a  href='" . wp_specialchars( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "'>$reply_text</a>";
 	return apply_filters('comment_reply_link', $before . $link . $after, $args, $comment, $post);
 }
 
@@ -1052,7 +1010,7 @@
 		$link = '<a  href="' . site_url('wp-login.php?redirect_to=' . get_permalink()) . '">' . $login_text . '</a>';
 	} else {
 // Removed rel="nofollow" from here
-		$link = "<a  href='" . get_permalink($post->ID) . "#$respond_id' onclick='return addComment.moveForm(\"$add_below-$post->ID\", \"0\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
+		$link = "<a  href='" . get_permalink($post->ID) . "#$respond_id'>$reply_text</a>";
 	}
 	return apply_filters('post_comments_link', $before . $link . $after, $post);
 }
diff -uNr a/mp-wp/wp-includes/default-filters.php b/mp-wp/wp-includes/default-filters.php
--- a/mp-wp/wp-includes/default-filters.php 5daadbb5362bff123f3858e455008789291800b0066f27ee232320298278f4acab93b2b03ccf39704c5b953e8e7dd8e5d382dc7866c6007825af3bdd5db5c6af
+++ b/mp-wp/wp-includes/default-filters.php 4116301a0a0e3f25d1ac59e4612bc2f4566ce7b46d5d2541633e7344b8070bd74d3552104a141ab53e547b23b4bef1385bb9181701d2d9a333dc11facd1907ab
@@ -78,7 +78,6 @@
 $filters = array('comment_author', 'term_name', 'link_name', 'link_description',
 	'link_notes', 'bloginfo', 'wp_title');
 foreach ( $filters as $filter ) {
-	add_filter($filter, 'wptexturize');
 	add_filter($filter, 'convert_chars');
 	add_filter($filter, 'wp_specialchars');
 }
@@ -86,7 +85,6 @@
 // Format text area for display.
 $filters = array('term_description');
 foreach ( $filters as $filter ) {
-	add_filter($filter, 'wptexturize');
 	add_filter($filter, 'convert_chars');
 	add_filter($filter, 'wpautop');
 }
@@ -98,23 +96,19 @@
 }
 
 // Display filters
-add_filter('the_title', 'wptexturize');
 add_filter('the_title', 'convert_chars');
 add_filter('the_title', 'trim');
 
-add_filter('the_content', 'wptexturize');
 add_filter('the_content', 'convert_smilies');
 add_filter('the_content', 'convert_chars');
 add_filter('the_content', 'wpautop');
 add_filter('the_content', 'prepend_attachment');
 
-add_filter('the_excerpt', 'wptexturize');
 add_filter('the_excerpt', 'convert_smilies');
 add_filter('the_excerpt', 'convert_chars');
 add_filter('the_excerpt', 'wpautop');
 add_filter('get_the_excerpt', 'wp_trim_excerpt');
 
-add_filter('comment_text', 'wptexturize');
 add_filter('comment_text', 'convert_chars');
 add_filter('comment_text', 'make_clickable', 9);
 add_filter('comment_text', 'force_balance_tags', 25);
@@ -123,9 +117,6 @@
 
 add_filter('comment_excerpt', 'convert_chars');
 
-add_filter('list_cats', 'wptexturize');
-add_filter('single_post_title', 'wptexturize');
-
 add_filter('wp_sprintf', 'wp_sprintf_l', 10, 2);
 
 // RSS filters
@@ -169,7 +160,6 @@
 add_action('publish_future_post', 'check_and_publish_future_post', 10, 1);
 add_action('wp_head', 'noindex', 1);
 add_action('wp_head', 'wp_print_styles', 9);
-add_action('wp_head', 'wp_print_scripts');
 add_action('wp_head', 'wp_generator');
 if(!defined('DOING_CRON'))
 	add_action('init', 'wp_cron');
@@ -180,7 +170,6 @@
 add_action('do_pings', 'do_all_pings', 10, 1);
 add_action('do_robots', 'do_robots');
 add_action('sanitize_comment_cookies', 'sanitize_comment_cookies');
-add_action('admin_print_scripts', 'wp_print_scripts', 20);
 add_action('admin_print_styles', 'wp_print_styles', 20);
 add_action('init', 'smilies_init', 5);
 add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 );
diff -uNr a/mp-wp/wp-includes/deprecated.php b/mp-wp/wp-includes/deprecated.php
--- a/mp-wp/wp-includes/deprecated.php 70f855dacd4c0cb42bf3987c348d079b8959698f44d25235d47610d5eefc8e46959451715e67e608982be91c9452002a349a3c7c235e8491e8da04997d51452c
+++ b/mp-wp/wp-includes/deprecated.php 8ead6036ead04f82727e836bde5d5a26fff8dc44e78e2e18d1ef47d02b36fe7ea4de29917d11334b4ce0c3ab220842ca967e69cef5bfe5a6f3641a7e4c68bb0a
@@ -79,572 +79,6 @@
  */
 
 /**
- * Entire Post data.
- *
- * @since 0.71
- * @deprecated Use get_post()
- * @see get_post()
- *
- * @param int $postid
- * @return array
- */
-function get_postdata($postid) {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_post()');
-
-	$post = &get_post($postid);
-
-	$postdata = array (
-		'ID' => $post->ID,
-		'Author_ID' => $post->post_author,
-		'Date' => $post->post_date,
-		'Content' => $post->post_content,
-		'Excerpt' => $post->post_excerpt,
-		'Title' => $post->post_title,
-		'Category' => $post->post_category,
-		'post_status' => $post->post_status,
-		'comment_status' => $post->comment_status,
-		'ping_status' => $post->ping_status,
-		'post_password' => $post->post_password,
-		'to_ping' => $post->to_ping,
-		'pinged' => $post->pinged,
-		'post_type' => $post->post_type,
-		'post_name' => $post->post_name
-	);
-
-	return $postdata;
-}
-
-/**
- * Sets up the WordPress Loop.
- *
- * @since 1.0.1
- * @deprecated Since 1.5 - {@link http://codex.wordpress.org/The_Loop Use new WordPress Loop}
- */
-function start_wp() {
-	global $wp_query, $post;
-
-	_deprecated_function(__FUNCTION__, '1.5', __('new WordPress Loop') );
-
-	// Since the old style loop is being used, advance the query iterator here.
-	$wp_query->next_post();
-
-	setup_postdata($post);
-}
-
-/**
- * Return or Print Category ID.
- *
- * @since 0.71
- * @deprecated use get_the_category()
- * @see get_the_category()
- *
- * @param bool $echo
- * @return null|int
- */
-function the_category_ID($echo = true) {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_the_category()');
-
-	// Grab the first cat in the list.
-	$categories = get_the_category();
-	$cat = $categories[0]->term_id;
-
-	if ( $echo )
-		echo $cat;
-
-	return $cat;
-}
-
-/**
- * Print category with optional text before and after.
- *
- * @since 0.71
- * @deprecated use get_the_category_by_ID()
- * @see get_the_category_by_ID()
- *
- * @param string $before
- * @param string $after
- */
-function the_category_head($before='', $after='') {
-	global $currentcat, $previouscat;
-
-	_deprecated_function(__FUNCTION__, '0.0', 'get_the_category_by_ID()');
-
-	// Grab the first cat in the list.
-	$categories = get_the_category();
-	$currentcat = $categories[0]->category_id;
-	if ( $currentcat != $previouscat ) {
-		echo $before;
-		echo get_the_category_by_ID($currentcat);
-		echo $after;
-		$previouscat = $currentcat;
-	}
-}
-
-/**
- * Prints link to the previous post.
- *
- * @since 1.5
- * @deprecated Use previous_post_link()
- * @see previous_post_link()
- *
- * @param string $format
- * @param string $previous
- * @param string $title
- * @param string $in_same_cat
- * @param int $limitprev
- * @param string $excluded_categories
- */
-function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
-
-	_deprecated_function(__FUNCTION__, '0.0', 'previous_post_link()');
-
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
-
-	$post = get_previous_post($in_same_cat, $excluded_categories);
-
-	if ( !$post )
-		return;
-
-	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post);
-	$string .= '</a>';
-	$format = str_replace('%', $string, $format);
-	echo $format;
-}
-
-/**
- * Prints link to the next post.
- *
- * @since 0.71
- * @deprecated Use next_post_link()
- * @see next_post_link()
- *
- * @param string $format
- * @param string $previous
- * @param string $title
- * @param string $in_same_cat
- * @param int $limitprev
- * @param string $excluded_categories
- */
-function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
-	_deprecated_function(__FUNCTION__, '0.0', 'next_post_link()');
-
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
-
-	$post = get_next_post($in_same_cat, $excluded_categories);
-
-	if ( !$post	)
-		return;
-
-	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $nextpost);
-	$string .= '</a>';
-	$format = str_replace('%', $string, $format);
-	echo $format;
-}
-
-/**
- * Whether user can create a post.
- *
- * @since 1.5
- * @deprecated Use current_user_can()
- * @see current_user_can()
- *
- * @param int $user_id
- * @param int $blog_id Not Used
- * @param int $category_id Not Used
- * @return bool
- */
-function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function(__FUNCTION__, '0.0', 'current_user_can()');
-
-	$author_data = get_userdata($user_id);
-	return ($author_data->user_level > 1);
-}
-
-/**
- * Whether user can create a post.
- *
- * @since 1.5
- * @deprecated Use current_user_can()
- * @see current_user_can()
- *
- * @param int $user_id
- * @param int $blog_id Not Used
- * @param int $category_id Not Used
- * @return bool
- */
-function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function(__FUNCTION__, '0.0', 'current_user_can()');
-
-	$author_data = get_userdata($user_id);
-	return ($author_data->user_level >= 1);
-}
-
-/**
- * Whether user can edit a post.
- *
- * @since 1.5
- * @deprecated Use current_user_can()
- * @see current_user_can()
- *
- * @param int $user_id
- * @param int $post_id
- * @param int $blog_id Not Used
- * @return bool
- */
-function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function(__FUNCTION__, '0', 'current_user_can()');
-
-	$author_data = get_userdata($user_id);
-	$post = get_post($post_id);
-	$post_author_data = get_userdata($post->post_author);
-
-	if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' &&  $author_data->user_level < 2))
-			 || ($author_data->user_level > $post_author_data->user_level)
-			 || ($author_data->user_level >= 10) ) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-/**
- * Whether user can delete a post.
- *
- * @since 1.5
- * @deprecated Use current_user_can()
- * @see current_user_can()
- *
- * @param int $user_id
- * @param int $post_id
- * @param int $blog_id Not Used
- * @return bool
- */
-function user_can_delete_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function(__FUNCTION__, '0.0', 'current_user_can()');
-
-	// right now if one can edit, one can delete
-	return user_can_edit_post($user_id, $post_id, $blog_id);
-}
-
-/**
- * Whether user can set new posts' dates.
- *
- * @since 1.5
- * @deprecated Use current_user_can()
- * @see current_user_can()
- *
- * @param int $user_id
- * @param int $blog_id Not Used
- * @param int $category_id Not Used
- * @return bool
- */
-function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function(__FUNCTION__, '0.0', 'current_user_can()');
-
-	$author_data = get_userdata($user_id);
-	return (($author_data->user_level > 4) && user_can_create_post($user_id, $blog_id, $category_id));
-}
-
-/**
- * Whether user can delete a post.
- *
- * @since 1.5
- * @deprecated Use current_user_can()
- * @see current_user_can()
- *
- * @param int $user_id
- * @param int $post_id
- * @param int $blog_id Not Used
- * @return bool returns true if $user_id can edit $post_id's date
- */
-function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function(__FUNCTION__, '0.0', 'current_user_can()');
-
-	$author_data = get_userdata($user_id);
-	return (($author_data->user_level > 4) && user_can_edit_post($user_id, $post_id, $blog_id));
-}
-
-/**
- * Whether user can delete a post.
- *
- * @since 1.5
- * @deprecated Use current_user_can()
- * @see current_user_can()
- *
- * @param int $user_id
- * @param int $post_id
- * @param int $blog_id Not Used
- * @return bool returns true if $user_id can edit $post_id's comments
- */
-function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function(__FUNCTION__, '0.0', 'current_user_can()');
-
-	// right now if one can edit a post, one can edit comments made on it
-	return user_can_edit_post($user_id, $post_id, $blog_id);
-}
-
-/**
- * Whether user can delete a post.
- *
- * @since 1.5
- * @deprecated Use current_user_can()
- * @see current_user_can()
- *
- * @param int $user_id
- * @param int $post_id
- * @param int $blog_id Not Used
- * @return bool returns true if $user_id can delete $post_id's comments
- */
-function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function(__FUNCTION__, '0.0', 'current_user_can()');
-
-	// right now if one can edit comments, one can delete comments
-	return user_can_edit_post_comments($user_id, $post_id, $blog_id);
-}
-
-/**
- * Can user can edit other user.
- *
- * @since 1.5
- * @deprecated Use current_user_can()
- * @see current_user_can()
- *
- * @param int $user_id
- * @param int $other_user
- * @return bool
- */
-function user_can_edit_user($user_id, $other_user) {
-	_deprecated_function(__FUNCTION__, '0.0', 'current_user_can()');
-
-	$user  = get_userdata($user_id);
-	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
-		return true;
-	else
-		return false;
-}
-
-/**
- * Gets the links associated with category $cat_name.
- *
- * @since 0.71
- * @deprecated Use get_links()
- * @see get_links()
- *
- * @param string $cat_name Optional. The category name to use. If no match is found uses all.
- * @param string $before Optional. The html to output before the link.
- * @param string $after Optional. The html to output after the link.
- * @param string $between Optional. The html to output between the link/image and it's description. Not used if no image or $show_images is true.
- * @param bool $show_images Optional. Whether to show images (if defined).
- * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url', 'description' or 'rating'. Or maybe owner.
- *		If you start the name with an underscore the order will be reversed. You can also specify 'rand' as the order which will return links in a
- *		random order.
- * @param bool $show_description Optional. Whether to show the description if show_images=false/not defined.
- * @param bool $show_rating Optional. Show rating stars/chars.
- * @param int $limit		Optional. Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated Optional. Whether to show last updated timestamp
- */
-function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />', $between = " ", $show_images = true, $orderby = 'id',
-						 $show_description = true, $show_rating = false,
-						 $limit = -1, $show_updated = 0) {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_links()');
-
-	$cat_id = -1;
-	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
-
-	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
-}
-
-/**
- * Gets the links associated with the named category.
- *
- * @since 1.0.1
- * @deprecated Use wp_get_links()
- * @see wp_get_links()
- *
- * @param string $category The category to use.
- * @param string $args
- * @return bool|null
- */
-function wp_get_linksbyname($category, $args = '') {
-	_deprecated_function(__FUNCTION__, '0.0', 'wp_get_links()');
-
-	$cat = get_term_by('name', $category, 'link_category');
-	if ( !$cat )
-		return false;
-	$cat_id = $cat->term_id;
-
-	$args = add_query_arg('category', $cat_id, $args);
-	wp_get_links($args);
-}
-
-/**
- * Gets an array of link objects associated with category $cat_name.
- *
- * <code>
- *	$links = get_linkobjectsbyname('fred');
- *	foreach ($links as $link) {
- * 		echo '<li>'.$link->link_name.'</li>';
- *	}
- * </code>
- *
- * @since 1.0.1
- * @deprecated Use get_linkobjects()
- * @see get_linkobjects()
- *
- * @param string $cat_name The category name to use. If no match is found uses all.
- * @param string $orderby The order to output the links. E.g. 'id', 'name', 'url', 'description', or 'rating'.
- *		Or maybe owner. If you start the name with an underscore the order will be reversed. You can also
- *		specify 'rand' as the order which will return links in a random order.
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @return unknown
- */
-function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_linkobjects()');
-
-	$cat_id = -1;
-	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
-
-	return get_linkobjects($cat_id, $orderby, $limit);
-}
-
-/**
- * Gets an array of link objects associated with category n.
- *
- * Usage:
- * <code>
- *	$links = get_linkobjects(1);
- *	if ($links) {
- *		foreach ($links as $link) {
- *			echo '<li>'.$link->link_name.'<br />'.$link->link_description.'</li>';
- *		}
- *	}
- * </code>
- *
- * Fields are:
- * <ol>
- *	<li>link_id</li>
- *	<li>link_url</li>
- *	<li>link_name</li>
- *	<li>link_image</li>
- *	<li>link_target</li>
- *	<li>link_category</li>
- *	<li>link_description</li>
- *	<li>link_visible</li>
- *	<li>link_owner</li>
- *	<li>link_rating</li>
- *	<li>link_updated</li>
- *	<li>link_rel</li>
- *	<li>link_notes</li>
- * </ol>
- *
- * @since 1.0.1
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
- *
- * @param int $category The category to use. If no category supplied uses all
- * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
- *		'description', or 'rating'. Or maybe owner. If you start the name with an
- *		underscore the order will be reversed. You can also specify 'rand' as the
- *		order which will return links in a random order.
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @return unknown
- */
-function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_bookmarks()');
-
-	$links = get_bookmarks("category=$category&orderby=$orderby&limit=$limit");
-
-	$links_array = array();
-	foreach ($links as $link)
-		$links_array[] = $link;
-
-	return $links_array;
-}
-
-/**
- * Gets the links associated with category 'cat_name' and display rating stars/chars.
- *
- * @since 0.71
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
- *
- * @param string $cat_name The category name to use. If no match is found uses all
- * @param string $before The html to output before the link
- * @param string $after The html to output after the link
- * @param string $between The html to output between the link/image and it's description. Not used if no image or show_images is true
- * @param bool $show_images Whether to show images (if defined).
- * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
- *		'description', or 'rating'. Or maybe owner. If you start the name with an
- *		underscore the order will be reversed. You can also specify 'rand' as the
- *		order which will return links in a random order.
- * @param bool $show_description Whether to show the description if show_images=false/not defined
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated Whether to show last updated timestamp
- */
-function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '<br />', $between = " ",
-									$show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_bookmarks()');
-
-	get_linksbyname($cat_name, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
-}
-
-/**
- * Gets the links associated with category n and display rating stars/chars.
- *
- * @since 0.71
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
- *
- * @param int $category The category to use. If no category supplied uses all
- * @param string $before The html to output before the link
- * @param string $after The html to output after the link
- * @param string $between The html to output between the link/image and it's description. Not used if no image or show_images == true
- * @param bool $show_images Whether to show images (if defined).
- * @param string $orderby The order to output the links. E.g. 'id', 'name', 'url',
- *		'description', or 'rating'. Or maybe owner. If you start the name with an
- *		underscore the order will be reversed. You can also specify 'rand' as the
- *		order which will return links in a random order.
- * @param bool $show_description Whether to show the description if show_images=false/not defined.
- * @param string $limit Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated Whether to show last updated timestamp
- */
-function get_links_withrating($category = -1, $before = '', $after = '<br />', $between = " ", $show_images = true,
-							  $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_bookmarks()');
-
-	get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
-}
-
-/**
- * Gets the auto_toggle setting.
- *
- * @since 0.71
- * @deprecated No alternative function available
- *
- * @param int $id The category to get. If no category supplied uses 0
- * @return int Only returns 0.
- */
-function get_autotoggle($id = 0) {
-	_deprecated_function(__FUNCTION__, '0.0' );
-	return 0;
-}
-
-/**
  * @since 0.71
  * @deprecated Use wp_list_categories()
  * @see wp_list_categories()
@@ -710,586 +144,4 @@
 	return wp_list_categories($r);
 }
 
-/**
- * @since 0.71
- * @deprecated Use wp_dropdown_categories()
- * @see wp_dropdown_categories()
- *
- * @param int $optionall
- * @param string $all
- * @param string $orderby
- * @param string $order
- * @param int $show_last_update
- * @param int $show_count
- * @param int $hide_empty
- * @param bool $optionnone
- * @param int $selected
- * @param int $exclude
- * @return unknown
- */
-function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = 'asc',
-		$show_last_update = 0, $show_count = 0, $hide_empty = 1, $optionnone = false,
-		$selected = 0, $exclude = 0) {
-	_deprecated_function(__FUNCTION__, '0.0', 'wp_dropdown_categories()');
-
-	$show_option_all = '';
-	if ( $optionall )
-		$show_option_all = $all;
-
-	$show_option_none = '';
-	if ( $optionnone )
-		$show_option_none = __('None');
-
-	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
-					'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude');
-	$query = add_query_arg($vars, '');
-	return wp_dropdown_categories($query);
-}
-
-/**
- * @since 1.2
- * @deprecated Use wp_list_authors()
- * @see wp_list_authors()
- *
- * @param bool $optioncount
- * @param bool $exclude_admin
- * @param bool $show_fullname
- * @param bool $hide_empty
- * @param string $feed
- * @param string $feed_image
- * @return unknown
- */
-function list_authors($optioncount = false, $exclude_admin = true, $show_fullname = false, $hide_empty = true, $feed = '', $feed_image = '') {
-	_deprecated_function(__FUNCTION__, '0.0', 'wp_list_authors()');
-
-	$args = compact('optioncount', 'exclude_admin', 'show_fullname', 'hide_empty', 'feed', 'feed_image');
-	return wp_list_authors($args);
-}
-
-/**
- * @since 1.0.1
- * @deprecated Use wp_get_post_categories()
- * @see wp_get_post_categories()
- *
- * @param int $blogid Not Used
- * @param int $post_ID
- * @return unknown
- */
-function wp_get_post_cats($blogid = '1', $post_ID = 0) {
-	_deprecated_function(__FUNCTION__, '0.0', 'wp_get_post_categories()');
-	return wp_get_post_categories($post_ID);
-}
-
-/**
- * Sets the categories that the post id belongs to.
- *
- * @since 1.0.1
- * @deprecated Use wp_set_post_categories()
- * @see wp_set_post_categories()
- *
- * @param int $blogid Not used
- * @param int $post_ID
- * @param array $post_categories
- * @return unknown
- */
-function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {
-	_deprecated_function(__FUNCTION__, '0.0', 'wp_set_post_categories()');
-	return wp_set_post_categories($post_ID, $post_categories);
-}
-
-/**
- * @since 0.71
- * @deprecated Use wp_get_archives()
- * @see wp_get_archives()
- *
- * @param string $type
- * @param string $limit
- * @param string $format
- * @param string $before
- * @param string $after
- * @param bool $show_post_count
- * @return unknown
- */
-function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
-	_deprecated_function(__FUNCTION__, '0.0', 'wp_get_archives()');
-	$args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
-	return wp_get_archives($args);
-}
-
-/**
- * Returns or Prints link to the author's posts.
- *
- * @since 1.2
- * @deprecated Use get_author_posts_url()
- * @see get_author_posts_url()
- *
- * @param bool $echo Optional.
- * @param int $author_id Required.
- * @param string $author_nicename Optional.
- * @return string|null
- */
-function get_author_link($echo = false, $author_id, $author_nicename = '') {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_author_posts_url()');
-
-	$link = get_author_posts_url($author_id, $author_nicename);
-
-	if ( $echo )
-		echo $link;
-	return $link;
-}
-
-/**
- * Print list of pages based on arguments.
- *
- * @since 0.71
- * @deprecated Use wp_link_pages()
- * @see wp_link_pages()
- *
- * @param string $before
- * @param string $after
- * @param string $next_or_number
- * @param string $nextpagelink
- * @param string $previouspagelink
- * @param string $pagelink
- * @param string $more_file
- * @return string
- */
-function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page',
-					$pagelink='%', $more_file='') {
-	_deprecated_function(__FUNCTION__, '0.0', 'wp_link_pages()');
-
-	$args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
-	return wp_link_pages($args);
-}
-
-/**
- * Get value based on option.
- *
- * @since 0.71
- * @deprecated Use get_option()
- * @see get_option()
- *
- * @param string $option
- * @return string
- */
-function get_settings($option) {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_option()');
-
-	return get_option($option);
-}
-
-/**
- * Print the permalink of the current post in the loop.
- *
- * @since 0.71
- * @deprecated Use the_permalink()
- * @see the_permalink()
- */
-function permalink_link() {
-	_deprecated_function(__FUNCTION__, '0.0', 'the_permalink()');
-	the_permalink();
-}
-
-/**
- * Print the permalink to the RSS feed.
- *
- * @since 0.71
- * @deprecated Use the_permalink_rss()
- * @see the_permalink_rss()
- *
- * @param string $file
- */
-function permalink_single_rss($deprecated = '') {
-	_deprecated_function(__FUNCTION__, '0.0', 'the_permalink_rss()');
-	the_permalink_rss();
-}
-
-/**
- * Gets the links associated with category.
- *
- * @see get_links() for argument information that can be used in $args
- * @since 1.0.1
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
- *
- * @param string $args a query string
- * @return null|string
- */
-function wp_get_links($args = '') {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_bookmarks()');
-
-	if ( strpos( $args, '=' ) === false ) {
-		$cat_id = $args;
-		$args = add_query_arg( 'category', $cat_id, $args );
-	}
-
-	$defaults = array(
-		'category' => -1, 'before' => '',
-		'after' => '<br />', 'between' => ' ',
-		'show_images' => true, 'orderby' => 'name',
-		'show_description' => true, 'show_rating' => false,
-		'limit' => -1, 'show_updated' => true,
-		'echo' => true
-	);
-
-	$r = wp_parse_args( $args, $defaults );
-	extract( $r, EXTR_SKIP );
-
-	return get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated, $echo);
-}
-
-/**
- * Gets the links associated with category by id.
- *
- * @since 0.71
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
- *
- * @param int $category The category to use. If no category supplied uses all
- * @param string $before the html to output before the link
- * @param string $after the html to output after the link
- * @param string $between the html to output between the link/image and its description.
- *		Not used if no image or show_images == true
- * @param bool $show_images whether to show images (if defined).
- * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
- *		'description', or 'rating'. Or maybe owner. If you start the name with an
- *		underscore the order will be reversed. You can also specify 'rand' as the order
- *		which will return links in a random order.
- * @param bool $show_description whether to show the description if show_images=false/not defined.
- * @param bool $show_rating show rating stars/chars
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated whether to show last updated timestamp
- * @param bool $echo whether to echo the results, or return them instead
- * @return null|string
- */
-function get_links($category = -1, $before = '', $after = '<br />', $between = ' ', $show_images = true, $orderby = 'name',
-			$show_description = true, $show_rating = false, $limit = -1, $show_updated = 1, $echo = true) {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_bookmarks()');
-
-	$order = 'ASC';
-	if ( substr($orderby, 0, 1) == '_' ) {
-		$order = 'DESC';
-		$orderby = substr($orderby, 1);
-	}
-
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
-		$category = '';
-
-	$results = get_bookmarks("category=$category&orderby=$orderby&order=$order&show_updated=$show_updated&limit=$limit");
-
-	if ( !$results )
-		return;
-
-	$output = '';
-
-	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
-			$row->recently_updated = false;
-		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_prepend');
-		$the_link = '#';
-		if ( !empty($row->link_url) )
-			$the_link = clean_url($row->link_url);
-		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
-
-		$desc = attribute_escape(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
-		$name = attribute_escape(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
-		$title = $desc;
-
-		if ( $show_updated )
-			if (substr($row->link_updated_f, 0, 2) != '00')
-				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * 3600)) . ')';
-
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
-
-		$alt = ' alt="' . $name . '"';
-
-		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
-
-		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
-
-		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
-				$output .= "<img src=\"$row->link_image\" $alt $title />";
-			else // If it's a relative path
-				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
-		} else {
-			$output .= $name;
-		}
-
-		$output .= '</a>';
-
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_append');
-
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
-
-		if ($show_rating) {
-			$output .= $between . get_linkrating($row);
-		}
-
-		$output .= "$after\n";
-	} // end while
-
-	if ( !$echo )
-		return $output;
-	echo $output;
-}
-
-/**
- * Output entire list of links by category.
- *
- * Output a list of all links, listed by category, using the settings in
- * $wpdb->linkcategories and output it as a nested HTML unordered list.
- *
- * @author Dougal
- * @since 1.0.1
- * @deprecated Use wp_list_bookmarks()
- * @see wp_list_bookmarks()
- *
- * @param string $order Sort link categories by 'name' or 'id'
- * @param string $$deprecated Not Used
- */
-function get_links_list($order = 'name', $deprecated = '') {
-	_deprecated_function(__FUNCTION__, '0.0', 'wp_list_bookmarks()');
-
-	$order = strtolower($order);
-
-	// Handle link category sorting
-	$direction = 'ASC';
-	if ( '_' == substr($order,0,1) ) {
-		$direction = 'DESC';
-		$order = substr($order,1);
-	}
-
-	if ( !isset($direction) )
-		$direction = '';
-
-	$cats = get_categories("type=link&orderby=$order&order=$direction&hierarchical=0");
-
-	// Display each category
-	if ( $cats ) {
-		foreach ( (array) $cats as $cat ) {
-			// Handle each category.
-
-			// Display the category name
-			echo '  <li id="linkcat-' . $cat->term_id . '" class="linkcat"><h2>' . apply_filters('link_category', $cat->name ) . "</h2>\n\t<ul>\n";
-			// Call get_links() with all the appropriate params
-			get_links($cat->term_id, '<li>', "</li>", "\n", true, 'name', false);
-
-			// Close the last category
-			echo "\n\t</ul>\n</li>\n";
-		}
-	}
-}
-
-/**
- * Show the link to the links popup and the number of links.
- *
- * @author Fullo
- * @link http://sprite.csr.unibo.it/fullo/
- *
- * @since 0.71
- * @deprecated {@internal Use function instead is unknown}}
- *
- * @param string $text the text of the link
- * @param int $width the width of the popup window
- * @param int $height the height of the popup window
- * @param string $file the page to open in the popup window
- * @param bool $count the number of links in the db
- */
-function links_popup_script($text = 'Links', $width=400, $height=400, $file='links.all.php', $count = true) {
-	_deprecated_function(__FUNCTION__, '0.0' );
-
-	if ( $count )
-		$counts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->links");
-
-	$javascript = "<a href=\"#\" onclick=\"javascript:window.open('$file?popup=1', '_blank', 'width=$width,height=$height,scrollbars=yes,status=no'); return false\">";
-	$javascript .= $text;
-
-	if ( $count )
-		$javascript .= " ($counts)";
-
-	$javascript .= "</a>\n\n";
-		echo $javascript;
-}
-
-/**
- * @since 1.0.1
- * @deprecated Use sanitize_bookmark_field()
- * @see sanitize_bookmark_field()
- *
- * @param object $link
- * @return unknown
- */
-function get_linkrating($link) {
-	_deprecated_function(__FUNCTION__, '0.0', 'sanitize_bookmark_field()');
-	return sanitize_bookmark_field('link_rating', $link->link_rating, $link->link_id, 'display');
-}
-
-/**
- * Gets the name of category by id.
- *
- * @since 0.71
- * @deprecated Use get_category()
- * @see get_category()
- *
- * @param int $id The category to get. If no category supplied uses 0
- * @return string
- */
-function get_linkcatname($id = 0) {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_category()');
-
-	$id = (int) $id;
-
-	if ( empty($id) )
-		return '';
-
-	$cats = wp_get_link_cats($id);
-
-	if ( empty($cats) || ! is_array($cats) )
-		return '';
-
-	$cat_id = (int) $cats[0]; // Take the first cat.
-
-	$cat = get_category($cat_id);
-	return $cat->name;
-}
-
-/**
- * Print RSS comment feed link.
- *
- * @since 1.0.1
- * @deprecated Use post_comments_feed_link()
- * @see post_comments_feed_link()
- *
- * @param string $link_text
- * @param string $deprecated Not used
- */
-function comments_rss_link($link_text = 'Comments RSS', $deprecated = '') {
-	_deprecated_function(__FUNCTION__, '0.0', 'post_comments_feed_link()');
-	post_comments_feed_link($link_text);
-}
-
-/**
- * Print/Return link to category RSS2 feed.
- *
- * @since 1.2
- * @deprecated Use get_category_feed_link()
- * @see get_category_feed_link()
- *
- * @param bool $echo
- * @param int $cat_ID
- * @param string $deprecated Not used
- * @return string|null
- */
-function get_category_rss_link($echo = false, $cat_ID = 1, $deprecated = '') {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_category_feed_link()');
-
-	$link = get_category_feed_link($cat_ID, 'rss2');
-
-	if ( $echo )
-		echo $link;
-	return $link;
-}
-
-/**
- * Print/Return link to author RSS feed.
- *
- * @since 1.2
- * @deprecated Use get_author_feed_link()
- * @see get_author_feed_link()
- *
- * @param bool $echo
- * @param int $author_id
- * @param string $deprecated Not used
- * @return string|null
- */
-function get_author_rss_link($echo = false, $author_id = 1, $deprecated = '') {
-	_deprecated_function(__FUNCTION__, '0.0', 'get_author_feed_link()');
-
-	$link = get_author_feed_link($author_id);
-	if ( $echo )
-		echo $link;
-	return $link;
-}
-
-/**
- * Return link to the post RSS feed.
- *
- * @since 1.5
- * @deprecated Use get_post_comments_feed_link()
- * @see get_post_comments_feed_link()
- *
- * @param string $deprecated Not used
- * @return string
- */
-function comments_rss($deprecated = '') {
-	_deprecated_function(__FUNCTION__, '2.2', 'get_post_comments_feed_link()');
-	return get_post_comments_feed_link();
-}
-
-/**
- * An alias of wp_create_user().
- *
- * @param string $username The user's username.
- * @param string $password The user's password.
- * @param string $email The user's email (optional).
- * @return int The new user's ID.
- * @deprecated Use wp_create_user()
- * @see wp_create_user()
- */
-function create_user($username, $password, $email) {
-	_deprecated_function( __FUNCTION__, '2.0', 'wp_create_user()' );
-	return wp_create_user($username, $password, $email);
-}
-
-/**
- * Unused Admin function.
- *
- * @since 2.0
- * @param string $deprecated Unknown
- * @deprecated 2.5
- */
-function documentation_link( $deprecated = '' ) {
-	_deprecated_function( __FUNCTION__, '2.5', '' );
-	return;
-}
-
-/**
- * Unused function.
- *
- * @deprecated 2.5
-*/
-function gzip_compression() {
-	return false;
-}
-
-/**
- * Retrieve an array of comment data about comment $comment_ID.
- *
- * @deprecated Use get_comment()
- * @see get_comment()
- * @since 0.71
- *
- * @uses $id
- * @uses $wpdb Database Object
- *
- * @param int $comment_ID The ID of the comment
- * @param int $no_cache Whether to use the cache or not (casted to bool)
- * @param bool $include_unapproved Whether to include unapproved comments or not
- * @return array The comment data
- */
-function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) {
-	_deprecated_function( __FUNCTION__, '2.7', 'get_comment()' );
-	return get_comment($comment_ID, ARRAY_A);
-}
-
-?>
\ No newline at end of file
+?>
diff -uNr a/mp-wp/wp-includes/formatting.php b/mp-wp/wp-includes/formatting.php
--- a/mp-wp/wp-includes/formatting.php 8f357ed8c80c0ca11d8f4c97243f23ae535672fd5d9c83e43ddfe14b6d1ba191b920801ed8c9ac0168e61f6e626634d0041985de3afc69ffe6af6ae2fbded7c7
+++ b/mp-wp/wp-includes/formatting.php 8a1954e0681a8c454faa3583568b572ba75b27fd048649ad65bf1ff8cb1cd92452980eb0f26b818c635c1f8398197ea4570c461a8358866672004448e6de4bc4
@@ -8,76 +8,6 @@
  **/
 
 /**
- * Replaces common plain text characters into formatted entities
- *
- * As an example,
- * <code>
- * 'cause today's effort makes it worth tomorrow's "holiday"...
- * </code>
- * Becomes:
- * <code>
- * &#8217;cause today&#8217;s effort makes it worth tomorrow&#8217;s &#8220;holiday&#8221;&#8230;
- * </code>
- * Code within certain html blocks are skipped.
- *
- * @since 0.71
- * @uses $wp_cockneyreplace Array of formatted entities for certain common phrases
- *
- * @param string $text The text to be formatted
- * @return string The string replaced with html entities
- */
-function wptexturize($text) {
-/*	global $wp_cockneyreplace;
-	$next = true;
-	$has_pre_parent = false;
-	$output = '';
-	$curl = '';
-	$textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
-	$stop = count($textarr);
-
-	// if a plugin has provided an autocorrect array, use it
-	if ( isset($wp_cockneyreplace) ) {
-		$cockney = array_keys($wp_cockneyreplace);
-		$cockneyreplace = array_values($wp_cockneyreplace);
-	} else {
-		$cockney = array("'tain't","'twere","'twas","'tis","'twill","'til","'bout","'nuff","'round","'cause");
-		$cockneyreplace = array("&#8217;tain&#8217;t","&#8217;twere","&#8217;twas","&#8217;tis","&#8217;twill","&#8217;til","&#8217;bout","&#8217;nuff","&#8217;round","&#8217;cause");
-	}
-
-	$static_characters = array_merge(array('---', ' -- ', '--', 'xn&#8211;', '...', '``', '\'s', '\'\'', ' (tm)'), $cockney);
-	$static_replacements = array_merge(array('&#8212;', ' &#8212; ', '&#8211;', 'xn--', '&#8230;', '&#8220;', '&#8217;s', '&#8221;', ' &#8482;'), $cockneyreplace);
-
-	$dynamic_characters = array('/\'(\d\d(?:&#8217;|\')?s)/', '/(\s|\A|")\'/', '/(\d+)"/', '/(\d+)\'/', '/(\S)\'([^\'\s])/', '/(\s|\A)"(?!\s)/', '/"(\s|\S|\Z)/', '/\'([\s.]|\Z)/', '/(\d+)x(\d+)/');
-	$dynamic_replacements = array('&#8217;$1','$1&#8216;', '$1&#8243;', '$1&#8242;', '$1&#8217;$2', '$1&#8220;$2', '&#8221;$1', '&#8217;$1', '$1&#215;$2');
-
-	for ( $i = 0; $i < $stop; $i++ ) {
-		$curl = $textarr[$i];
-
-		if ( !empty($curl) && '<' != $curl{0} && '[' != $curl{0} && $next && !$has_pre_parent) { // If it's not a tag
-			// static strings
-			$curl = str_replace($static_characters, $static_replacements, $curl);
-			// regular expressions
-			$curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
-		} elseif (strpos($curl, '<code') !== false || strpos($curl, '<kbd') !== false || strpos($curl, '<style') !== false || strpos($curl, '<script') !== false) {
-			$next = false;
-		} elseif (strpos($curl, '<pre') !== false) {
-			$has_pre_parent = true;
-		} elseif (strpos($curl, '</pre>') !== false) {
-			$has_pre_parent = false;
-		} else {
-			$next = true;
-		}
-
-		$curl = preg_replace('/&([^#])(?![a-zA-Z1-4]{1,8};)/', '&#038;$1', $curl);
-		$output .= $curl;
-	}
-
-	return $output;
-*/
-return $text;  
-}
-
-/**
  * Accepts matches array from preg_replace_callback in wpautop() or a string.
  *
  * Ensures that the contents of a <<pre>>...<</pre>> HTML block are not
diff -uNr a/mp-wp/wp-includes/functions.wp-scripts.php b/mp-wp/wp-includes/functions.wp-scripts.php
--- a/mp-wp/wp-includes/functions.wp-scripts.php d8000256cc4303e265e02409547860113408e20ef6e19bb6b484a22104d4356519365b2bb827566b6d2310e3549e7b1075c7419324a9eb5721401ab322fa4313
+++ b/mp-wp/wp-includes/functions.wp-scripts.php false
@@ -1,99 +0,0 @@
-<?php
-/**
- * BackPress script procedural API.
- *
- * @package BackPress
- * @since r16
- */
-
-/**
- * Prints script tags in document head.
- *
- * Called by admin-header.php and by wp_head hook. Since it is called by wp_head
- * on every page load, the function does not instantiate the WP_Scripts object
- * unless script names are explicitly passed. Does make use of already
- * instantiated $wp_scripts if present. Use provided wp_print_scripts hook to
- * register/enqueue new scripts.
- *
- * @since r16
- * @see WP_Scripts::print_scripts()
- */
-function wp_print_scripts( $handles = false ) {
-	do_action( 'wp_print_scripts' );
-	if ( '' === $handles ) // for wp_head
-		$handles = false;
-
-	global $wp_scripts;
-	if ( !is_a($wp_scripts, 'WP_Scripts') ) {
-		if ( !$handles )
-			return array(); // No need to instantiate if nothing's there.
-		else
-			$wp_scripts = new WP_Scripts();
-	}
-
-	return $wp_scripts->do_items( $handles );
-}
-
-/**
- * Register new JavaScript file.
- *
- * @since r16
- * @see WP_Scripts::add() For parameter information.
- */
-function wp_register_script( $handle, $src, $deps = array(), $ver = false ) {
-	global $wp_scripts;
-	if ( !is_a($wp_scripts, 'WP_Scripts') )
-		$wp_scripts = new WP_Scripts();
-
-	$wp_scripts->add( $handle, $src, $deps, $ver );
-}
-
-/**
- * Localizes a script.
- *
- * Localizes only if script has already been added.
- *
- * @since r16
- * @see WP_Script::localize()
- */
-function wp_localize_script( $handle, $object_name, $l10n ) {
-	global $wp_scripts;
-	if ( !is_a($wp_scripts, 'WP_Scripts') )
-		return false;
-
-	return $wp_scripts->localize( $handle, $object_name, $l10n );
-}
-
-/**
- * Remove a registered script.
- *
- * @since r16
- * @see WP_Scripts::remove() For parameter information.
- */
-function wp_deregister_script( $handle ) {
-	global $wp_scripts;
-	if ( !is_a($wp_scripts, 'WP_Scripts') )
-		$wp_scripts = new WP_Scripts();
-
-	$wp_scripts->remove( $handle );
-}
-
-/**
- * Enqueues script.
- *
- * Registers the script if src provided (does NOT overwrite) and enqueues.
- *
- * @since r16
- * @see WP_Script::add(), WP_Script::enqueue()
-*/
-function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false ) {
-	global $wp_scripts;
-	if ( !is_a($wp_scripts, 'WP_Scripts') )
-		$wp_scripts = new WP_Scripts();
-
-	if ( $src ) {
-		$_handle = explode('?', $handle);
-		$wp_scripts->add( $_handle[0], $src, $deps, $ver );
-	}
-	$wp_scripts->enqueue( $handle );
-}
diff -uNr a/mp-wp/wp-includes/general-template.php b/mp-wp/wp-includes/general-template.php
--- a/mp-wp/wp-includes/general-template.php b61758ce3944dcc4e0d26b170cac7d65e024b14414aee50de039c9bc0eaa7b909dad56cec1ae40faee7f0cd478cf13b3d92ecd128606e0143f921b717217f88d
+++ b/mp-wp/wp-includes/general-template.php ab9d675f6e203732f5816a06fd517f96ac66fc7c41de37bc9c5769f62e96874e898500ca595a2b3931b21f4b2bf5788202ba024f8c72a38e526d4aa93d3644eb
@@ -659,7 +659,6 @@
  * @return string HTML link content for archive.
  */
 function get_archives_link($url, $text, $format = 'html', $before = '', $after = '') {
-	$text = wptexturize($text);
 	$title_text = attribute_escape($text);
 	$url = clean_url($url);
 
@@ -1040,7 +1039,7 @@
 		foreach ( (array) $ak_post_titles as $ak_post_title ) {
 
 				$post_title = apply_filters( "the_title", $ak_post_title->post_title );
-				$post_title = str_replace('"', '&quot;', wptexturize( $post_title ));
+				$post_title = str_replace('"', '&quot;', $post_title );
 
 				if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) )
 					$ak_titles_for_day['day_'.$ak_post_title->dom] = '';
@@ -1410,46 +1409,19 @@
  * @param string $content Textarea content.
  * @param string $id HTML ID attribute value.
  * @param string $prev_id HTML ID name for switching back and forth between visual editors.
- * @param bool $media_buttons Optional, default is true. Whether to display media buttons.
  * @param int $tab_index Optional, default is 2. Tabindex for textarea element.
  */
-function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2) {
+function the_editor($content, $id = 'content', $prev_id = 'title', $tab_index = 2) {
 	$rows = get_option('default_post_edit_rows');
 	if (($rows < 3) || ($rows > 100))
 		$rows = 12;
 
-	if ( !current_user_can( 'upload_files' ) )
-		$media_buttons = false;
-
 	$rows = "rows='$rows'";
 
-	if ( $media_buttons ) { ?>
-	<div id="editor-toolbar">
-		<?php if ( $media_buttons ) { ?>
-			<div id="media-buttons" class="hide-if-no-js">
-			<?php do_action( 'media_buttons' ); ?>
-			</div>
-		<?php } ?>
-	</div>
-	<?php } ?>
-
-	<div id="quicktags">
-	<?php wp_print_scripts( 'quicktags' ); ?>
-	<script type="text/javascript">edToolbar()</script>
-	</div>
-
-	<?php $the_editor = apply_filters('the_editor', "<div id='editorcontainer'><textarea $rows cols='40' name='$id' tabindex='$tab_index' id='$id'>%s</textarea></div>\n");
+	$the_editor = apply_filters('the_editor', "<div id='editorcontainer'><textarea $rows cols='40' name='$id' tabindex='$tab_index' id='$id'>%s</textarea></div>\n");
 	$the_editor_content = apply_filters('the_editor_content', $content);
 
 	printf($the_editor, $the_editor_content);
-
-	?>
-	<script type="text/javascript">
-	// <![CDATA[
-	edCanvas = document.getElementById('<?php echo $id; ?>');
-	// ]]>
-	</script>
-	<?php
 }
 
 /**
@@ -1637,31 +1609,6 @@
 }
 
 /**
- * Registers an admin colour scheme css file.
- *
- * Allows a plugin to register a new admin colour scheme. For example:
- * <code>
- * wp_admin_css_color('classic', __('Classic'), admin_url("css/colors-classic.css"),
- * array('#07273E', '#14568A', '#D54E21', '#2683AE'));
- * </code>
- *
- * @since 2.5.0
- *
- * @param string $key The unique key for this theme.
- * @param string $name The name of the theme.
- * @param string $url The url of the css file containing the colour scheme.
- * @param array @colors An array of CSS color definitions which are used to give the user a feel for the theme.
- */
-function wp_admin_css_color($key, $name, $url, $colors = array()) {
-	global $_wp_admin_css_colors;
-
-	if ( !isset($_wp_admin_css_colors) )
-		$_wp_admin_css_colors = array();
-
-	$_wp_admin_css_colors[$key] = (object) array('name' => $name, 'url' => $url, 'colors' => $colors);
-}
-
-/**
  * Display the URL of a WordPress admin CSS file.
  *
  * @see WP_Styles::_css_href and its style_loader_src filter.
@@ -1724,20 +1671,6 @@
 }
 
 /**
- * Enqueues the default ThickBox js and css.
- *
- * If any of the settings need to be changed, this can be done with another js
- * file similar to media-upload.js and theme-preview.js. That file should
- * require array('thickbox') to ensure it is loaded after.
- *
- * @since 2.5.0
- */
-function add_thickbox() {
-	wp_enqueue_script( 'thickbox' );
-	wp_enqueue_style( 'thickbox' );
-}
-
-/**
  * Display the XHTML generator that is generated on the wp_head hook.
  *
  * @since 2.5.0
diff -uNr a/mp-wp/wp-includes/js/.htaccess b/mp-wp/wp-includes/js/.htaccess
--- a/mp-wp/wp-includes/js/.htaccess 8d7843bf5142262b9b76e30639d4eb8137d53af16a639d75726f6b88d624a9bff8a1163fd5a7a18ee580cfd7118ec58d4e72760540b2321dcaae3440e2266712
+++ b/mp-wp/wp-includes/js/.htaccess false
@@ -1,3 +0,0 @@
-Order deny,allow
-Deny from all
-Allow from fill your own
diff -uNr a/mp-wp/wp-includes/js/autosave.js b/mp-wp/wp-includes/js/autosave.js
--- a/mp-wp/wp-includes/js/autosave.js 30e1d670b6a0578792d5d6c78a27740f66faf7ff175f188277e6b6b7b9e9e599630739eebdbf35f562cc204ab23bada8a0c4a8079a3cbb8c2a7d9c5b70f7bed8
+++ b/mp-wp/wp-includes/js/autosave.js false
@@ -1,195 +0,0 @@
-var autosaveLast = '';
-var autosavePeriodical;
-var autosaveOldMessage = '';
-var autosaveDelayPreview = false;
-var autosaveFirst = true;
-
-jQuery(function($) {
-	autosaveLast = $('#post #title').val()+$('#post #content').val();
-	autosavePeriodical = $.schedule({time: autosaveL10n.autosaveInterval * 1000, func: function() { autosave(); }, repeat: true, protect: true});
-
-	//Disable autosave after the form has been submitted
-	$("#post").submit(function() { $.cancel(autosavePeriodical); });
-});
-
-function autosave_parse_response(response) {
-	var res = wpAjax.parseAjaxResponse(response, 'autosave'); // parse the ajax response
-	var message = '';
-
-	if ( res && res.responses && res.responses.length ) {
-		message = res.responses[0].data; // The saved message or error.
-		// someone else is editing: disable autosave, set errors
-		if ( res.responses[0].supplemental ) {
-			if ( 'disable' == res.responses[0].supplemental['disable_autosave'] ) {
-				autosave = function() {};
-				res = { errors: true };
-			}
-			jQuery.each(res.responses[0].supplemental, function(selector, value) {
-				if ( selector.match(/^replace-/) ) {
-					jQuery('#'+selector.replace('replace-', '')).val(value);
-				}
-			});
-		}
-
-		// if no errors: add slug UI
-		if ( !res.errors ) {
-			var postID = parseInt( res.responses[0].id );
-			if ( !isNaN(postID) && postID > 0 ) {
-				autosave_update_slug(postID);
-			}
-		}
-	}
-	if ( message ) { jQuery('#autosave').html(message); } // update autosave message
-	else if ( autosaveOldMessage && res ) { jQuery('#autosave').html( autosaveOldMessage ); }
-	return res;
-}
-
-// called when autosaving pre-existing post
-function autosave_saved(response) {
-	autosave_parse_response(response); // parse the ajax response
-	autosave_enable_buttons(); // re-enable disabled form buttons
-}
-
-// called when autosaving new post
-function autosave_saved_new(response) {
-	var res = autosave_parse_response(response); // parse the ajax response
-	// if no errors: update post_ID from the temporary value, grab new save-nonce for that new ID
-	if ( res && res.responses.length && !res.errors ) {
-		var tempID = jQuery('#post_ID').val();
-		var postID = parseInt( res.responses[0].id );
-		autosave_update_post_ID( postID ); // disabled form buttons are re-enabled here
-		if ( tempID < 0 && postID > 0 ) // update media buttons
-			jQuery('#media-buttons a').each(function(){
-				this.href = this.href.replace(tempID, postID);
-			});
-		// activate preview
-		autosaveFirst = false;
-		if ( autosaveDelayPreview )
-			jQuery('#post-preview').click();
-	} else {
-		autosave_enable_buttons(); // re-enable disabled form buttons
-	}
-}
-
-function autosave_update_post_ID( postID ) {
-	if ( !isNaN(postID) && postID > 0 ) {
-		if ( postID == parseInt(jQuery('#post_ID').val()) ) { return; } // no need to do this more than once
-		jQuery('#post_ID').attr({name: "post_ID"});
-		jQuery('#post_ID').val(postID);
-		// We need new nonces
-		jQuery.post(autosaveL10n.requestFile, {
-			action: "autosave-generate-nonces",
-			post_ID: postID,
-			autosavenonce: jQuery('#autosavenonce').val(),
-			post_type: jQuery('#post_type').val()
-		}, function(html) {
-			jQuery('#_wpnonce').val(html);
-			autosave_enable_buttons(); // re-enable disabled form buttons
-		});
-		jQuery('#hiddenaction').val('editpost');
-	}
-}
-
-function autosave_update_slug(post_id) {
-	// create slug area only if not already there
-	if ( jQuery.isFunction(make_slugedit_clickable) && !jQuery('#edit-slug-box > *').size() ) {
-		jQuery.post(
-			slugL10n.requestFile,
-			{
-				action: 'sample-permalink',
-				post_id: post_id,
-				new_title: jQuery('#title').val(),
-				samplepermalinknonce: jQuery('#samplepermalinknonce').val()
-			},
-			function(data) {
-				jQuery('#edit-slug-box').html(data);
-				make_slugedit_clickable();
-			}
-		);
-	}
-}
-
-function autosave_loading() {
-	jQuery('#autosave').html(autosaveL10n.savingText);
-}
-
-function autosave_enable_buttons() {
-	jQuery("#submitpost :button:disabled, #submitpost :submit:disabled").attr('disabled', '');
-}
-
-function autosave_disable_buttons() {
-	jQuery("#submitpost :button:enabled, #submitpost :submit:enabled").attr('disabled', 'disabled');
-	setTimeout(autosave_enable_buttons, 5000); // Re-enable 5 sec later.  Just gives autosave a head start to avoid collisions.
-}
-
-var autosave = function() {
-	var post_data = {
-		action: "autosave",
-		post_ID:  jQuery("#post_ID").val() || 0,
-		post_title: jQuery("#title").val() || "",
-		autosavenonce: jQuery('#autosavenonce').val(),
-		tags_input: jQuery("#tags-input").val() || "",
-		post_type: jQuery('#post_type').val() || "",
-		autosave: 1
-	};
-
-	// We always send the ajax request in order to keep the post lock fresh.
-	// This (bool) tells whether or not to write the post to the DB during the ajax request.
-	var doAutoSave = true;
-
-	// No autosave while thickbox is open (media buttons)
-	if ( jQuery("#TB_window").css('display') == 'block' )
-		doAutoSave = false;
-
-	post_data["content"] = jQuery("#content").val();
-	if ( jQuery('#post_name').val() )
-		post_data["post_name"] = jQuery('#post_name').val();
-
-	// Nothing to save or no change.
-	if( (post_data["post_title"].length==0 && post_data["content"].length==0) || post_data["post_title"] + post_data["content"] == autosaveLast) {
-		doAutoSave = false
-	}
-
-	autosave_disable_buttons();
-
-	var origStatus = jQuery('#original_post_status').val();
-
-	autosaveLast = jQuery("#title").val()+jQuery("#content").val();
-	goodcats = ([]);
-	jQuery("[@name='post_category[]']:checked").each( function(i) {
-		goodcats.push(this.value);
-	} );
-	post_data["catslist"] = goodcats.join(",");
-
-	if ( jQuery("#comment_status").attr("checked") )
-		post_data["comment_status"] = 'open';
-	if ( jQuery("#ping_status").attr("checked") )
-		post_data["ping_status"] = 'open';
-	if ( jQuery("#excerpt").size() )
-		post_data["excerpt"] = jQuery("#excerpt").val();
-	if ( jQuery("#post_author").size() )
-		post_data["post_author"] = jQuery("#post_author").val();
-	
-	post_data["user_ID"] = jQuery("#user-id").val();
-
-	if(parseInt(post_data["post_ID"]) < 1) {
-		post_data["temp_ID"] = post_data["post_ID"];
-		var successCallback = autosave_saved_new; // new post
-	} else {
-		var successCallback = autosave_saved; // pre-existing post
-	}
-
-	if ( !doAutoSave ) {
-		post_data['autosave'] = 0;
-	}
-
-	autosaveOldMessage = jQuery('#autosave').html();
-
-	jQuery.ajax({
-		data: post_data,
-		beforeSend: doAutoSave ? autosave_loading : null,
-		type: "POST",
-		url: autosaveL10n.requestFile,
-		success: successCallback
-	});
-}
diff -uNr a/mp-wp/wp-includes/js/colorpicker.js b/mp-wp/wp-includes/js/colorpicker.js
--- a/mp-wp/wp-includes/js/colorpicker.js 5dda52724e8ee7889baf0a35ad0665f2db6af09cb7daede70d7320ac1f24fd1ab6eeb4563d39da229c6f43fd46695be69d6067c211a8b886390caa87d156b8f6
+++ b/mp-wp/wp-includes/js/colorpicker.js false
@@ -1,707 +0,0 @@
-// ===================================================================
-// Author: Matt Kruse <matt@mattkruse.com>
-// WWW: http://www.mattkruse.com/
-//
-// NOTICE: You may use this code for any purpose, commercial or
-// private, without any further permission from the author. You may
-// remove this notice from your final code if you wish, however it is
-// appreciated by the author if at least my web site address is kept.
-//
-// You may *NOT* re-distribute this code in any way except through its
-// use. That means, you can include it in your product, or your web
-// site, or any other form where the code is actually being used. You
-// may not put the plain javascript up on your site for download or
-// include it in your javascript libraries for download. 
-// If you wish to share this code with others, please just point them
-// to the URL instead.
-// Please DO NOT link directly to my .js files from your site. Copy
-// the files to your server and use them there. Thank you.
-// ===================================================================
-
-
-/* SOURCE FILE: AnchorPosition.js */
-
-/* 
-AnchorPosition.js
-Author: Matt Kruse
-Last modified: 10/11/02
-
-DESCRIPTION: These functions find the position of an <A> tag in a document,
-so other elements can be positioned relative to it.
-
-COMPATABILITY: Netscape 4.x,6.x,Mozilla, IE 5.x,6.x on Windows. Some small
-positioning errors - usually with Window positioning - occur on the 
-Macintosh platform.
-
-FUNCTIONS:
-getAnchorPosition(anchorname)
-  Returns an Object() having .x and .y properties of the pixel coordinates
-  of the upper-left corner of the anchor. Position is relative to the PAGE.
-
-getAnchorWindowPosition(anchorname)
-  Returns an Object() having .x and .y properties of the pixel coordinates
-  of the upper-left corner of the anchor, relative to the WHOLE SCREEN.
-
-NOTES:
-
-1) For popping up separate browser windows, use getAnchorWindowPosition. 
-   Otherwise, use getAnchorPosition
-
-2) Your anchor tag MUST contain both NAME and ID attributes which are the 
-   same. For example:
-   <A NAME="test" ID="test"> </A>
-
-3) There must be at least a space between <A> </A> for IE5.5 to see the 
-   anchor tag correctly. Do not do <A></A> with no space.
-*/ 
-
-// getAnchorPosition(anchorname)
-//   This function returns an object having .x and .y properties which are the coordinates
-//   of the named anchor, relative to the page.
-function getAnchorPosition(anchorname) {
-	// This function will return an Object with x and y properties
-	var useWindow=false;
-	var coordinates=new Object();
-	var x=0,y=0;
-	// Browser capability sniffing
-	var use_gebi=false, use_css=false, use_layers=false;
-	if (document.getElementById) { use_gebi=true; }
-	else if (document.all) { use_css=true; }
-	else if (document.layers) { use_layers=true; }
-	// Logic to find position
- 	if (use_gebi && document.all) {
-		x=AnchorPosition_getPageOffsetLeft(document.all[anchorname]);
-		y=AnchorPosition_getPageOffsetTop(document.all[anchorname]);
-		}
-	else if (use_gebi) {
-		var o=document.getElementById(anchorname);
-		x=AnchorPosition_getPageOffsetLeft(o);
-		y=AnchorPosition_getPageOffsetTop(o);
-		}
- 	else if (use_css) {
-		x=AnchorPosition_getPageOffsetLeft(document.all[anchorname]);
-		y=AnchorPosition_getPageOffsetTop(document.all[anchorname]);
-		}
-	else if (use_layers) {
-		var found=0;
-		for (var i=0; i<document.anchors.length; i++) {
-			if (document.anchors[i].name==anchorname) { found=1; break; }
-			}
-		if (found==0) {
-			coordinates.x=0; coordinates.y=0; return coordinates;
-			}
-		x=document.anchors[i].x;
-		y=document.anchors[i].y;
-		}
-	else {
-		coordinates.x=0; coordinates.y=0; return coordinates;
-		}
-	coordinates.x=x;
-	coordinates.y=y;
-	return coordinates;
-	}
-
-// getAnchorWindowPosition(anchorname)
-//   This function returns an object having .x and .y properties which are the coordinates
-//   of the named anchor, relative to the window
-function getAnchorWindowPosition(anchorname) {
-	var coordinates=getAnchorPosition(anchorname);
-	var x=0;
-	var y=0;
-	if (document.getElementById) {
-		if (isNaN(window.screenX)) {
-			x=coordinates.x-document.body.scrollLeft+window.screenLeft;
-			y=coordinates.y-document.body.scrollTop+window.screenTop;
-			}
-		else {
-			x=coordinates.x+window.screenX+(window.outerWidth-window.innerWidth)-window.pageXOffset;
-			y=coordinates.y+window.screenY+(window.outerHeight-24-window.innerHeight)-window.pageYOffset;
-			}
-		}
-	else if (document.all) {
-		x=coordinates.x-document.body.scrollLeft+window.screenLeft;
-		y=coordinates.y-document.body.scrollTop+window.screenTop;
-		}
-	else if (document.layers) {
-		x=coordinates.x+window.screenX+(window.outerWidth-window.innerWidth)-window.pageXOffset;
-		y=coordinates.y+window.screenY+(window.outerHeight-24-window.innerHeight)-window.pageYOffset;
-		}
-	coordinates.x=x;
-	coordinates.y=y;
-	return coordinates;
-	}
-
-// Functions for IE to get position of an object
-function AnchorPosition_getPageOffsetLeft (el) {
-	var ol=el.offsetLeft;
-	while ((el=el.offsetParent) != null) { ol += el.offsetLeft; }
-	return ol;
-	}
-function AnchorPosition_getWindowOffsetLeft (el) {
-	return AnchorPosition_getPageOffsetLeft(el)-document.body.scrollLeft;
-	}
-function AnchorPosition_getPageOffsetTop (el) {
-	var ot=el.offsetTop;
-	while((el=el.offsetParent) != null) { ot += el.offsetTop; }
-	return ot;
-	}
-function AnchorPosition_getWindowOffsetTop (el) {
-	return AnchorPosition_getPageOffsetTop(el)-document.body.scrollTop;
-	}
-
-/* SOURCE FILE: PopupWindow.js */
-
-/* 
-PopupWindow.js
-Author: Matt Kruse
-Last modified: 02/16/04
-
-DESCRIPTION: This object allows you to easily and quickly popup a window
-in a certain place. The window can either be a DIV or a separate browser
-window.
-
-COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
-positioning errors - usually with Window positioning - occur on the 
-Macintosh platform. Due to bugs in Netscape 4.x, populating the popup 
-window with <STYLE> tags may cause errors.
-
-USAGE:
-// Create an object for a WINDOW popup
-var win = new PopupWindow(); 
-
-// Create an object for a DIV window using the DIV named 'mydiv'
-var win = new PopupWindow('mydiv'); 
-
-// Set the window to automatically hide itself when the user clicks 
-// anywhere else on the page except the popup
-win.autoHide(); 
-
-// Show the window relative to the anchor name passed in
-win.showPopup(anchorname);
-
-// Hide the popup
-win.hidePopup();
-
-// Set the size of the popup window (only applies to WINDOW popups
-win.setSize(width,height);
-
-// Populate the contents of the popup window that will be shown. If you 
-// change the contents while it is displayed, you will need to refresh()
-win.populate(string);
-
-// set the URL of the window, rather than populating its contents
-// manually
-win.setUrl("http://www.site.com/");
-
-// Refresh the contents of the popup
-win.refresh();
-
-// Specify how many pixels to the right of the anchor the popup will appear
-win.offsetX = 50;
-
-// Specify how many pixels below the anchor the popup will appear
-win.offsetY = 100;
-
-NOTES:
-1) Requires the functions in AnchorPosition.js
-
-2) Your anchor tag MUST contain both NAME and ID attributes which are the 
-   same. For example:
-   <A NAME="test" ID="test"> </A>
-
-3) There must be at least a space between <A> </A> for IE5.5 to see the 
-   anchor tag correctly. Do not do <A></A> with no space.
-
-4) When a PopupWindow object is created, a handler for 'onmouseup' is
-   attached to any event handler you may have already defined. Do NOT define
-   an event handler for 'onmouseup' after you define a PopupWindow object or
-   the autoHide() will not work correctly.
-*/ 
-
-// Set the position of the popup window based on the anchor
-function PopupWindow_getXYPosition(anchorname) {
-	var coordinates;
-	if (this.type == "WINDOW") {
-		coordinates = getAnchorWindowPosition(anchorname);
-		}
-	else {
-		coordinates = getAnchorPosition(anchorname);
-		}
-	this.x = coordinates.x;
-	this.y = coordinates.y;
-	}
-// Set width/height of DIV/popup window
-function PopupWindow_setSize(width,height) {
-	this.width = width;
-	this.height = height;
-	}
-// Fill the window with contents
-function PopupWindow_populate(contents) {
-	this.contents = contents;
-	this.populated = false;
-	}
-// Set the URL to go to
-function PopupWindow_setUrl(url) {
-	this.url = url;
-	}
-// Set the window popup properties
-function PopupWindow_setWindowProperties(props) {
-	this.windowProperties = props;
-	}
-// Refresh the displayed contents of the popup
-function PopupWindow_refresh() {
-	if (this.divName != null) {
-		// refresh the DIV object
-		if (this.use_gebi) {
-			document.getElementById(this.divName).innerHTML = this.contents;
-			}
-		else if (this.use_css) { 
-			document.all[this.divName].innerHTML = this.contents;
-			}
-		else if (this.use_layers) { 
-			var d = document.layers[this.divName]; 
-			d.document.open();
-			d.document.writeln(this.contents);
-			d.document.close();
-			}
-		}
-	else {
-		if (this.popupWindow != null && !this.popupWindow.closed) {
-			if (this.url!="") {
-				this.popupWindow.location.href=this.url;
-				}
-			else {
-				this.popupWindow.document.open();
-				this.popupWindow.document.writeln(this.contents);
-				this.popupWindow.document.close();
-			}
-			this.popupWindow.focus();
-			}
-		}
-	}
-// Position and show the popup, relative to an anchor object
-function PopupWindow_showPopup(anchorname) {
-	this.getXYPosition(anchorname);
-	this.x += this.offsetX;
-	this.y += this.offsetY;
-	if (!this.populated && (this.contents != "")) {
-		this.populated = true;
-		this.refresh();
-		}
-	if (this.divName != null) {
-		// Show the DIV object
-		if (this.use_gebi) {
-			document.getElementById(this.divName).style.left = this.x + "px";
-			document.getElementById(this.divName).style.top = this.y;
-			document.getElementById(this.divName).style.visibility = "visible";
-			}
-		else if (this.use_css) {
-			document.all[this.divName].style.left = this.x;
-			document.all[this.divName].style.top = this.y;
-			document.all[this.divName].style.visibility = "visible";
-			}
-		else if (this.use_layers) {
-			document.layers[this.divName].left = this.x;
-			document.layers[this.divName].top = this.y;
-			document.layers[this.divName].visibility = "visible";
-			}
-		}
-	else {
-		if (this.popupWindow == null || this.popupWindow.closed) {
-			// If the popup window will go off-screen, move it so it doesn't
-			if (this.x<0) { this.x=0; }
-			if (this.y<0) { this.y=0; }
-			if (screen && screen.availHeight) {
-				if ((this.y + this.height) > screen.availHeight) {
-					this.y = screen.availHeight - this.height;
-					}
-				}
-			if (screen && screen.availWidth) {
-				if ((this.x + this.width) > screen.availWidth) {
-					this.x = screen.availWidth - this.width;
-					}
-				}
-			var avoidAboutBlank = window.opera || ( document.layers && !navigator.mimeTypes['*'] ) || navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled );
-			this.popupWindow = window.open(avoidAboutBlank?"":"about:blank","window_"+anchorname,this.windowProperties+",width="+this.width+",height="+this.height+",screenX="+this.x+",left="+this.x+",screenY="+this.y+",top="+this.y+"");
-			}
-		this.refresh();
-		}
-	}
-// Hide the popup
-function PopupWindow_hidePopup() {
-	if (this.divName != null) {
-		if (this.use_gebi) {
-			document.getElementById(this.divName).style.visibility = "hidden";
-			}
-		else if (this.use_css) {
-			document.all[this.divName].style.visibility = "hidden";
-			}
-		else if (this.use_layers) {
-			document.layers[this.divName].visibility = "hidden";
-			}
-		}
-	else {
-		if (this.popupWindow && !this.popupWindow.closed) {
-			this.popupWindow.close();
-			this.popupWindow = null;
-			}
-		}
-	}
-// Pass an event and return whether or not it was the popup DIV that was clicked
-function PopupWindow_isClicked(e) {
-	if (this.divName != null) {
-		if (this.use_layers) {
-			var clickX = e.pageX;
-			var clickY = e.pageY;
-			var t = document.layers[this.divName];
-			if ((clickX > t.left) && (clickX < t.left+t.clip.width) && (clickY > t.top) && (clickY < t.top+t.clip.height)) {
-				return true;
-				}
-			else { return false; }
-			}
-		else if (document.all) { // Need to hard-code this to trap IE for error-handling
-			var t = window.event.srcElement;
-			while (t.parentElement != null) {
-				if (t.id==this.divName) {
-					return true;
-					}
-				t = t.parentElement;
-				}
-			return false;
-			}
-		else if (this.use_gebi && e) {
-			var t = e.originalTarget;
-			while (t.parentNode != null) {
-				if (t.id==this.divName) {
-					return true;
-					}
-				t = t.parentNode;
-				}
-			return false;
-			}
-		return false;
-		}
-	return false;
-	}
-
-// Check an onMouseDown event to see if we should hide
-function PopupWindow_hideIfNotClicked(e) {
-	if (this.autoHideEnabled && !this.isClicked(e)) {
-		this.hidePopup();
-		}
-	}
-// Call this to make the DIV disable automatically when mouse is clicked outside it
-function PopupWindow_autoHide() {
-	this.autoHideEnabled = true;
-	}
-// This global function checks all PopupWindow objects onmouseup to see if they should be hidden
-function PopupWindow_hidePopupWindows(e) {
-	for (var i=0; i<popupWindowObjects.length; i++) {
-		if (popupWindowObjects[i] != null) {
-			var p = popupWindowObjects[i];
-			p.hideIfNotClicked(e);
-			}
-		}
-	}
-// Run this immediately to attach the event listener
-function PopupWindow_attachListener() {
-	if (document.layers) {
-		document.captureEvents(Event.MOUSEUP);
-		}
-	window.popupWindowOldEventListener = document.onmouseup;
-	if (window.popupWindowOldEventListener != null) {
-		document.onmouseup = new Function("window.popupWindowOldEventListener(); PopupWindow_hidePopupWindows();");
-		}
-	else {
-		document.onmouseup = PopupWindow_hidePopupWindows;
-		}
-	}
-// CONSTRUCTOR for the PopupWindow object
-// Pass it a DIV name to use a DHTML popup, otherwise will default to window popup
-function PopupWindow() {
-	if (!window.popupWindowIndex) { window.popupWindowIndex = 0; }
-	if (!window.popupWindowObjects) { window.popupWindowObjects = new Array(); }
-	if (!window.listenerAttached) {
-		window.listenerAttached = true;
-		PopupWindow_attachListener();
-		}
-	this.index = popupWindowIndex++;
-	popupWindowObjects[this.index] = this;
-	this.divName = null;
-	this.popupWindow = null;
-	this.width=0;
-	this.height=0;
-	this.populated = false;
-	this.visible = false;
-	this.autoHideEnabled = false;
-
-	this.contents = "";
-	this.url="";
-	this.windowProperties="toolbar=no,location=no,status=no,menubar=no,scrollbars=auto,resizable,alwaysRaised,dependent,titlebar=no";
-	if (arguments.length>0) {
-		this.type="DIV";
-		this.divName = arguments[0];
-		}
-	else {
-		this.type="WINDOW";
-		}
-	this.use_gebi = false;
-	this.use_css = false;
-	this.use_layers = false;
-	if (document.getElementById) { this.use_gebi = true; }
-	else if (document.all) { this.use_css = true; }
-	else if (document.layers) { this.use_layers = true; }
-	else { this.type = "WINDOW"; }
-	this.offsetX = 0;
-	this.offsetY = 0;
-	// Method mappings
-	this.getXYPosition = PopupWindow_getXYPosition;
-	this.populate = PopupWindow_populate;
-	this.setUrl = PopupWindow_setUrl;
-	this.setWindowProperties = PopupWindow_setWindowProperties;
-	this.refresh = PopupWindow_refresh;
-	this.showPopup = PopupWindow_showPopup;
-	this.hidePopup = PopupWindow_hidePopup;
-	this.setSize = PopupWindow_setSize;
-	this.isClicked = PopupWindow_isClicked;
-	this.autoHide = PopupWindow_autoHide;
-	this.hideIfNotClicked = PopupWindow_hideIfNotClicked;
-	}
-
-/* SOURCE FILE: ColorPicker2.js */
-
-/* 
-Last modified: 02/24/2003
-
-DESCRIPTION: This widget is used to select a color, in hexadecimal #RRGGBB 
-form. It uses a color "swatch" to display the standard 216-color web-safe 
-palette. The user can then click on a color to select it.
-
-COMPATABILITY: See notes in AnchorPosition.js and PopupWindow.js.
-Only the latest DHTML-capable browsers will show the color and hex values
-at the bottom as your mouse goes over them.
-
-USAGE:
-// Create a new ColorPicker object using DHTML popup
-var cp = new ColorPicker();
-
-// Create a new ColorPicker object using Window Popup
-var cp = new ColorPicker('window');
-
-// Add a link in your page to trigger the popup. For example:
-<A HREF="#" onClick="cp.show('pick');return false;" NAME="pick" ID="pick">Pick</A>
-
-// Or use the built-in "select" function to do the dirty work for you:
-<A HREF="#" onClick="cp.select(document.forms[0].color,'pick');return false;" NAME="pick" ID="pick">Pick</A>
-
-// If using DHTML popup, write out the required DIV tag near the bottom
-// of your page.
-<SCRIPT LANGUAGE="JavaScript">cp.writeDiv()</SCRIPT>
-
-// Write the 'pickColor' function that will be called when the user clicks
-// a color and do something with the value. This is only required if you
-// want to do something other than simply populate a form field, which is 
-// what the 'select' function will give you.
-function pickColor(color) {
-	field.value = color;
-	}
-
-NOTES:
-1) Requires the functions in AnchorPosition.js and PopupWindow.js
-
-2) Your anchor tag MUST contain both NAME and ID attributes which are the 
-   same. For example:
-   <A NAME="test" ID="test"> </A>
-
-3) There must be at least a space between <A> </A> for IE5.5 to see the 
-   anchor tag correctly. Do not do <A></A> with no space.
-
-4) When a ColorPicker object is created, a handler for 'onmouseup' is
-   attached to any event handler you may have already defined. Do NOT define
-   an event handler for 'onmouseup' after you define a ColorPicker object or
-   the color picker will not hide itself correctly.
-*/ 
-ColorPicker_targetInput = null;
-function ColorPicker_writeDiv() {
-	document.writeln("<DIV ID=\"colorPickerDiv\" STYLE=\"position:absolute;visibility:hidden;\"> </DIV>");
-	}
-
-function ColorPicker_show(anchorname) {
-	this.showPopup(anchorname);
-	}
-
-function ColorPicker_pickColor(color,obj) {
-	obj.hidePopup();
-	pickColor(color);
-	}
-
-// A Default "pickColor" function to accept the color passed back from popup.
-// User can over-ride this with their own function.
-function pickColor(color) {
-	if (ColorPicker_targetInput==null) {
-		alert("Target Input is null, which means you either didn't use the 'select' function or you have no defined your own 'pickColor' function to handle the picked color!");
-		return;
-		}
-	ColorPicker_targetInput.value = color;
-	}
-
-// This function is the easiest way to popup the window, select a color, and
-// have the value populate a form field, which is what most people want to do.
-function ColorPicker_select(inputobj,linkname) {
-	if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") { 
-		alert("colorpicker.select: Input object passed is not a valid form input object"); 
-		window.ColorPicker_targetInput=null;
-		return;
-		}
-	window.ColorPicker_targetInput = inputobj;
-	this.show(linkname);
-	}
-
-// This function runs when you move your mouse over a color block, if you have a newer browser
-function ColorPicker_highlightColor(c) {
-	var thedoc = (arguments.length>1)?arguments[1]:window.document;
-	var d = thedoc.getElementById("colorPickerSelectedColor");
-	d.style.backgroundColor = c;
-	d = thedoc.getElementById("colorPickerSelectedColorValue");
-	d.innerHTML = c;
-	}
-
-function ColorPicker() {
-	var windowMode = false;
-	// Create a new PopupWindow object
-	if (arguments.length==0) {
-		var divname = "colorPickerDiv";
-		}
-	else if (arguments[0] == "window") {
-		var divname = '';
-		windowMode = true;
-		}
-	else {
-		var divname = arguments[0];
-		}
-
-	if (divname != "") {
-		var cp = new PopupWindow(divname);
-		}
-	else {
-		var cp = new PopupWindow();
-		cp.setSize(225,250);
-		}
-
-	// Object variables
-	cp.currentValue = "#FFFFFF";
-
-	// Method Mappings
-	cp.writeDiv = ColorPicker_writeDiv;
-	cp.highlightColor = ColorPicker_highlightColor;
-	cp.show = ColorPicker_show;
-	cp.select = ColorPicker_select;
-
-	// Code to populate color picker window
-	var colors = new Array(	"#4180B6","#69AEE7","#000000","#000033","#000066","#000099","#0000CC","#0000FF","#330000","#330033","#330066","#330099",
-							"#3300CC","#3300FF","#660000","#660033","#660066","#660099","#6600CC","#6600FF","#990000","#990033","#990066","#990099",
-							"#9900CC","#9900FF","#CC0000","#CC0033","#CC0066","#CC0099","#CC00CC","#CC00FF","#FF0000","#FF0033","#FF0066","#FF0099",
-							"#FF00CC","#FF00FF","#7FFFFF","#7FFFFF","#7FF7F7","#7FEFEF","#7FE7E7","#7FDFDF","#7FD7D7","#7FCFCF","#7FC7C7","#7FBFBF",
-							"#7FB7B7","#7FAFAF","#7FA7A7","#7F9F9F","#7F9797","#7F8F8F","#7F8787","#7F7F7F","#7F7777","#7F6F6F","#7F6767","#7F5F5F",
-							"#7F5757","#7F4F4F","#7F4747","#7F3F3F","#7F3737","#7F2F2F","#7F2727","#7F1F1F","#7F1717","#7F0F0F","#7F0707","#7F0000",
-
-							"#4180B6","#69AEE7","#003300","#003333","#003366","#003399","#0033CC","#0033FF","#333300","#333333","#333366","#333399",
-							"#3333CC","#3333FF","#663300","#663333","#663366","#663399","#6633CC","#6633FF","#993300","#993333","#993366","#993399",
-							"#9933CC","#9933FF","#CC3300","#CC3333","#CC3366","#CC3399","#CC33CC","#CC33FF","#FF3300","#FF3333","#FF3366","#FF3399",
-							"#FF33CC","#FF33FF","#FF7FFF","#FF7FFF","#F77FF7","#EF7FEF","#E77FE7","#DF7FDF","#D77FD7","#CF7FCF","#C77FC7","#BF7FBF",
-							"#B77FB7","#AF7FAF","#A77FA7","#9F7F9F","#977F97","#8F7F8F","#877F87","#7F7F7F","#777F77","#6F7F6F","#677F67","#5F7F5F",
-							"#577F57","#4F7F4F","#477F47","#3F7F3F","#377F37","#2F7F2F","#277F27","#1F7F1F","#177F17","#0F7F0F","#077F07","#007F00",
-
-							"#4180B6","#69AEE7","#006600","#006633","#006666","#006699","#0066CC","#0066FF","#336600","#336633","#336666","#336699",
-							"#3366CC","#3366FF","#666600","#666633","#666666","#666699","#6666CC","#6666FF","#996600","#996633","#996666","#996699",
-							"#9966CC","#9966FF","#CC6600","#CC6633","#CC6666","#CC6699","#CC66CC","#CC66FF","#FF6600","#FF6633","#FF6666","#FF6699",
-							"#FF66CC","#FF66FF","#FFFF7F","#FFFF7F","#F7F77F","#EFEF7F","#E7E77F","#DFDF7F","#D7D77F","#CFCF7F","#C7C77F","#BFBF7F",
-							"#B7B77F","#AFAF7F","#A7A77F","#9F9F7F","#97977F","#8F8F7F","#87877F","#7F7F7F","#77777F","#6F6F7F","#67677F","#5F5F7F",
-							"#57577F","#4F4F7F","#47477F","#3F3F7F","#37377F","#2F2F7F","#27277F","#1F1F7F","#17177F","#0F0F7F","#07077F","#00007F",
-
-							"#4180B6","#69AEE7","#009900","#009933","#009966","#009999","#0099CC","#0099FF","#339900","#339933","#339966","#339999",
-							"#3399CC","#3399FF","#669900","#669933","#669966","#669999","#6699CC","#6699FF","#999900","#999933","#999966","#999999",
-							"#9999CC","#9999FF","#CC9900","#CC9933","#CC9966","#CC9999","#CC99CC","#CC99FF","#FF9900","#FF9933","#FF9966","#FF9999",
-							"#FF99CC","#FF99FF","#3FFFFF","#3FFFFF","#3FF7F7","#3FEFEF","#3FE7E7","#3FDFDF","#3FD7D7","#3FCFCF","#3FC7C7","#3FBFBF",
-							"#3FB7B7","#3FAFAF","#3FA7A7","#3F9F9F","#3F9797","#3F8F8F","#3F8787","#3F7F7F","#3F7777","#3F6F6F","#3F6767","#3F5F5F",
-							"#3F5757","#3F4F4F","#3F4747","#3F3F3F","#3F3737","#3F2F2F","#3F2727","#3F1F1F","#3F1717","#3F0F0F","#3F0707","#3F0000",
-
-							"#4180B6","#69AEE7","#00CC00","#00CC33","#00CC66","#00CC99","#00CCCC","#00CCFF","#33CC00","#33CC33","#33CC66","#33CC99",
-							"#33CCCC","#33CCFF","#66CC00","#66CC33","#66CC66","#66CC99","#66CCCC","#66CCFF","#99CC00","#99CC33","#99CC66","#99CC99",
-							"#99CCCC","#99CCFF","#CCCC00","#CCCC33","#CCCC66","#CCCC99","#CCCCCC","#CCCCFF","#FFCC00","#FFCC33","#FFCC66","#FFCC99",
-							"#FFCCCC","#FFCCFF","#FF3FFF","#FF3FFF","#F73FF7","#EF3FEF","#E73FE7","#DF3FDF","#D73FD7","#CF3FCF","#C73FC7","#BF3FBF",
-							"#B73FB7","#AF3FAF","#A73FA7","#9F3F9F","#973F97","#8F3F8F","#873F87","#7F3F7F","#773F77","#6F3F6F","#673F67","#5F3F5F",
-							"#573F57","#4F3F4F","#473F47","#3F3F3F","#373F37","#2F3F2F","#273F27","#1F3F1F","#173F17","#0F3F0F","#073F07","#003F00",
-
-							"#4180B6","#69AEE7","#00FF00","#00FF33","#00FF66","#00FF99","#00FFCC","#00FFFF","#33FF00","#33FF33","#33FF66","#33FF99",
-							"#33FFCC","#33FFFF","#66FF00","#66FF33","#66FF66","#66FF99","#66FFCC","#66FFFF","#99FF00","#99FF33","#99FF66","#99FF99",
-							"#99FFCC","#99FFFF","#CCFF00","#CCFF33","#CCFF66","#CCFF99","#CCFFCC","#CCFFFF","#FFFF00","#FFFF33","#FFFF66","#FFFF99",
-							"#FFFFCC","#FFFFFF","#FFFF3F","#FFFF3F","#F7F73F","#EFEF3F","#E7E73F","#DFDF3F","#D7D73F","#CFCF3F","#C7C73F","#BFBF3F",
-							"#B7B73F","#AFAF3F","#A7A73F","#9F9F3F","#97973F","#8F8F3F","#87873F","#7F7F3F","#77773F","#6F6F3F","#67673F","#5F5F3F",
-							"#57573F","#4F4F3F","#47473F","#3F3F3F","#37373F","#2F2F3F","#27273F","#1F1F3F","#17173F","#0F0F3F","#07073F","#00003F",
-
-							"#4180B6","#69AEE7","#FFFFFF","#FFEEEE","#FFDDDD","#FFCCCC","#FFBBBB","#FFAAAA","#FF9999","#FF8888","#FF7777","#FF6666",
-							"#FF5555","#FF4444","#FF3333","#FF2222","#FF1111","#FF0000","#FF0000","#FF0000","#FF0000","#EE0000","#DD0000","#CC0000",
-							"#BB0000","#AA0000","#990000","#880000","#770000","#660000","#550000","#440000","#330000","#220000","#110000","#000000",
-							"#000000","#000000","#000000","#001111","#002222","#003333","#004444","#005555","#006666","#007777","#008888","#009999",
-							"#00AAAA","#00BBBB","#00CCCC","#00DDDD","#00EEEE","#00FFFF","#00FFFF","#00FFFF","#00FFFF","#11FFFF","#22FFFF","#33FFFF",
-							"#44FFFF","#55FFFF","#66FFFF","#77FFFF","#88FFFF","#99FFFF","#AAFFFF","#BBFFFF","#CCFFFF","#DDFFFF","#EEFFFF","#FFFFFF",
-
-							"#4180B6","#69AEE7","#FFFFFF","#EEFFEE","#DDFFDD","#CCFFCC","#BBFFBB","#AAFFAA","#99FF99","#88FF88","#77FF77","#66FF66",
-							"#55FF55","#44FF44","#33FF33","#22FF22","#11FF11","#00FF00","#00FF00","#00FF00","#00FF00","#00EE00","#00DD00","#00CC00",
-							"#00BB00","#00AA00","#009900","#008800","#007700","#006600","#005500","#004400","#003300","#002200","#001100","#000000",
-							"#000000","#000000","#000000","#110011","#220022","#330033","#440044","#550055","#660066","#770077","#880088","#990099",
-							"#AA00AA","#BB00BB","#CC00CC","#DD00DD","#EE00EE","#FF00FF","#FF00FF","#FF00FF","#FF00FF","#FF11FF","#FF22FF","#FF33FF",
-							"#FF44FF","#FF55FF","#FF66FF","#FF77FF","#FF88FF","#FF99FF","#FFAAFF","#FFBBFF","#FFCCFF","#FFDDFF","#FFEEFF","#FFFFFF",
-
-							"#4180B6","#69AEE7","#FFFFFF","#EEEEFF","#DDDDFF","#CCCCFF","#BBBBFF","#AAAAFF","#9999FF","#8888FF","#7777FF","#6666FF",
-							"#5555FF","#4444FF","#3333FF","#2222FF","#1111FF","#0000FF","#0000FF","#0000FF","#0000FF","#0000EE","#0000DD","#0000CC",
-							"#0000BB","#0000AA","#000099","#000088","#000077","#000066","#000055","#000044","#000033","#000022","#000011","#000000",
-							"#000000","#000000","#000000","#111100","#222200","#333300","#444400","#555500","#666600","#777700","#888800","#999900",
-							"#AAAA00","#BBBB00","#CCCC00","#DDDD00","#EEEE00","#FFFF00","#FFFF00","#FFFF00","#FFFF00","#FFFF11","#FFFF22","#FFFF33",
-							"#FFFF44","#FFFF55","#FFFF66","#FFFF77","#FFFF88","#FFFF99","#FFFFAA","#FFFFBB","#FFFFCC","#FFFFDD","#FFFFEE","#FFFFFF",
-
-							"#4180B6","#69AEE7","#FFFFFF","#FFFFFF","#FBFBFB","#F7F7F7","#F3F3F3","#EFEFEF","#EBEBEB","#E7E7E7","#E3E3E3","#DFDFDF",
-							"#DBDBDB","#D7D7D7","#D3D3D3","#CFCFCF","#CBCBCB","#C7C7C7","#C3C3C3","#BFBFBF","#BBBBBB","#B7B7B7","#B3B3B3","#AFAFAF",
-							"#ABABAB","#A7A7A7","#A3A3A3","#9F9F9F","#9B9B9B","#979797","#939393","#8F8F8F","#8B8B8B","#878787","#838383","#7F7F7F",
-							"#7B7B7B","#777777","#737373","#6F6F6F","#6B6B6B","#676767","#636363","#5F5F5F","#5B5B5B","#575757","#535353","#4F4F4F",
-							"#4B4B4B","#474747","#434343","#3F3F3F","#3B3B3B","#373737","#333333","#2F2F2F","#2B2B2B","#272727","#232323","#1F1F1F",
-							"#1B1B1B","#171717","#131313","#0F0F0F","#0B0B0B","#070707","#030303","#000000","#000000","#000000","#000000","#000000");
-	var total = colors.length;
-	var width = 72;
-	var cp_contents = "";
-	var windowRef = (windowMode)?"window.opener.":"";
-	if (windowMode) {
-		cp_contents += "<html><head><title>Select Color</title></head>";
-		cp_contents += "<body marginwidth=0 marginheight=0 leftmargin=0 topmargin=0><span style='text-align: center;'>";
-		}
-	cp_contents += "<table style='border: none;' cellspacing=0 cellpadding=0>";
-	var use_highlight = (document.getElementById || document.all)?true:false;
-	for (var i=0; i<total; i++) {
-		if ((i % width) == 0) { cp_contents += "<tr>"; }
-		if (use_highlight) { var mo = 'onMouseOver="'+windowRef+'ColorPicker_highlightColor(\''+colors[i]+'\',window.document)"'; }
-		else { mo = ""; }
-		cp_contents += '<td style="background-color: '+colors[i]+';"><a href="javascript:void()" onclick="'+windowRef+'ColorPicker_pickColor(\''+colors[i]+'\','+windowRef+'window.popupWindowObjects['+cp.index+']);return false;" '+mo+'>&nbsp;</a></td>';
-		if ( ((i+1)>=total) || (((i+1) % width) == 0)) { 
-			cp_contents += "</tr>";
-			}
-		}
-	// If the browser supports dynamically changing TD cells, add the fancy stuff
-	if (document.getElementById) {
-		var width1 = Math.floor(width/2);
-		var width2 = width = width1;
-		cp_contents += "<tr><td colspan='"+width1+"' style='background-color: #FFF;' ID='colorPickerSelectedColor'>&nbsp;</td><td colspan='"+width2+"' style='text-align: center;' id='colorPickerSelectedColorValue'>#FFFFFF</td></tr>";
-		}
-	cp_contents += "</table>";
-	if (windowMode) {
-		cp_contents += "</span></body></html>";
-		}
-	// end populate code
-
-	// Write the contents to the popup object
-	cp.populate(cp_contents+"\n");
-	// Move the table down a bit so you can see it
-	cp.offsetY = 25;
-	cp.autoHide();
-	return cp;
-	}
diff -uNr a/mp-wp/wp-includes/js/comment-reply.js b/mp-wp/wp-includes/js/comment-reply.js
--- a/mp-wp/wp-includes/js/comment-reply.js e1a4268ed180ac629186d81a8332654ee1fd8c00607bed755e0fed3efd23c512329add23e16c6a12d5b23b1d66f6370d7dfbbfe5b482a872c0fe9dfcdc203c20
+++ b/mp-wp/wp-includes/js/comment-reply.js false
@@ -1,48 +0,0 @@
-
-addComment = {
-	moveForm : function(commId, parentId, respondId, postId) {
-		var t = this, div, comm = t.I(commId), respond = t.I(respondId), cancel = t.I('cancel-comment-reply-link'), parent = t.I('comment_parent'), post = t.I('comment_post_ID');
-
-		if ( ! comm || ! respond || ! cancel || ! parent )
-			return;
-
-		t.respondId = respondId;
-		postId = postId || false;
-
-		if ( ! t.I('wp-temp-form-div') ) {
-			div = document.createElement('div');
-			div.id = 'wp-temp-form-div';
-			div.style.display = 'none';
-			respond.parentNode.insertBefore(div, respond);
-		}
-
-		comm.parentNode.insertBefore(respond, comm.nextSibling);
-		if ( post && postId )
-			post.value = postId;
-		parent.value = parentId;
-		cancel.style.display = '';
-
-		cancel.onclick = function() {
-			var t = addComment, temp = t.I('wp-temp-form-div'), respond = t.I(t.respondId);
-
-			if ( ! temp || ! respond )
-				return;
-
-			t.I('comment_parent').value = '0';
-			temp.parentNode.insertBefore(respond, temp);
-			temp.parentNode.removeChild(temp);
-			this.style.display = 'none';
-			this.onclick = null;
-			return false;
-		}
-
-		try { t.I('comment').focus(); }
-		catch(e) {}
-
-		return false;
-	},
-
-	I : function(e) {
-		return document.getElementById(e);
-	}
-}
diff -uNr a/mp-wp/wp-includes/js/crop/cropper.css b/mp-wp/wp-includes/js/crop/cropper.css
--- a/mp-wp/wp-includes/js/crop/cropper.css 8899dfa41ea6c163540020b02c27a6b9fd5db2719b9d122771b3e1e433faa1df5b9698dad13062a8df4b6b41e24c5fe254035a2ae0d86d0891e4af4d7fdd183e
+++ b/mp-wp/wp-includes/js/crop/cropper.css false
@@ -1,165 +0,0 @@
-.imgCrop_wrap {
-	/* width: 500px;   @done_in_js */
-	/* height: 375px;  @done_in_js */
-	position: relative;
-	cursor: crosshair;
-}
-
-/* an extra classname is applied for Opera < 9.0 to fix it's lack of opacity support */
-.imgCrop_wrap.opera8 .imgCrop_overlay,
-.imgCrop_wrap.opera8 .imgCrop_clickArea { 
-	background-color: transparent;
-}
-
-/* fix for IE displaying all boxes at line-height by default, although they are still 1 pixel high until we combine them with the pointless span */
-.imgCrop_wrap,
-.imgCrop_wrap * {
-	font-size: 0;
-}
-
-.imgCrop_overlay {
-	background-color: #000;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
-	position: absolute;
-	width: 100%;
-	height: 100%;
-}
-
-.imgCrop_selArea {
-	position: absolute;
-	/* @done_in_js 
-	top: 20px;
-	left: 20px;
-	width: 200px;
-	height: 200px;
-	background: transparent url(castle.jpg) no-repeat  -210px -110px;
-	*/
-	cursor: move;
-	z-index: 2;
-}
-
-/* clickArea is all a fix for IE 5.5 & 6 to allow the user to click on the given area */
-.imgCrop_clickArea {
-	width: 100%;
-	height: 100%;
-	background-color: #FFF;
-	opacity: 0.01;
-	filter:alpha(opacity=01);
-}
-
-.imgCrop_marqueeHoriz {
-	position: absolute;
-	width: 100%;
-	height: 1px;
-	background: transparent url(marqueeHoriz.svg) repeat-x 0 0;
-	z-index: 3;
-}
-
-.imgCrop_marqueeVert {
-	position: absolute;
-	height: 100%;
-	width: 1px;
-	background: transparent url(marqueeVert.svg) repeat-y 0 0;
-	z-index: 3;
-}
-
-.imgCrop_marqueeNorth { top: 0; left: 0; }
-.imgCrop_marqueeEast  { top: 0; right: 0; }
-.imgCrop_marqueeSouth { bottom: 0px; left: 0; }
-.imgCrop_marqueeWest  { top: 0; left: 0; }
-
-
-.imgCrop_handle {
-	position: absolute;
-	border: 1px solid #333;
-	width: 6px;
-	height: 6px;
-	background: #FFF;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
-	z-index: 4;
-}
-
-/* fix IE 5 box model */
-* html .imgCrop_handle {
-	width: 8px;
-	height: 8px;
-	wid\th: 6px;
-	hei\ght: 6px;
-}
-
-.imgCrop_handleN {
-	top: -3px;
-	left: 0;
-	/* margin-left: 49%;    @done_in_js */
-	cursor: n-resize;
-}
-
-.imgCrop_handleNE { 
-	top: -3px;
-	right: -3px;
-	cursor: ne-resize;
-}
-
-.imgCrop_handleE {
-	top: 0;
-	right: -3px;
-	/* margin-top: 49%;    @done_in_js */
-	cursor: e-resize;
-}
-
-.imgCrop_handleSE {
-	right: -3px;
-	bottom: -3px;
-	cursor: se-resize;
-}
-
-.imgCrop_handleS {
-	right: 0;
-	bottom: -3px;
-	/* margin-right: 49%; @done_in_js */
-	cursor: s-resize;
-}
-
-.imgCrop_handleSW {
-	left: -3px;
-	bottom: -3px;
-	cursor: sw-resize;
-}
-
-.imgCrop_handleW {
-	top: 0;
-	left: -3px;
-	/* margin-top: 49%;  @done_in_js */
-	cursor: e-resize;
-}
-
-.imgCrop_handleNW {
-	top: -3px;
-	left: -3px;
-	cursor: nw-resize;
-}
-
-/**
- * Create an area to click & drag around on as the default browser behaviour is to let you drag the image 
- */
-.imgCrop_dragArea {
-	width: 100%;
-	height: 100%;
-	z-index: 200;
-	position: absolute;
-	top: 0;
-	left: 0;
-}
-
-.imgCrop_previewWrap {
-	/* width: 200px;  @done_in_js */
-	/* height: 200px; @done_in_js */
-	overflow: hidden;
-	position: relative;
-}
-
-.imgCrop_previewWrap img {
-	position: absolute;
-}
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/crop/cropper.js b/mp-wp/wp-includes/js/crop/cropper.js
--- a/mp-wp/wp-includes/js/crop/cropper.js 2bf793302337c1fd67aea0247024ac417b08296bd55f6d3f1d2b1850fbaa4648adda2c4b2b299469e909e3c44b146bed46d0f5ec18041b36055915896288b82b
+++ b/mp-wp/wp-includes/js/crop/cropper.js false
@@ -1,516 +0,0 @@
-/**
- * Copyright (c) 2006, David Spurr (http://www.defusion.org.uk/)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- *     * Neither the name of the David Spurr nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://www.opensource.org/licenses/bsd-license.php
- *
- * See scriptaculous.js for full scriptaculous licence
- */
-
-var CropDraggable=Class.create();
-Object.extend(Object.extend(CropDraggable.prototype,Draggable.prototype),{initialize:function(_1){
-this.options=Object.extend({drawMethod:function(){
-}},arguments[1]||{});
-this.element=$(_1);
-this.handle=this.element;
-this.delta=this.currentDelta();
-this.dragging=false;
-this.eventMouseDown=this.initDrag.bindAsEventListener(this);
-Event.observe(this.handle,"mousedown",this.eventMouseDown);
-Draggables.register(this);
-},draw:function(_2){
-var _3=Position.cumulativeOffset(this.element);
-var d=this.currentDelta();
-_3[0]-=d[0];
-_3[1]-=d[1];
-var p=[0,1].map(function(i){
-return (_2[i]-_3[i]-this.offset[i]);
-}.bind(this));
-this.options.drawMethod(p);
-}});
-var Cropper={};
-Cropper.Img=Class.create();
-Cropper.Img.prototype={initialize:function(_7,_8){
-this.options=Object.extend({ratioDim:{x:0,y:0},minWidth:0,minHeight:0,displayOnInit:false,onEndCrop:Prototype.emptyFunction,captureKeys:true},_8||{});
-if(this.options.minWidth>0&&this.options.minHeight>0){
-this.options.ratioDim.x=this.options.minWidth;
-this.options.ratioDim.y=this.options.minHeight;
-}
-this.img=$(_7);
-this.clickCoords={x:0,y:0};
-this.dragging=false;
-this.resizing=false;
-this.isWebKit=/Konqueror|Safari|KHTML/.test(navigator.userAgent);
-this.isIE=/MSIE/.test(navigator.userAgent);
-this.isOpera8=/Opera\s[1-8]/.test(navigator.userAgent);
-this.ratioX=0;
-this.ratioY=0;
-this.attached=false;
-$A(document.getElementsByTagName("script")).each(function(s){
-if(s.src.match(/cropper\.js/)){
-var _a=s.src.replace(/cropper\.js(.*)?/,"");
-var _b=document.createElement("link");
-_b.rel="stylesheet";
-_b.type="text/css";
-_b.href=_a+"cropper.css";
-_b.media="screen";
-document.getElementsByTagName("head")[0].appendChild(_b);
-}
-});
-if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){
-var _c=this.getGCD(this.options.ratioDim.x,this.options.ratioDim.y);
-this.ratioX=this.options.ratioDim.x/_c;
-this.ratioY=this.options.ratioDim.y/_c;
-}
-this.subInitialize();
-if(this.img.complete||this.isWebKit){
-this.onLoad();
-}else{
-Event.observe(this.img,"load",this.onLoad.bindAsEventListener(this));
-}
-},getGCD:function(a,b){return 1;
-if(b==0){
-return a;
-}
-return this.getGCD(b,a%b);
-},onLoad:function(){
-var _f="imgCrop_";
-var _10=this.img.parentNode;
-var _11="";
-if(this.isOpera8){
-_11=" opera8";
-}
-this.imgWrap=Builder.node("div",{"class":_f+"wrap"+_11});
-if(this.isIE){
-this.north=Builder.node("div",{"class":_f+"overlay "+_f+"north"},[Builder.node("span")]);
-this.east=Builder.node("div",{"class":_f+"overlay "+_f+"east"},[Builder.node("span")]);
-this.south=Builder.node("div",{"class":_f+"overlay "+_f+"south"},[Builder.node("span")]);
-this.west=Builder.node("div",{"class":_f+"overlay "+_f+"west"},[Builder.node("span")]);
-var _12=[this.north,this.east,this.south,this.west];
-}else{
-this.overlay=Builder.node("div",{"class":_f+"overlay"});
-var _12=[this.overlay];
-}
-this.dragArea=Builder.node("div",{"class":_f+"dragArea"},_12);
-this.handleN=Builder.node("div",{"class":_f+"handle "+_f+"handleN"});
-this.handleNE=Builder.node("div",{"class":_f+"handle "+_f+"handleNE"});
-this.handleE=Builder.node("div",{"class":_f+"handle "+_f+"handleE"});
-this.handleSE=Builder.node("div",{"class":_f+"handle "+_f+"handleSE"});
-this.handleS=Builder.node("div",{"class":_f+"handle "+_f+"handleS"});
-this.handleSW=Builder.node("div",{"class":_f+"handle "+_f+"handleSW"});
-this.handleW=Builder.node("div",{"class":_f+"handle "+_f+"handleW"});
-this.handleNW=Builder.node("div",{"class":_f+"handle "+_f+"handleNW"});
-this.selArea=Builder.node("div",{"class":_f+"selArea"},[Builder.node("div",{"class":_f+"marqueeHoriz "+_f+"marqueeNorth"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeVert "+_f+"marqueeEast"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeHoriz "+_f+"marqueeSouth"},[Builder.node("span")]),Builder.node("div",{"class":_f+"marqueeVert "+_f+"marqueeWest"},[Builder.node("span")]),this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW,Builder.node("div",{"class":_f+"clickArea"})]);
-Element.setStyle($(this.selArea),{backgroundColor:"transparent",backgroundRepeat:"no-repeat",backgroundPosition:"0 0"});
-this.imgWrap.appendChild(this.img);
-this.imgWrap.appendChild(this.dragArea);
-this.dragArea.appendChild(this.selArea);
-this.dragArea.appendChild(Builder.node("div",{"class":_f+"clickArea"}));
-_10.appendChild(this.imgWrap);
-Event.observe(this.dragArea,"mousedown",this.startDrag.bindAsEventListener(this));
-Event.observe(document,"mousemove",this.onDrag.bindAsEventListener(this));
-Event.observe(document,"mouseup",this.endCrop.bindAsEventListener(this));
-var _13=[this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW];
-for(var i=0;i<_13.length;i++){
-Event.observe(_13[i],"mousedown",this.startResize.bindAsEventListener(this));
-}
-if(this.options.captureKeys){
-Event.observe(document,"keydown",this.handleKeys.bindAsEventListener(this));
-}
-new CropDraggable(this.selArea,{drawMethod:this.moveArea.bindAsEventListener(this)});
-this.setParams();
-},setParams:function(){
-this.imgW=this.img.width;
-this.imgH=this.img.height;
-if(!this.isIE){
-Element.setStyle($(this.overlay),{width:this.imgW+"px",height:this.imgH+"px"});
-Element.hide($(this.overlay));
-Element.setStyle($(this.selArea),{backgroundImage:"url("+this.img.src+")"});
-}else{
-Element.setStyle($(this.north),{height:0});
-Element.setStyle($(this.east),{width:0,height:0});
-Element.setStyle($(this.south),{height:0});
-Element.setStyle($(this.west),{width:0,height:0});
-}
-Element.setStyle($(this.imgWrap),{"width":this.imgW+"px","height":this.imgH+"px"});
-Element.hide($(this.selArea));
-var _15=Position.positionedOffset(this.imgWrap);
-this.wrapOffsets={"top":_15[1],"left":_15[0]};
-var _16={x1:0,y1:0,x2:0,y2:0};
-this.setAreaCoords(_16);
-if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0&&this.options.displayOnInit){
-_16.x1=Math.ceil((this.imgW-this.options.ratioDim.x)/2);
-_16.y1=Math.ceil((this.imgH-this.options.ratioDim.y)/2);
-_16.x2=_16.x1+this.options.ratioDim.x;
-_16.y2=_16.y1+this.options.ratioDim.y;
-Element.show(this.selArea);
-this.drawArea();
-this.endCrop();
-}
-this.attached=true;
-},remove:function(){
-this.attached=false;
-this.imgWrap.parentNode.insertBefore(this.img,this.imgWrap);
-this.imgWrap.parentNode.removeChild(this.imgWrap);
-Event.stopObserving(this.dragArea,"mousedown",this.startDrag.bindAsEventListener(this));
-Event.stopObserving(document,"mousemove",this.onDrag.bindAsEventListener(this));
-Event.stopObserving(document,"mouseup",this.endCrop.bindAsEventListener(this));
-var _17=[this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW];
-for(var i=0;i<_17.length;i++){
-Event.stopObserving(_17[i],"mousedown",this.startResize.bindAsEventListener(this));
-}
-if(this.options.captureKeys){
-Event.stopObserving(document,"keydown",this.handleKeys.bindAsEventListener(this));
-}
-},reset:function(){
-if(!this.attached){
-this.onLoad();
-}else{
-this.setParams();
-}
-this.endCrop();
-},handleKeys:function(e){
-var dir={x:0,y:0};
-if(!this.dragging){
-switch(e.keyCode){
-case (37):
-dir.x=-1;
-break;
-case (38):
-dir.y=-1;
-break;
-case (39):
-dir.x=1;
-break;
-case (40):
-dir.y=1;
-break;
-}
-if(dir.x!=0||dir.y!=0){
-if(e.shiftKey){
-dir.x*=10;
-dir.y*=10;
-}
-this.moveArea([this.areaCoords.x1+dir.x,this.areaCoords.y1+dir.y]);
-Event.stop(e);
-}
-}
-},calcW:function(){
-return (this.areaCoords.x2-this.areaCoords.x1);
-},calcH:function(){
-return (this.areaCoords.y2-this.areaCoords.y1);
-},moveArea:function(_1b){
-this.setAreaCoords({x1:_1b[0],y1:_1b[1],x2:_1b[0]+this.calcW(),y2:_1b[1]+this.calcH()},true);
-this.drawArea();
-},cloneCoords:function(_1c){
-return {x1:_1c.x1,y1:_1c.y1,x2:_1c.x2,y2:_1c.y2};
-},setAreaCoords:function(_1d,_1e,_1f,_20,_21){
-var _22=typeof _1e!="undefined"?_1e:false;
-var _23=typeof _1f!="undefined"?_1f:false;
-if(_1e){
-var _24=_1d.x2-_1d.x1;
-var _25=_1d.y2-_1d.y1;
-if(_1d.x1<0){
-_1d.x1=0;
-_1d.x2=_24;
-}
-if(_1d.y1<0){
-_1d.y1=0;
-_1d.y2=_25;
-}
-if(_1d.x2>this.imgW){
-_1d.x2=this.imgW;
-_1d.x1=this.imgW-_24;
-}
-if(_1d.y2>this.imgH){
-_1d.y2=this.imgH;
-_1d.y1=this.imgH-_25;
-}
-}else{
-if(_1d.x1<0){
-_1d.x1=0;
-}
-if(_1d.y1<0){
-_1d.y1=0;
-}
-if(_1d.x2>this.imgW){
-_1d.x2=this.imgW;
-}
-if(_1d.y2>this.imgH){
-_1d.y2=this.imgH;
-}
-if(typeof (_20)!="undefined"){
-if(this.ratioX>0){
-this.applyRatio(_1d,{x:this.ratioX,y:this.ratioY},_20,_21);
-}else{
-if(_23){
-this.applyRatio(_1d,{x:1,y:1},_20,_21);
-}
-}
-var _26={a1:_1d.x1,a2:_1d.x2};
-var _27={a1:_1d.y1,a2:_1d.y2};
-var _28=this.options.minWidth;
-var _29=this.options.minHeight;
-if((_28==0||_29==0)&&_23){
-if(_28>0){
-_29=_28;
-}else{
-if(_29>0){
-_28=_29;
-}
-}
-}
-this.applyMinDimension(_26,_28,_20.x,{min:0,max:this.imgW});
-this.applyMinDimension(_27,_29,_20.y,{min:0,max:this.imgH});
-_1d={x1:_26.a1,y1:_27.a1,x2:_26.a2,y2:_27.a2};
-}
-}
-this.areaCoords=_1d;
-},applyMinDimension:function(_2a,_2b,_2c,_2d){
-if((_2a.a2-_2a.a1)<_2b){
-if(_2c==1){
-_2a.a2=_2a.a1+_2b;
-}else{
-_2a.a1=_2a.a2-_2b;
-}
-if(_2a.a1<_2d.min){
-_2a.a1=_2d.min;
-_2a.a2=_2b;
-}else{
-if(_2a.a2>_2d.max){
-_2a.a1=_2d.max-_2b;
-_2a.a2=_2d.max;
-}
-}
-}
-},applyRatio:function(_2e,_2f,_30,_31){
-var _32;
-if(_31=="N"||_31=="S"){
-_32=this.applyRatioToAxis({a1:_2e.y1,b1:_2e.x1,a2:_2e.y2,b2:_2e.x2},{a:_2f.y,b:_2f.x},{a:_30.y,b:_30.x},{min:0,max:this.imgW});
-_2e.x1=_32.b1;
-_2e.y1=_32.a1;
-_2e.x2=_32.b2;
-_2e.y2=_32.a2;
-}else{
-_32=this.applyRatioToAxis({a1:_2e.x1,b1:_2e.y1,a2:_2e.x2,b2:_2e.y2},{a:_2f.x,b:_2f.y},{a:_30.x,b:_30.y},{min:0,max:this.imgH});
-_2e.x1=_32.a1;
-_2e.y1=_32.b1;
-_2e.x2=_32.a2;
-_2e.y2=_32.b2;
-}
-},applyRatioToAxis:function(_33,_34,_35,_36){
-var _37=Object.extend(_33,{});
-var _38=_37.a2-_37.a1;
-var _3a=Math.floor(_38*_34.b/_34.a);
-var _3b;
-var _3c;
-var _3d=null;
-if(_35.b==1){
-_3b=_37.b1+_3a;
-if(_3b>_36.max){
-_3b=_36.max;
-_3d=_3b-_37.b1;
-}
-_37.b2=_3b;
-}else{
-_3b=_37.b2-_3a;
-if(_3b<_36.min){
-_3b=_36.min;
-_3d=_3b+_37.b2;
-}
-_37.b1=_3b;
-}
-if(_3d!=null){
-_3c=Math.floor(_3d*_34.a/_34.b);
-if(_35.a==1){
-_37.a2=_37.a1+_3c;
-}else{
-_37.a1=_37.a1=_37.a2-_3c;
-}
-}
-return _37;
-},drawArea:function(){
-if(!this.isIE){
-Element.show($(this.overlay));
-}
-var _3e=this.calcW();
-var _3f=this.calcH();
-var _40=this.areaCoords.x2;
-var _41=this.areaCoords.y2;
-var _42=this.selArea.style;
-_42.left=this.areaCoords.x1+"px";
-_42.top=this.areaCoords.y1+"px";
-_42.width=_3e+"px";
-_42.height=_3f+"px";
-var _43=Math.ceil((_3e-6)/2)+"px";
-var _44=Math.ceil((_3f-6)/2)+"px";
-this.handleN.style.left=_43;
-this.handleE.style.top=_44;
-this.handleS.style.left=_43;
-this.handleW.style.top=_44;
-if(this.isIE){
-this.north.style.height=this.areaCoords.y1+"px";
-var _45=this.east.style;
-_45.top=this.areaCoords.y1+"px";
-_45.height=_3f+"px";
-_45.left=_40+"px";
-_45.width=(this.img.width-_40)+"px";
-var _46=this.south.style;
-_46.top=_41+"px";
-_46.height=(this.img.height-_41)+"px";
-var _47=this.west.style;
-_47.top=this.areaCoords.y1+"px";
-_47.height=_3f+"px";
-_47.width=this.areaCoords.x1+"px";
-}else{
-_42.backgroundPosition="-"+this.areaCoords.x1+"px "+"-"+this.areaCoords.y1+"px";
-}
-this.subDrawArea();
-this.forceReRender();
-},forceReRender:function(){
-if(this.isIE||this.isWebKit){
-var n=document.createTextNode(" ");
-var d,el,fixEL,i;
-if(this.isIE){
-fixEl=this.selArea;
-}else{
-if(this.isWebKit){
-fixEl=document.getElementsByClassName("imgCrop_marqueeSouth",this.imgWrap)[0];
-d=Builder.node("div","");
-d.style.visibility="hidden";
-var _4a=["SE","S","SW"];
-for(i=0;i<_4a.length;i++){
-el=document.getElementsByClassName("imgCrop_handle"+_4a[i],this.selArea)[0];
-if(el.childNodes.length){
-el.removeChild(el.childNodes[0]);
-}
-el.appendChild(d);
-}
-}
-}
-fixEl.appendChild(n);
-fixEl.removeChild(n);
-}
-},startResize:function(e){
-this.startCoords=this.cloneCoords(this.areaCoords);
-this.resizing=true;
-this.resizeHandle=Element.classNames(Event.element(e)).toString().replace(/([^N|NE|E|SE|S|SW|W|NW])+/,"");
-Event.stop(e);
-},startDrag:function(e){
-Element.show(this.selArea);
-this.clickCoords=this.getCurPos(e);
-this.setAreaCoords({x1:this.clickCoords.x,y1:this.clickCoords.y,x2:this.clickCoords.x,y2:this.clickCoords.y});
-this.dragging=true;
-this.onDrag(e);
-Event.stop(e);
-},getCurPos:function(e){
-return curPos={x:Event.pointerX(e)-this.wrapOffsets.left,y:Event.pointerY(e)-this.wrapOffsets.top};
-},onDrag:function(e){
-var _4f=null;
-if(this.dragging||this.resizing){
-var _50=this.getCurPos(e);
-var _51=this.cloneCoords(this.areaCoords);
-var _52={x:1,y:1};
-}
-if(this.dragging){
-if(_50.x<this.clickCoords.x){
-_52.x=-1;
-}
-if(_50.y<this.clickCoords.y){
-_52.y=-1;
-}
-this.transformCoords(_50.x,this.clickCoords.x,_51,"x");
-this.transformCoords(_50.y,this.clickCoords.y,_51,"y");
-}else{
-if(this.resizing){
-_4f=this.resizeHandle;
-if(_4f.match(/E/)){
-this.transformCoords(_50.x,this.startCoords.x1,_51,"x");
-if(_50.x<this.startCoords.x1){
-_52.x=-1;
-}
-}else{
-if(_4f.match(/W/)){
-this.transformCoords(_50.x,this.startCoords.x2,_51,"x");
-if(_50.x<this.startCoords.x2){
-_52.x=-1;
-}
-}
-}
-if(_4f.match(/N/)){
-this.transformCoords(_50.y,this.startCoords.y2,_51,"y");
-if(_50.y<this.startCoords.y2){
-_52.y=-1;
-}
-}else{
-if(_4f.match(/S/)){
-this.transformCoords(_50.y,this.startCoords.y1,_51,"y");
-if(_50.y<this.startCoords.y1){
-_52.y=-1;
-}
-}
-}
-}
-}
-if(this.dragging||this.resizing){
-this.setAreaCoords(_51,false,e.shiftKey,_52,_4f);
-this.drawArea();
-Event.stop(e);
-}
-},transformCoords:function(_53,_54,_55,_56){
-var _57=new Array();
-if(_53<_54){
-_57[0]=_53;
-_57[1]=_54;
-}else{
-_57[0]=_54;
-_57[1]=_53;
-}
-if(_56=="x"){
-_55.x1=_57[0];
-_55.x2=_57[1];
-}else{
-_55.y1=_57[0];
-_55.y2=_57[1];
-}
-},endCrop:function(){
-this.dragging=false;
-this.resizing=false;
-this.options.onEndCrop(this.areaCoords,{width:this.calcW(),height:this.calcH()});
-},subInitialize:function(){
-},subDrawArea:function(){
-}};
-Cropper.ImgWithPreview=Class.create();
-Object.extend(Object.extend(Cropper.ImgWithPreview.prototype,Cropper.Img.prototype),{subInitialize:function(){
-this.hasPreviewImg=false;
-if(typeof (this.options.previewWrap)!="undefined"&&this.options.minWidth>0&&this.options.minHeight>0){
-this.previewWrap=$(this.options.previewWrap);
-this.previewImg=this.img.cloneNode(false);
-this.options.displayOnInit=true;
-this.hasPreviewImg=true;
-Element.addClassName(this.previewWrap,"imgCrop_previewWrap");
-Element.setStyle(this.previewWrap,{width:this.options.minWidth+"px",height:this.options.minHeight+"px"});
-this.previewWrap.appendChild(this.previewImg);
-}
-},subDrawArea:function(){
-if(this.hasPreviewImg){
-var _58=this.calcW();
-var _59=this.calcH();
-var _5a={x:this.imgW/_58,y:this.imgH/_59};
-var _5b={x:_58/this.options.minWidth,y:_59/this.options.minHeight};
-var _5c={w:Math.ceil(this.options.minWidth*_5a.x)+"px",h:Math.ceil(this.options.minHeight*_5a.y)+"px",x:"-"+Math.ceil(this.areaCoords.x1/_5b.x)+"px",y:"-"+Math.ceil(this.areaCoords.y1/_5b.y)+"px"};
-var _5d=this.previewImg.style;
-_5d.width=_5c.w;
-_5d.height=_5c.h;
-_5d.left=_5c.x;
-_5d.top=_5c.y;
-}
-}});
diff -uNr a/mp-wp/wp-includes/js/crop/marqueeHoriz.svg b/mp-wp/wp-includes/js/crop/marqueeHoriz.svg
--- a/mp-wp/wp-includes/js/crop/marqueeHoriz.svg 230235ba4c5f9f80f286c3b2426a0b478b0f5e4959786921b46db2a9800d3abe640895348cd6913310c08e94fee1bed235cb17f7502dfceab09fc99ddb6fa037
+++ b/mp-wp/wp-includes/js/crop/marqueeHoriz.svg false
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="1px" viewBox="0 0 32 1" enable-background="new 0 0 32 1" xml:space="preserve">  <image id="image0" width="32" height="1" x="0" y="0"
-    xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAABAgAAAADQUesaAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
-AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAzOEcogAAAAHdElN
-RQfiARUSKSnUqe6tAAAADElEQVQI12NgWAWBAAqpAqkpWKzyAAAAJXRFWHRkYXRlOmNyZWF0ZQAy
-MDE4LTAxLTIxVDE4OjQxOjQxLTA3OjAwnygMjAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wMS0y
-MVQxODo0MTo0MS0wNzowMO51tDAAAAAASUVORK5CYII=" />
-</svg>
diff -uNr a/mp-wp/wp-includes/js/crop/marqueeVert.svg b/mp-wp/wp-includes/js/crop/marqueeVert.svg
--- a/mp-wp/wp-includes/js/crop/marqueeVert.svg c21d5f910be7f149a6e40c83574fee7f70b66bfc63c02f804e0f0cde42b7d254a600c170d657195c796e3ca27b7e65f27f6c14e81b67e66f0ac01590aed53643
+++ b/mp-wp/wp-includes/js/crop/marqueeVert.svg false
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1px" height="40px" viewBox="0 0 1 40" enable-background="new 0 0 1 40" xml:space="preserve">  <image id="image0" width="1" height="40" x="0" y="0"
-    xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAoAgAAAABQbdcKAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
-AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAzOEcogAAAAHdElN
-RQfiARUSOgNu/WbpAAAAEElEQVQI12NggIIGKKSQDwBoXwoBgwwusgAAACV0RVh0ZGF0ZTpjcmVh
-dGUAMjAxOC0wMS0yMVQxODo1ODowMy0wNzowMLFm51UAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgt
-MDEtMjFUMTg6NTg6MDMtMDc6MDDAO1/pAAAAAElFTkSuQmCC" />
-</svg>
-
diff -uNr a/mp-wp/wp-includes/js/hoverIntent.js b/mp-wp/wp-includes/js/hoverIntent.js
--- a/mp-wp/wp-includes/js/hoverIntent.js eb320c34c6b4c630a27566249d5a81f6ee91e9d5a59f350a60e638bd41209ad2d931b57dd3902664ffb12074e771e60b99c10e53ad953ea541158b1fa51a9b08
+++ b/mp-wp/wp-includes/js/hoverIntent.js false
@@ -1,128 +0,0 @@
-/**
-* hoverIntent is similar to jQuery's built-in "hover" function except that
-* instead of firing the onMouseOver event immediately, hoverIntent checks
-* to see if the user's mouse has slowed down (beneath the sensitivity
-* threshold) before firing the onMouseOver event.
-* 
-* hoverIntent r5 // 2007.03.27 // jQuery 1.1.2+
-* <http://cherne.net/brian/resources/jquery.hoverIntent.html>
-* 
-* hoverIntent is currently available for use in all personal or commercial 
-* projects under both MIT and GPL licenses. This means that you can choose 
-* the license that best suits your project, and use it accordingly.
-* 
-* // basic usage (just like .hover) receives onMouseOver and onMouseOut functions
-* $("ul li").hoverIntent( showNav , hideNav );
-* 
-* // advanced usage receives configuration object only
-* $("ul li").hoverIntent({
-*	sensitivity: 7, // number = sensitivity threshold (must be 1 or higher)
-*	interval: 100,   // number = milliseconds of polling interval
-*	over: showNav,  // function = onMouseOver callback (required)
-*	timeout: 0,   // number = milliseconds delay before onMouseOut function call
-*	out: hideNav    // function = onMouseOut callback (required)
-* });
-* 
-* @param  f  onMouseOver function || An object with configuration options
-* @param  g  onMouseOut function  || Nothing (use configuration options object)
-* @author    Brian Cherne <brian@cherne.net>
-*/
-(function($) {
-	$.fn.hoverIntent = function(f,g) {
-		// default configuration options
-		var cfg = {
-			sensitivity: 7,
-			interval: 100,
-			timeout: 0
-		};
-		// override configuration options with user supplied object
-		cfg = $.extend(cfg, g ? { over: f, out: g } : f );
-
-		// instantiate variables
-		// cX, cY = current X and Y position of mouse, updated by mousemove event
-		// pX, pY = previous X and Y position of mouse, set by mouseover and polling interval
-		var cX, cY, pX, pY;
-
-		// A private function for getting mouse position
-		var track = function(ev) {
-			cX = ev.pageX;
-			cY = ev.pageY;
-		};
-
-		// A private function for comparing current and previous mouse position
-		var compare = function(ev,ob) {
-			ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
-			// compare mouse positions to see if they've crossed the threshold
-			if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) {
-				$(ob).unbind("mousemove",track);
-				// set hoverIntent state to true (so mouseOut can be called)
-				ob.hoverIntent_s = 1;
-				return cfg.over.apply(ob,[ev]);
-			} else {
-				// set previous coordinates for next time
-				pX = cX; pY = cY;
-				// use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs)
-				ob.hoverIntent_t = setTimeout( function(){compare(ev, ob);} , cfg.interval );
-			}
-		};
-
-		// A private function for delaying the mouseOut function
-		var delay = function(ev,ob) {
-			ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
-			ob.hoverIntent_s = 0;
-			return cfg.out.apply(ob,[ev]);
-		};
-		
-		// workaround for Mozilla bug: not firing mouseout/mouseleave on absolute positioned elements over textareas and input type="text"
-		var handleHover = function(e) {
-			var t = this;
-			
-			// next two lines copied from jQuery.hover, ignore children onMouseOver/onMouseOut
-			var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
-			while ( p && p != this ) { try { p = p.parentNode; } catch(e) { p = this; } }
-			if ( p == this ) {
-				if ( $.browser.mozilla ) {
-					if ( e.type == "mouseout" ) {
-						t.mtout = setTimeout( function(){doHover(e,t);}, 30 );
-					} else {
-						if (t.mtout) { t.mtout = clearTimeout(t.mtout); }
-					}
-				}
-				return;
-			} else {
-				if (t.mtout) { t.mtout = clearTimeout(t.mtout); }
-				doHover(e,t);
-			}
-		};
-
-		// A private function for handling mouse 'hovering'
-		var doHover = function(e,ob) {
-
-			// copy objects to be passed into t (required for event object to be passed in IE)
-			var ev = jQuery.extend({},e);
-
-			// cancel hoverIntent timer if it exists
-			if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); }
-
-			// else e.type == "onmouseover"
-			if (e.type == "mouseover") {
-				// set "previous" X and Y position based on initial entry point
-				pX = ev.pageX; pY = ev.pageY;
-				// update "current" X and Y position based on mousemove
-				$(ob).bind("mousemove",track);
-				// start polling interval (self-calling timeout) to compare mouse coordinates over time
-				if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );}
-
-			// else e.type == "onmouseout"
-			} else {
-				// unbind expensive mousemove event
-				$(ob).unbind("mousemove",track);
-				// if hoverIntent state is true, then call the mouseOut function after the specified delay
-				if (ob.hoverIntent_s == 1) { ob.hoverIntent_t = setTimeout( function(){delay(ev,ob);} , cfg.timeout );}
-			}
-		};
-
-		// bind the function to the two event listeners
-		return this.mouseover(handleHover).mouseout(handleHover);
-	};
-})(jQuery);
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/jquery/interface.js b/mp-wp/wp-includes/js/jquery/interface.js
--- a/mp-wp/wp-includes/js/jquery/interface.js a050beebc2a530ac45925c1c3b2283fc5b09b88791716400f10c1710baa9f0a3c6798e1876d604ad6729ee7a709325f01a80aa0698e68177f01b63cc6a8300c7
+++ b/mp-wp/wp-includes/js/jquery/interface.js false
@@ -1,12 +0,0 @@
-/**
- * Interface Elements for jQuery
- * 
- * http://interface.eyecon.ro
- * 
- * Copyright (c) 2006 Stefan Petre
- * Dual licensed under the MIT (MIT-LICENSE.txt) 
- * and GPL (GPL-LICENSE.txt) licenses.
- *   
- *
- */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('A.cP={2l:C(c){G B.1y(C(){if(!c.8Y||!c.8P)G;F b=B;b.2a={9M:c.9M||bz,8Y:c.8Y,8P:c.8P,7R:c.7R||\'du\',9c:c.9c||\'du\',2K:c.2K&&28 c.2K==\'C\'?c.2K:H,2V:c.2K&&28 c.2V==\'C\'?c.2V:H,6D:c.6D&&28 c.6D==\'C\'?c.6D:H,8A:A(c.8Y,B),8a:A(c.8P,B),1l:c.1l||7n,5w:c.5w||0};b.2a.8a.2x().E(\'S\',\'9e\').eq(0).E({S:b.2a.9M+\'Q\',11:\'2v\'}).3m();b.2a.8A.1y(C(a){B.6L=a}).ht(C(){A(B).2H(b.2a.9c)},C(){A(B).3S(b.2a.9c)}).1C(\'4U\',C(e){if(b.2a.5w==B.6L)G;b.2a.8A.eq(b.2a.5w).3S(b.2a.7R).3m().eq(B.6L).2H(b.2a.7R).3m();b.2a.8a.eq(b.2a.5w).4S({S:0},b.2a.1l,C(){B.Y.11=\'1k\';if(b.2a.2V){b.2a.2V.1x(b,[B])}}).3m().eq(B.6L).1S().4S({S:b.2a.9M},b.2a.1l,C(){B.Y.11=\'2v\';if(b.2a.2K){b.2a.2K.1x(b,[B])}}).3m();if(b.2a.6D){b.2a.6D.1x(b,[B,b.2a.8a.I(B.6L),b.2a.8A.I(b.2a.5w),b.2a.8a.I(b.2a.5w)])}b.2a.5w=B.6L}).eq(0).2H(b.2a.7R).3m();A(B).E(\'S\',A(B).E(\'S\')).E(\'2N\',\'2B\')})}};A.fn.fe=A.cP.2l;A.8p={2l:C(h){G B.1y(C(){F c=B;F d=2*Z.2F/eD;F f=2*Z.2F;if(A(c).E(\'T\')!=\'2i\'&&A(c).E(\'T\')!=\'1J\'){A(c).E(\'T\',\'2i\')}c.1i={1M:A(h.1M,B),2y:h.2y,61:h.61,9l:h.9l,iu:f,1N:A.12.2f(B),T:A.12.3a(B),2b:Z.2F/2,b4:h.b4,7K:h.5U,5U:[],93:H,7G:2*Z.2F/eD};c.1i.d8=(c.1i.1N.w-c.1i.2y)/2;c.1i.6Y=(c.1i.1N.h-c.1i.61-c.1i.61*c.1i.7K)/2;c.1i.3f=2*Z.2F/c.1i.1M.1N();c.1i.aS=c.1i.1N.w/2;c.1i.aR=c.1i.1N.h/2-c.1i.61*c.1i.7K;F g=1c.3x(\'1W\');A(g).E({T:\'1J\',3j:1,O:0,M:0});A(c).1L(g);c.1i.1M.1y(C(a){8G=A(\'3O\',B).I(0);S=R(c.1i.61*c.1i.7K);if(A.2R.46){3u=1c.3x(\'3O\');A(3u).E(\'T\',\'1J\');3u.2E=8G.2E;3u.Y.4X=\'fu 9x:9C.9E.a6(1E=60, Y=1, fc=0, f9=0, f5=0, f3=0)\'}L{3u=1c.3x(\'3u\');if(3u.bZ){4j=3u.bZ("2d");3u.Y.T=\'1J\';3u.Y.S=S+\'Q\';3u.Y.V=c.1i.2y+\'Q\';3u.S=S;3u.V=c.1i.2y;4j.eR();4j.eM(0,S);4j.eJ(1,-1);4j.jm(8G,0,0,c.1i.2y,S);4j.bL();4j.jl="jh-3U";F b=4j.jf(0,0,0,S);b.es(1,"eg(1O, 1O, 1O, 1)");b.es(0,"eg(1O, 1O, 1O, 0.6)");4j.j9=b;if(j7.j5.3o(\'iX\')!=-1){4j.iV()}L{4j.iS(0,0,c.1i.2y,S)}}}c.1i.5U[a]=3u;A(g).1L(3u)}).1C(\'9r\',C(e){c.1i.93=14;c.1i.1l=c.1i.7G*0.1*c.1i.1l/Z.3B(c.1i.1l);G H}).1C(\'86\',C(e){c.1i.93=H;G H});A.8p.6z(c);c.1i.1l=c.1i.7G*0.2;c.1i.it=1P.5Y(C(){c.1i.2b+=c.1i.1l;if(c.1i.2b>f)c.1i.2b=0;A.8p.6z(c)},20);A(c).1C(\'86\',C(){c.1i.1l=c.1i.7G*0.2*c.1i.1l/Z.3B(c.1i.1l)}).1C(\'3t\',C(e){if(c.1i.93==H){1A=A.12.3W(e);dr=c.1i.1N.w-1A.x+c.1i.T.x;c.1i.1l=c.1i.b4*c.1i.7G*(c.1i.1N.w/2-dr)/(c.1i.1N.w/2)}})})},6z:C(b){b.1i.1M.1y(C(a){b8=b.1i.2b+a*b.1i.3f;x=b.1i.d8*Z.51(b8);y=b.1i.6Y*Z.7L(b8);do=R(1Y*(b.1i.6Y+y)/(2*b.1i.6Y));dm=(b.1i.6Y+y)/(2*b.1i.6Y);V=R((b.1i.2y-b.1i.9l)*dm+b.1i.9l);S=R(V*b.1i.61/b.1i.2y);B.Y.O=b.1i.aR+y-S/2+"Q";B.Y.M=b.1i.aS+x-V/2+"Q";B.Y.V=V+"Q";B.Y.S=S+"Q";B.Y.3j=do;b.1i.5U[a].Y.O=R(b.1i.aR+y+S-1-S/2)+"Q";b.1i.5U[a].Y.M=R(b.1i.aS+x-V/2)+"Q";b.1i.5U[a].Y.V=V+"Q";b.1i.5U[a].Y.S=R(S*b.1i.7K)+"Q"})}};A.fn.hL=A.8p.2l;A.1U({1e:{b1:C(p,n,a,b,c){G((-Z.51(p*Z.2F)/2)+0.5)*b+a},ho:C(p,n,a,b,c){G b*(n/=c)*n*n+a},d2:C(p,n,a,b,c){G-b*((n=n/c-1)*n*n*n-1)+a},hh:C(p,n,a,b,c){if((n/=c/2)<1)G b/2*n*n*n*n+a;G-b/2*((n-=2)*n*n*n-2)+a},7D:C(p,n,a,b,c){if((n/=c)<(1/2.75)){G b*(7.8W*n*n)+a}L if(n<(2/2.75)){G b*(7.8W*(n-=(1.5/2.75))*n+.75)+a}L if(n<(2.5/2.75)){G b*(7.8W*(n-=(2.25/2.75))*n+.gV)+a}L{G b*(7.8W*(n-=(2.gR/2.75))*n+.gN)+a}},aQ:C(p,n,a,b,c){if(A.1e.7D)G b-A.1e.7D(p,c-n,0,b,c)+a;G a+b},gE:C(p,n,a,b,c){if(A.1e.aQ&&A.1e.7D)if(n<c/2)G A.1e.aQ(p,n*2,0,b,c)*.5+a;G A.1e.7D(p,n*2-c,0,b,c)*.5+b*.5+a;G a+b},gz:C(p,n,b,c,d){F a,s;if(n==0)G b;if((n/=d)==1)G b+c;a=c*0.3;p=d*.3;if(a<Z.3B(c)){a=c;s=p/4}L{s=p/(2*Z.2F)*Z.aP(c/a)}G-(a*Z.5j(2,10*(n-=1))*Z.7L((n*d-s)*(2*Z.2F)/p))+b},gg:C(p,n,b,c,d){F a,s;if(n==0)G b;if((n/=d/2)==2)G b+c;a=c*0.3;p=d*.3;if(a<Z.3B(c)){a=c;s=p/4}L{s=p/(2*Z.2F)*Z.aP(c/a)}G a*Z.5j(2,-10*n)*Z.7L((n*d-s)*(2*Z.2F)/p)+c+b},gd:C(p,n,b,c,d){F a,s;if(n==0)G b;if((n/=d/2)==2)G b+c;a=c*0.3;p=d*.3;if(a<Z.3B(c)){a=c;s=p/4}L{s=p/(2*Z.2F)*Z.aP(c/a)}if(n<1){G-.5*(a*Z.5j(2,10*(n-=1))*Z.7L((n*d-s)*(2*Z.2F)/p))+b}G a*Z.5j(2,-10*(n-=1))*Z.7L((n*d-s)*(2*Z.2F)/p)*.5+c+b}}});A.5K={2l:C(h){G B.1y(C(){F g=B;g.1z={1M:A(h.1M,B),2q:A(h.2q,B),1I:A.12.3a(B),2y:h.2y,8K:h.8K,6q:h.6q,cG:h.cG,4I:h.4I,5R:h.5R};A.5K.8F(g,0);A(1P).1C(\'fR\',C(){g.1z.1I=A.12.3a(g);A.5K.8F(g,0);A.5K.6z(g)});A.5K.6z(g);g.1z.1M.1C(\'9r\',C(){A(g.1z.8K,B).I(0).Y.11=\'2v\'}).1C(\'86\',C(){A(g.1z.8K,B).I(0).Y.11=\'1k\'});A(1c).1C(\'3t\',C(e){F b=A.12.3W(e);F c=0;if(g.1z.4I&&g.1z.4I==\'az\')F d=b.x-g.1z.1I.x-(g.3P-g.1z.2y*g.1z.1M.1N())/2-g.1z.2y/2;L if(g.1z.4I&&g.1z.4I==\'2D\')F d=b.x-g.1z.1I.x-g.3P+g.1z.2y*g.1z.1M.1N();L F d=b.x-g.1z.1I.x;F f=Z.5j(b.y-g.1z.1I.y-g.5r/2,2);g.1z.1M.1y(C(a){3J=Z.cB(Z.5j(d-a*g.1z.2y,2)+f);3J-=g.1z.2y/2;3J=3J<0?0:3J;3J=3J>g.1z.6q?g.1z.6q:3J;3J=g.1z.6q-3J;bc=g.1z.5R*3J/g.1z.6q;B.Y.V=g.1z.2y+bc+\'Q\';B.Y.M=g.1z.2y*a+c+\'Q\';c+=bc});A.5K.8F(g,c)})})},8F:C(a,b){if(a.1z.4I)if(a.1z.4I==\'az\')a.1z.2q.I(0).Y.M=(a.3P-a.1z.2y*a.1z.1M.1N())/2-b/2+\'Q\';L if(a.1z.4I==\'M\')a.1z.2q.I(0).Y.M=-b/a.1z.1M.1N()+\'Q\';L if(a.1z.4I==\'2D\')a.1z.2q.I(0).Y.M=(a.3P-a.1z.2y*a.1z.1M.1N())-b/2+\'Q\';a.1z.2q.I(0).Y.V=a.1z.2y*a.1z.1M.1N()+b+\'Q\'},6z:C(b){b.1z.1M.1y(C(a){B.Y.V=b.1z.2y+\'Q\';B.Y.M=b.1z.2y*a+\'Q\'})}};A.fn.fz=A.5K.2l;A.K={18:P,7W:P,3q:P,2A:P,4b:P,af:P,2r:P,2h:P,1M:P,58:C(){A.K.7W.58();if(A.K.3q){A.K.3q.2x()}},4i:C(){A.K.1M=P;A.K.2h=P;A.K.4b=A.K.2r.2m;if(A.K.18.E(\'11\')==\'2v\'){if(A.K.2r.1a.fx){2X(A.K.2r.1a.fx.1K){19\'a4\':A.K.18.6d(A.K.2r.1a.fx.1H,A.K.58);1n;19\'1u\':A.K.18.c6(A.K.2r.1a.fx.1H,A.K.58);1n;19\'8o\':A.K.18.c3(A.K.2r.1a.fx.1H,A.K.58);1n}}L{A.K.18.2x()}if(A.K.2r.1a.2V)A.K.2r.1a.2V.1x(A.K.2r,[A.K.18,A.K.3q])}L{A.K.58()}1P.a2(A.K.2A)},c1:C(){F e=A.K.2r;F f=A.K.8C(e);if(e&&f.3w!=A.K.4b&&f.3w.1b>=e.1a.8N){A.K.4b=f.3w;A.K.af=f.3w;9V={bR:A(e).1m(\'eS\')||\'bR\',2m:f.3w};A.eQ({1K:\'eN\',9V:A.eL(9V),eK:C(b){e.1a.3X=A(\'3w\',b);1N=e.1a.3X.1N();if(1N>0){F c=\'\';e.1a.3X.1y(C(a){c+=\'<7b 4o="\'+A(\'2m\',B).3D()+\'" 8h="\'+a+\'" Y="7z: 8T;">\'+A(\'3D\',B).3D()+\'</7b>\'});if(e.1a.9K){F d=A(\'2m\',e.1a.3X.I(0)).3D();e.2m=f.30+d+e.1a.3y+f.5m;A.K.64(e,f.3w.1b!=d.1b?(f.30.1b+f.3w.1b):d.1b,f.3w.1b!=d.1b?(f.30.1b+d.1b):d.1b)}if(1N>0){A.K.aU(e,c)}L{A.K.4i()}}L{A.K.4i()}},5v:e.1a.96})}},aU:C(a,b){A.K.7W.3i(b);A.K.1M=A(\'7b\',A.K.7W.I(0));A.K.1M.9r(A.K.en).1C(\'4U\',A.K.ed);F c=A.12.3a(a);F d=A.12.2f(a);A.K.18.E(\'O\',c.y+d.hb+\'Q\').E(\'M\',c.x+\'Q\').2H(a.1a.9D);if(A.K.3q){A.K.3q.E(\'11\',\'2v\').E(\'O\',c.y+d.hb+\'Q\').E(\'M\',c.x+\'Q\').E(\'V\',A.K.18.E(\'V\')).E(\'S\',A.K.18.E(\'S\'))}A.K.2h=0;A.K.1M.I(0).2Z=a.1a.72;A.K.7I(a,a.1a.3X.I(0),\'6H\');if(A.K.18.E(\'11\')==\'1k\'){if(a.1a.bv){F e=A.12.9y(a,14);F f=A.12.6b(a,14);A.K.18.E(\'V\',a.3P-(A.e0?(e.l+e.r+f.l+f.r):0)+\'Q\')}if(a.1a.fx){2X(a.1a.fx.1K){19\'a4\':A.K.18.6U(a.1a.fx.1H);1n;19\'1u\':A.K.18.dR(a.1a.fx.1H);1n;19\'8o\':A.K.18.dP(a.1a.fx.1H);1n}}L{A.K.18.1S()}if(A.K.2r.1a.2K)A.K.2r.1a.2K.1x(A.K.2r,[A.K.18,A.K.3q])}},dM:C(){F b=B;if(b.1a.3X){A.K.4b=b.2m;A.K.af=b.2m;F c=\'\';b.1a.3X.1y(C(a){2m=A(\'2m\',B).3D().5u();dH=b.2m.5u();if(2m.3o(dH)==0){c+=\'<7b 4o="\'+A(\'2m\',B).3D()+\'" 8h="\'+a+\'" Y="7z: 8T;">\'+A(\'3D\',B).3D()+\'</7b>\'}});if(c!=\'\'){A.K.aU(b,c);B.1a.9s=14;G}}b.1a.3X=P;B.1a.9s=H},64:C(a,b,c){if(a.9q){F d=a.9q();d.iJ(14);d.dC("bh",b);d.iE("bh",-c+b);d.7Q()}L if(a.9m){a.9m(b,c)}L{if(a.88){a.88=b;a.dA=c}}a.6a()},dw:C(a){if(a.88)G a.88;L if(a.9q){F b=1c.64.dv();F c=b.il();G 0-c.dC(\'bh\',-ij)}},8C:C(a){F b={2m:a.2m,30:\'\',5m:\'\',3w:\'\'};if(a.1a.9k){F c=H;F d=A.K.dw(a)||0;F e=b.2m.6W(a.1a.3y);1V(F i=0;i<e.1b;i++){if((b.30.1b+e[i].1b>=d||d==0)&&!c){if(b.30.1b<=d)b.3w=e[i];L b.5m+=e[i]+(e[i]!=\'\'?a.1a.3y:\'\');c=14}L if(c){b.5m+=e[i]+(e[i]!=\'\'?a.1a.3y:\'\')}if(!c){b.30+=e[i]+(e.1b>1?a.1a.3y:\'\')}}}L{b.3w=b.2m}G b},b9:C(e){1P.a2(A.K.2A);F a=A.K.8C(B);F b=e.6S||e.6R||-1;if(/13|27|35|36|38|40|9/.3M(b)&&A.K.1M){if(1P.3N){1P.3N.b6=14;1P.3N.b5=H}L{e.9b();e.99()}if(A.K.2h!=P)A.K.1M.I(A.K.2h||0).2Z=\'\';L A.K.2h=-1;2X(b){19 9:19 13:if(A.K.2h==-1)A.K.2h=0;F c=A.K.1M.I(A.K.2h||0);F d=c.4Z(\'4o\');B.2m=a.30+d+B.1a.3y+a.5m;A.K.4b=a.3w;A.K.64(B,a.30.1b+d.1b+B.1a.3y.1b,a.30.1b+d.1b+B.1a.3y.1b);A.K.4i();if(B.1a.5p){4E=R(c.4Z(\'8h\'))||0;A.K.7I(B,B.1a.3X.I(4E),\'5p\')}if(B.6O)B.6O(H);G b!=13;1n;19 27:B.2m=a.30+A.K.4b+B.1a.3y+a.5m;B.1a.3X=P;A.K.4i();if(B.6O)B.6O(H);G H;1n;19 35:A.K.2h=A.K.1M.1N()-1;1n;19 36:A.K.2h=0;1n;19 38:A.K.2h--;if(A.K.2h<0)A.K.2h=A.K.1M.1N()-1;1n;19 40:A.K.2h++;if(A.K.2h==A.K.1M.1N())A.K.2h=0;1n}A.K.7I(B,B.1a.3X.I(A.K.2h||0),\'6H\');A.K.1M.I(A.K.2h||0).2Z=B.1a.72;if(A.K.1M.I(A.K.2h||0).6O)A.K.1M.I(A.K.2h||0).6O(H);if(B.1a.9K){F f=A.K.1M.I(A.K.2h||0).4Z(\'4o\');B.2m=a.30+f+B.1a.3y+a.5m;if(A.K.4b.1b!=f.1b)A.K.64(B,a.30.1b+A.K.4b.1b,a.30.1b+f.1b)}G H}A.K.dM.1x(B);if(B.1a.9s==H){if(a.3w!=A.K.4b&&a.3w.1b>=B.1a.8N)A.K.2A=1P.97(A.K.c1,B.1a.4w);if(A.K.1M){A.K.4i()}}G 14},7I:C(a,b,c){if(a.1a[c]){F d={};94=b.dj(\'*\');1V(i=0;i<94.1b;i++){d[94[i].4D]=94[i].6M.hG}a.1a[c].1x(a,[d])}},en:C(e){if(A.K.1M){if(A.K.2h!=P)A.K.1M.I(A.K.2h||0).2Z=\'\';A.K.1M.I(A.K.2h||0).2Z=\'\';A.K.2h=R(B.4Z(\'8h\'))||0;A.K.1M.I(A.K.2h||0).2Z=A.K.2r.1a.72}},ed:C(a){1P.a2(A.K.2A);a=a||A.3N.hD(1P.3N);a.9b();a.99();F b=A.K.8C(A.K.2r);F c=B.4Z(\'4o\');A.K.2r.2m=b.30+c+A.K.2r.1a.3y+b.5m;A.K.4b=B.4Z(\'4o\');A.K.64(A.K.2r,b.30.1b+c.1b+A.K.2r.1a.3y.1b,b.30.1b+c.1b+A.K.2r.1a.3y.1b);A.K.4i();if(A.K.2r.1a.5p){4E=R(B.4Z(\'8h\'))||0;A.K.7I(A.K.2r,A.K.2r.1a.3X.I(4E),\'5p\')}G H},dh:C(e){6K=e.6S||e.6R||-1;if(/13|27|35|36|38|40/.3M(6K)&&A.K.1M){if(1P.3N){1P.3N.b6=14;1P.3N.b5=H}L{e.9b();e.99()}G H}},2l:C(a){if(!a.96||!A.12){G}if(!A.K.18){if(A.2R.46){A(\'23\',1c).1L(\'<3q Y="11:1k;T:1J;4X:9x:9C.9E.a6(1E=0);" id="df" 2E="dc:H;" da="0" d7="b0"></3q>\');A.K.3q=A(\'#df\')}A(\'23\',1c).1L(\'<1W id="d4" Y="T: 1J; O: 0; M: 0; z-aY: hj; 11: 1k;"><90 Y="5X: 0;7E: 0; h9-Y: 1k; z-aY: h8;">&6G;</90></1W>\');A.K.18=A(\'#d4\');A.K.7W=A(\'90\',A.K.18)}G B.1y(C(){if(B.4D!=\'aV\'&&B.4Z(\'1K\')!=\'3D\')G;B.1a={};B.1a.96=a.96;B.1a.8N=Z.3B(R(a.8N)||1);B.1a.9D=a.9D?a.9D:\'\';B.1a.72=a.72?a.72:\'\';B.1a.5p=a.5p&&a.5p.1F==2w?a.5p:P;B.1a.2K=a.2K&&a.2K.1F==2w?a.2K:P;B.1a.2V=a.2V&&a.2V.1F==2w?a.2V:P;B.1a.6H=a.6H&&a.6H.1F==2w?a.6H:P;B.1a.bv=a.bv||H;B.1a.9k=a.9k||H;B.1a.3y=B.1a.9k?(a.3y||\', \'):\'\';B.1a.9K=a.9K?14:H;B.1a.4w=Z.3B(R(a.4w)||8V);if(a.fx&&a.fx.1F==6E){if(!a.fx.1K||!/a4|1u|8o/.3M(a.fx.1K)){a.fx.1K=\'1u\'}if(a.fx.1K==\'1u\'&&!A.fx.1u)G;if(a.fx.1K==\'8o\'&&!A.fx.5l)G;a.fx.1H=Z.3B(R(a.fx.1H)||7n);if(a.fx.1H>B.1a.4w){a.fx.1H=B.1a.4w-1Y}B.1a.fx=a.fx}B.1a.3X=P;B.1a.9s=H;A(B).1m(\'b9\',\'cW\').6a(C(){A.K.2r=B;A.K.4b=B.2m}).cV(A.K.dh).5Q(A.K.b9).4W(C(){A.K.2A=1P.97(A.K.4i,gM)})})}};A.fn.gJ=A.K.2l;A.1t={2A:P,4k:P,1X:P,3f:10,2b:C(a,b,c,d){A.1t.4k=a;A.1t.1X=b;A.1t.3f=R(c)||10;A.1t.2A=1P.5Y(A.1t.cR,R(d)||40)},cR:C(){1V(i=0;i<A.1t.1X.1b;i++){if(!A.1t.1X[i].2J){A.1t.1X[i].2J=A.1U(A.12.6x(A.1t.1X[i]),A.12.6w(A.1t.1X[i]),A.12.5O(A.1t.1X[i]))}L{A.1t.1X[i].2J.t=A.1t.1X[i].2T;A.1t.1X[i].2J.l=A.1t.1X[i].2P}if(A.1t.4k.D&&A.1t.4k.D.6g==14){5a={x:A.1t.4k.D.2n,y:A.1t.4k.D.2j,1D:A.1t.4k.D.1w.1D,hb:A.1t.4k.D.1w.hb}}L{5a=A.1U(A.12.6x(A.1t.4k),A.12.6w(A.1t.4k))}if(A.1t.1X[i].2J.t>0&&A.1t.1X[i].2J.y+A.1t.1X[i].2J.t>5a.y){A.1t.1X[i].2T-=A.1t.3f}L if(A.1t.1X[i].2J.t<=A.1t.1X[i].2J.h&&A.1t.1X[i].2J.t+A.1t.1X[i].2J.hb<5a.y+5a.hb){A.1t.1X[i].2T+=A.1t.3f}if(A.1t.1X[i].2J.l>0&&A.1t.1X[i].2J.x+A.1t.1X[i].2J.l>5a.x){A.1t.1X[i].2P-=A.1t.3f}L if(A.1t.1X[i].2J.l<=A.1t.1X[i].2J.gf&&A.1t.1X[i].2J.l+A.1t.1X[i].2J.1D<5a.x+5a.1D){A.1t.1X[i].2P+=A.1t.3f}}},7w:C(){1P.5h(A.1t.2A);A.1t.4k=P;A.1t.1X=P;1V(i in A.1t.1X){A.1t.1X[i].2J=P}}};A.X={18:P,1g:P,4v:C(){G B.1y(C(){if(B.8L){B.D.cM.3h(\'4R\',A.X.aM);B.D=P;B.8L=H;if(A.2R.46){B.aI="cW"}L{B.Y.g0=\'\';B.Y.cJ=\'\';B.Y.cH=\'\'}}})},aM:C(e){if(A.X.1g!=P){A.X.8I(e);G H}F a=B.3H;A(1c).1C(\'3t\',A.X.aE).1C(\'5n\',A.X.8I);a.D.1A=A.12.3W(e);a.D.4d=a.D.1A;a.D.6g=H;a.D.fY=B!=B.3H;A.X.1g=a;if(a.D.4P&&B!=B.3H){aC=A.12.3a(a.2S);aZ=A.12.2f(a);ay={x:R(A.E(a,\'M\'))||0,y:R(A.E(a,\'O\'))||0};dx=a.D.4d.x-aC.x-aZ.1D/2-ay.x;dy=a.D.4d.y-aC.y-aZ.hb/2-ay.y;A.2Q.4s(a,[dx,dy])}G A.6J||H},cD:C(e){F a=A.X.1g;a.D.6g=14;F b=a.Y;a.D.6o=A.E(a,\'11\');a.D.49=A.E(a,\'T\');if(!a.D.av)a.D.av=a.D.49;a.D.22={x:R(A.E(a,\'M\'))||0,y:R(A.E(a,\'O\'))||0};a.D.8z=0;a.D.8y=0;if(A.2R.46){F c=A.12.6b(a,14);a.D.8z=c.l||0;a.D.8y=c.t||0}a.D.1w=A.1U(A.12.3a(a),A.12.2f(a));if(a.D.49!=\'2i\'&&a.D.49!=\'1J\'){b.T=\'2i\'}A.X.18.58();F d=A(a).cA(14).I(0);A(d).E({11:\'2v\',M:\'2G\',O:\'2G\'});d.Y.4M=\'0\';d.Y.53=\'0\';d.Y.4L=\'0\';d.Y.4K=\'0\';A.X.18.1L(d);F f=A.X.18.I(0).Y;if(a.D.ar){f.V=\'8x\';f.S=\'8x\'}L{f.S=a.D.1w.hb+\'Q\';f.V=a.D.1w.1D+\'Q\'}f.11=\'2v\';f.4M=\'2G\';f.53=\'2G\';f.4L=\'2G\';f.4K=\'2G\';A.1U(a.D.1w,A.12.2f(d));if(a.D.2M){if(a.D.2M.M){a.D.22.x+=a.D.1A.x-a.D.1w.x-a.D.2M.M;a.D.1w.x=a.D.1A.x-a.D.2M.M}if(a.D.2M.O){a.D.22.y+=a.D.1A.y-a.D.1w.y-a.D.2M.O;a.D.1w.y=a.D.1A.y-a.D.2M.O}if(a.D.2M.2D){a.D.22.x+=a.D.1A.x-a.D.1w.x-a.D.1w.hb+a.D.2M.2D;a.D.1w.x=a.D.1A.x-a.D.1w.1D+a.D.2M.2D}if(a.D.2M.4e){a.D.22.y+=a.D.1A.y-a.D.1w.y-a.D.1w.hb+a.D.2M.4e;a.D.1w.y=a.D.1A.y-a.D.1w.hb+a.D.2M.4e}}a.D.2n=a.D.22.x;a.D.2j=a.D.22.y;if(a.D.7V||a.D.2e==\'7X\'){7Z=A.12.6b(a.2S,14);a.D.1w.x=a.7Y+(A.2R.46?0:A.2R.6l?-7Z.l:7Z.l);a.D.1w.y=a.7t+(A.2R.46?0:A.2R.6l?-7Z.t:7Z.t);A(a.2S).1L(A.X.18.I(0))}if(a.D.2e){A.X.ah(a);a.D.4V.2e=A.X.ae}if(a.D.4P){A.2Q.ad(a)}f.M=a.D.1w.x-a.D.8z+\'Q\';f.O=a.D.1w.y-a.D.8y+\'Q\';f.V=a.D.1w.1D+\'Q\';f.S=a.D.1w.hb+\'Q\';A.X.1g.D.8w=H;if(a.D.gx){a.D.4V.5y=A.X.a9}if(a.D.3j!=H){A.X.18.E(\'3j\',a.D.3j)}if(a.D.1E){A.X.18.E(\'1E\',a.D.1E);if(1P.6j){A.X.18.E(\'4X\',\'7s(1E=\'+a.D.1E*1Y+\')\')}}if(a.D.6i){A.X.18.2H(a.D.6i);A.X.18.I(0).6M.Y.11=\'1k\'}if(a.D.4c)a.D.4c.1x(a,[d,a.D.22.x,a.D.22.y]);if(A.1s&&A.1s.7p>0){A.1s.ck(a)}if(a.D.3L==H){b.11=\'1k\'}G H},ah:C(a){if(a.D.2e.1F==8t){if(a.D.2e==\'7X\'){a.D.1Z=A.1U({x:0,y:0},A.12.2f(a.2S));F b=A.12.6b(a.2S,14);a.D.1Z.w=a.D.1Z.1D-b.l-b.r;a.D.1Z.h=a.D.1Z.hb-b.t-b.b}L if(a.D.2e==\'1c\'){F c=A.12.a5();a.D.1Z={x:0,y:0,w:c.w,h:c.h}}}L if(a.D.2e.1F==6h){a.D.1Z={x:R(a.D.2e[0])||0,y:R(a.D.2e[1])||0,w:R(a.D.2e[2])||0,h:R(a.D.2e[3])||0}}a.D.1Z.dx=a.D.1Z.x-a.D.1w.x;a.D.1Z.dy=a.D.1Z.y-a.D.1w.y},8r:C(a){if(a.D.7V||a.D.2e==\'7X\'){A(\'23\',1c).1L(A.X.18.I(0))}A.X.18.58().2x().E(\'1E\',1);if(1P.6j){A.X.18.E(\'4X\',\'7s(1E=1Y)\')}},8I:C(e){A(1c).3h(\'3t\',A.X.aE).3h(\'5n\',A.X.8I);if(A.X.1g==P){G}F a=A.X.1g;A.X.1g=P;if(a.D.6g==H){G H}if(a.D.3I==14){A(a).E(\'T\',a.D.49)}F b=a.Y;if(a.4P){A.X.18.E(\'7z\',\'7g\')}if(a.D.6i){A.X.18.3S(a.D.6i)}if(a.D.5B==H){if(a.D.fx>0){if(!a.D.2g||a.D.2g==\'3Z\'){F x=W A.fx(a,{1H:a.D.fx},\'M\');x.1G(a.D.22.x,a.D.7i)}if(!a.D.2g||a.D.2g==\'3K\'){F y=W A.fx(a,{1H:a.D.fx},\'O\');y.1G(a.D.22.y,a.D.7k)}}L{if(!a.D.2g||a.D.2g==\'3Z\')a.Y.M=a.D.7i+\'Q\';if(!a.D.2g||a.D.2g==\'3K\')a.Y.O=a.D.7k+\'Q\'}A.X.8r(a);if(a.D.3L==H){A(a).E(\'11\',a.D.6o)}}L if(a.D.fx>0){a.D.8w=14;F c=H;if(A.1s&&A.1p&&a.D.3I){c=A.12.3a(A.1p.18.I(0))}A.X.18.4S({M:c?c.x:a.D.1w.x,O:c?c.y:a.D.1w.y},a.D.fx,C(){a.D.8w=H;if(a.D.3L==H){a.Y.11=a.D.6o}A.X.8r(a)})}L{A.X.8r(a);if(a.D.3L==H){A(a).E(\'11\',a.D.6o)}}if(A.1s&&A.1s.7p>0){A.1s.c8(a)}if(A.1p&&a.D.3I){A.1p.c7(a)}if(a.D.2I&&(a.D.7i!=a.D.22.x||a.D.7k!=a.D.22.y)){a.D.2I.1x(a,a.D.aa||[0,0,a.D.7i,a.D.7k])}if(a.D.3C)a.D.3C.1x(a);G H},a9:C(x,y,a,b){if(a!=0)a=R((a+(B.D.gx*a/Z.3B(a))/2)/B.D.gx)*B.D.gx;if(b!=0)b=R((b+(B.D.gy*b/Z.3B(b))/2)/B.D.gy)*B.D.gy;G{dx:a,dy:b,x:0,y:0}},ae:C(x,y,a,b){a=Z.3k(Z.3g(a,B.D.1Z.dx),B.D.1Z.w+B.D.1Z.dx-B.D.1w.1D);b=Z.3k(Z.3g(b,B.D.1Z.dy),B.D.1Z.h+B.D.1Z.dy-B.D.1w.hb);G{dx:a,dy:b,x:0,y:0}},aE:C(e){if(A.X.1g==P||A.X.1g.D.8w==14){G}F a=A.X.1g;a.D.4d=A.12.3W(e);if(a.D.6g==H){3J=Z.cB(Z.5j(a.D.1A.x-a.D.4d.x,2)+Z.5j(a.D.1A.y-a.D.4d.y,2));if(3J<a.D.5D){G}L{A.X.cD(e)}}F b=a.D.4d.x-a.D.1A.x;F c=a.D.4d.y-a.D.1A.y;1V(F i in a.D.4V){F d=a.D.4V[i].1x(a,[a.D.22.x+b,a.D.22.y+c,b,c]);if(d&&d.1F==6E){b=i!=\'6f\'?d.dx:(d.x-a.D.22.x);c=i!=\'6f\'?d.dy:(d.y-a.D.22.y)}}a.D.2n=a.D.1w.x+b-a.D.8z;a.D.2j=a.D.1w.y+c-a.D.8y;if(a.D.4P&&(a.D.3n||a.D.2I)){A.2Q.3n(a,a.D.2n,a.D.2j)}if(a.D.4h)a.D.4h.1x(a,[a.D.22.x+b,a.D.22.y+c]);if(!a.D.2g||a.D.2g==\'3Z\'){a.D.7i=a.D.22.x+b;A.X.18.I(0).Y.M=a.D.2n+\'Q\'}if(!a.D.2g||a.D.2g==\'3K\'){a.D.7k=a.D.22.y+c;A.X.18.I(0).Y.O=a.D.2j+\'Q\'}if(A.1s&&A.1s.7p>0){A.1s.8n(a)}G H},2l:C(o){if(!A.X.18){A(\'23\',1c).1L(\'<1W id="bX"></1W>\');A.X.18=A(\'#bX\');F c=A.X.18.I(0);F d=c.Y;d.T=\'1J\';d.11=\'1k\';d.7z=\'7g\';d.bV=\'1k\';d.2N=\'2B\';if(1P.6j){c.aI="bU"}L{d.eZ=\'1k\';d.cH=\'1k\';d.cJ=\'1k\'}}if(!o){o={}}G B.1y(C(){if(B.8L||!A.12)G;if(1P.6j){B.eX=C(){G H};B.eW=C(){G H}}F a=B;F b=o.3c?A(B).eV(o.3c):A(B);if(A.2R.46){b.1y(C(){B.aI="bU"})}L{b.E(\'-eU-6f-7Q\',\'1k\');b.E(\'6f-7Q\',\'1k\');b.E(\'-eT-6f-7Q\',\'1k\')}B.D={cM:b,5B:o.5B?14:H,3L:o.3L?14:H,3I:o.3I?o.3I:H,4P:o.4P?o.4P:H,7V:o.7V?o.7V:H,3j:o.3j?R(o.3j)||0:H,1E:o.1E?2c(o.1E):H,fx:R(o.fx)||P,5z:o.5z?o.5z:H,4V:{},1A:{},4c:o.4c&&o.4c.1F==2w?o.4c:H,3C:o.3C&&o.3C.1F==2w?o.3C:H,2I:o.2I&&o.2I.1F==2w?o.2I:H,2g:/3K|3Z/.3M(o.2g)?o.2g:H,5D:o.5D?R(o.5D)||0:0,2M:o.2M?o.2M:H,ar:o.ar?14:H,6i:o.6i||H};if(o.4V&&o.4V.1F==2w)B.D.4V.6f=o.4V;if(o.4h&&o.4h.1F==2w)B.D.4h=o.4h;if(o.2e&&((o.2e.1F==8t&&(o.2e==\'7X\'||o.2e==\'1c\'))||(o.2e.1F==6h&&o.2e.1b==4))){B.D.2e=o.2e}if(o.2C){B.D.2C=o.2C}if(o.5y){if(28 o.5y==\'eO\'){B.D.gx=R(o.5y)||1;B.D.gy=R(o.5y)||1}L if(o.5y.1b==2){B.D.gx=R(o.5y[0])||1;B.D.gy=R(o.5y[1])||1}}if(o.3n&&o.3n.1F==2w){B.D.3n=o.3n}B.8L=14;b.1y(C(){B.3H=a});b.1C(\'4R\',A.X.aM)})}};A.fn.1U({8j:A.X.4v,6r:A.X.2l});A.1s={bP:C(a,b,c,d){G a<=A.X.1g.D.2n&&(a+c)>=(A.X.1g.D.2n+A.X.1g.D.1w.w)&&b<=A.X.1g.D.2j&&(b+d)>=(A.X.1g.D.2j+A.X.1g.D.1w.h)?14:H},9S:C(a,b,c,d){G!(a>(A.X.1g.D.2n+A.X.1g.D.1w.w)||(a+c)<A.X.1g.D.2n||b>(A.X.1g.D.2j+A.X.1g.D.1w.h)||(b+d)<A.X.1g.D.2j)?14:H},1A:C(a,b,c,d){G a<A.X.1g.D.4d.x&&(a+c)>A.X.1g.D.4d.x&&b<A.X.1g.D.4d.y&&(b+d)>A.X.1g.D.4d.y?14:H},4T:H,3z:{},7p:0,3p:{},ck:C(a){if(A.X.1g==P){G}F i;A.1s.3z={};F b=H;1V(i in A.1s.3p){if(A.1s.3p[i]!=P){F c=A.1s.3p[i].I(0);if(A(A.X.1g).is(\'.\'+c.1f.a)){if(c.1f.m==H){c.1f.p=A.1U(A.12.6x(c),A.12.6w(c));c.1f.m=14}if(c.1f.ac){A.1s.3p[i].2H(c.1f.ac)}A.1s.3z[i]=A.1s.3p[i];if(A.1p&&c.1f.s&&A.X.1g.D.3I){c.1f.el=A(\'.\'+c.1f.a,c);a.Y.11=\'1k\';A.1p.bM(c);c.1f.9P=A.1p.8g(A.1m(c,\'id\')).6A;a.Y.11=a.D.6o;b=14}if(c.1f.9O){c.1f.9O.1x(A.1s.3p[i].I(0),[A.X.1g])}}}}if(b){A.1p.2b()}},eF:C(){A.1s.3z={};1V(i in A.1s.3p){if(A.1s.3p[i]!=P){F a=A.1s.3p[i].I(0);if(A(A.X.1g).is(\'.\'+a.1f.a)){a.1f.p=A.1U(A.12.6x(a),A.12.6w(a));if(a.1f.ac){A.1s.3p[i].2H(a.1f.ac)}A.1s.3z[i]=A.1s.3p[i];if(A.1p&&a.1f.s&&A.X.1g.D.3I){a.1f.el=A(\'.\'+a.1f.a,a);bJ.Y.11=\'1k\';A.1p.bM(a);bJ.Y.11=bJ.D.6o}}}}},8n:C(e){if(A.X.1g==P){G}A.1s.4T=H;F i;F a=H;F b=0;1V(i in A.1s.3z){F c=A.1s.3z[i].I(0);if(A.1s.4T==H&&A.1s[c.1f.t](c.1f.p.x,c.1f.p.y,c.1f.p.1D,c.1f.p.hb)){if(c.1f.hc&&c.1f.h==H){A.1s.3z[i].2H(c.1f.hc)}if(c.1f.h==H&&c.1f.76){a=14}c.1f.h=14;A.1s.4T=c;if(A.1p&&c.1f.s&&A.X.1g.D.3I){A.1p.18.I(0).2Z=c.1f.eC;A.1p.8n(c)}b++}L if(c.1f.h==14){if(c.1f.6C){c.1f.6C.1x(c,[e,A.X.18.I(0).6M,c.1f.fx])}if(c.1f.hc){A.1s.3z[i].3S(c.1f.hc)}c.1f.h=H}}if(A.1p&&!A.1s.4T&&A.X.1g.3I){A.1p.18.I(0).Y.11=\'1k\'}if(a){A.1s.4T.1f.76.1x(A.1s.4T,[e,A.X.18.I(0).6M])}},c8:C(e){F i;1V(i in A.1s.3z){F a=A.1s.3z[i].I(0);if(a.1f.ac){A.1s.3z[i].3S(a.1f.ac)}if(a.1f.hc){A.1s.3z[i].3S(a.1f.hc)}if(a.1f.s){A.1p.73[A.1p.73.1b]=i}if(a.1f.9I&&a.1f.h==14){a.1f.h=H;a.1f.9I.1x(a,[e,a.1f.fx])}a.1f.m=H;a.1f.h=H}A.1s.3z={}},4v:C(){G B.1y(C(){if(B.8S){if(B.1f.s){id=A.1m(B,\'id\');A.1p.54[id]=P;A(\'.\'+B.1f.a,B).8j()}A.1s.3p[\'d\'+B.bG]=P;B.8S=H;B.f=P}})},2l:C(o){G B.1y(C(){if(B.8S==14||!o.3r||!A.12||!A.X){G}B.1f={a:o.3r,ac:o.9F||H,hc:o.8X||H,eC:o.4G||H,9I:o.je||o.9I||H,76:o.76||o.ev||H,6C:o.6C||o.er||H,9O:o.9O||H,t:o.5T&&(o.5T==\'bP\'||o.5T==\'9S\')?o.5T:\'1A\',fx:o.fx?o.fx:H,m:H,h:H};if(o.bC==14&&A.1p){id=A.1m(B,\'id\');A.1p.54[id]=B.1f.a;B.1f.s=14;if(o.2I){B.1f.2I=o.2I;B.1f.9P=A.1p.8g(id).6A}}B.8S=14;B.bG=R(Z.63()*aW);A.1s.3p[\'d\'+B.bG]=A(B);A.1s.7p++})}};A.fn.1U({ei:A.1s.4v,ee:A.1s.2l});A.jd=A.1s.eF;A.3l={18:P,89:C(){3D=B.2m;if(!3D)G;Y={eb:A(B).E(\'eb\')||\'\',4a:A(B).E(\'4a\')||\'\',87:A(B).E(\'87\')||\'\',e9:A(B).E(\'e9\')||\'\',e8:A(B).E(\'e8\')||\'\',e7:A(B).E(\'e7\')||\'\',bx:A(B).E(\'bx\')||\'\',e6:A(B).E(\'e6\')||\'\'};A.3l.18.E(Y);3i=A.3l.e5(3D);3i=3i.48(W bw("\\\\n","g"),"<br />");A.3l.18.3i(\'j6\');b3=A.3l.18.I(0).3P;A.3l.18.3i(3i);V=A.3l.18.I(0).3P+b3;if(B.66.65&&V>B.66.65[0]){V=B.66.65[0]}B.Y.V=V+\'Q\';if(B.4D==\'bs\'){S=A.3l.18.I(0).5r+b3;if(B.66.65&&S>B.66.65[1]){S=B.66.65[1]}B.Y.S=S+\'Q\'}},e5:C(a){bq={\'&\':\'&j1;\',\'<\':\'&j0;\',\'>\':\'&gt;\',\'"\':\'&iZ;\'};1V(i in bq){a=a.48(W bw(i,\'g\'),bq[i])}G a},2l:C(a){if(A.3l.18==P){A(\'23\',1c).1L(\'<1W id="dX" Y="T: 1J; O: 0; M: 0; 2W: 2B;"></1W>\');A.3l.18=A(\'#dX\')}G B.1y(C(){if(/bs|aV/.3M(B.4D)){if(B.4D==\'aV\'){dT=B.4Z(\'1K\');if(!/3D|iW/.3M(dT)){G}}if(a&&(a.1F==bm||(a.1F==6h&&a.1b==2))){if(a.1F==bm)a=[a,a];L{a[0]=R(a[0])||7n;a[1]=R(a[1])||7n}B.66={65:a}}A(B).4W(A.3l.89).5Q(A.3l.89).cV(A.3l.89);A.3l.89.1x(B)}})}};A.fn.iU=A.3l.2l;A.fn.1U({c3:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.5l(B,a,b,\'4l\',c)})},dP:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.5l(B,a,b,\'41\',c)})},iQ:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.5l(B,a,b,\'dG\',c)})},iM:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.5l(B,a,b,\'M\',c)})},iL:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.5l(B,a,b,\'2D\',c)})},iK:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.5l(B,a,b,\'dF\',c)})}});A.fx.5l=C(e,a,b,c,d){if(!A.4n(e)){A.2z(e,\'1j\');G H}F z=B;z.el=A(e);z.1N=A.12.2f(e);z.1e=28 b==\'4B\'?b:d||P;if(!e.4f)e.4f=z.el.E(\'11\');if(c==\'dG\'){c=z.el.E(\'11\')==\'1k\'?\'41\':\'4l\'}L if(c==\'dF\'){c=z.el.E(\'11\')==\'1k\'?\'2D\':\'M\'}z.el.1S();z.1l=a;z.29=28 b==\'C\'?b:P;z.fx=A.fx.9u(e);z.6T=c;z.1T=C(){if(z.29&&z.29.1F==2w){z.29.1x(z.el.I(0))}if(z.6T==\'41\'||z.6T==\'2D\'){z.el.E(\'11\',z.el.I(0).4f==\'1k\'?\'2v\':z.el.I(0).4f)}L{z.el.2x()}A.fx.9n(z.fx.2Y.I(0),z.fx.U);A.2z(z.el.I(0),\'1j\')};2X(z.6T){19\'4l\':5q=W A.fx(z.fx.2Y.I(0),A.1l(z.1l,z.1e,z.1T),\'S\');5q.1G(z.fx.U.1o.hb,0);1n;19\'41\':z.fx.2Y.E(\'S\',\'9e\');z.el.1S();5q=W A.fx(z.fx.2Y.I(0),A.1l(z.1l,z.1e,z.1T),\'S\');5q.1G(0,z.fx.U.1o.hb);1n;19\'M\':5q=W A.fx(z.fx.2Y.I(0),A.1l(z.1l,z.1e,z.1T),\'V\');5q.1G(z.fx.U.1o.1D,0);1n;19\'2D\':z.fx.2Y.E(\'V\',\'9e\');z.el.1S();5q=W A.fx(z.fx.2Y.I(0),A.1l(z.1l,z.1e,z.1T),\'V\');5q.1G(0,z.fx.U.1o.1D);1n}};A.fn.iA=C(a,b){G B.1r(\'1j\',C(){if(!A.4n(B)){A.2z(B,\'1j\');G H}F e=W A.fx.eu(B,a,b);e.bE()})};A.fx.eu=C(e,a,b){F z=B;z.el=A(e);z.el.1S();z.29=b;z.8e=R(a)||40;z.U={};z.U.T=z.el.E(\'T\');z.U.O=R(z.el.E(\'O\'))||0;z.U.M=R(z.el.E(\'M\'))||0;if(z.U.T!=\'2i\'&&z.U.T!=\'1J\'){z.el.E(\'T\',\'2i\')}z.74=5;z.52=1;z.bE=C(){z.52++;z.e=W A.fx(z.el.I(0),{1H:io,1T:C(){z.e=W A.fx(z.el.I(0),{1H:80,1T:C(){z.8e=R(z.8e/2);if(z.52<=z.74)z.bE();L{z.el.E(\'T\',z.U.T).E(\'O\',z.U.O+\'Q\').E(\'M\',z.U.M+\'Q\');A.2z(z.el.I(0),\'1j\');if(z.29&&z.29.1F==2w){z.29.1x(z.el.I(0))}}}},\'O\');z.e.1G(z.U.O-z.8e,z.U.O)}},\'O\');z.e.1G(z.U.O,z.U.O-z.8e)}};A.fn.1U({im:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'41\',\'3U\',c)})},ik:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'41\',\'in\',c)})},ii:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'41\',\'3E\',c)})},ig:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'4l\',\'3U\',c)})},ie:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'4l\',\'in\',c)})},ic:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'4l\',\'3E\',c)})},ib:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'M\',\'3U\',c)})},ia:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'M\',\'in\',c)})},i9:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'M\',\'3E\',c)})},i8:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'2D\',\'3U\',c)})},i7:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'2D\',\'in\',c)})},i6:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.3Y(B,a,b,\'2D\',\'3E\',c)})}});A.fx.3Y=C(e,a,b,c,d,f){if(!A.4n(e)){A.2z(e,\'1j\');G H}F z=B;z.el=A(e);z.1e=28 b==\'4B\'?b:f||P;z.U={};z.U.T=z.el.E(\'T\');z.U.O=z.el.E(\'O\');z.U.M=z.el.E(\'M\');if(!e.4f)e.4f=z.el.E(\'11\');if(d==\'3E\'){d=z.el.E(\'11\')==\'1k\'?\'in\':\'3U\'}z.el.1S();if(z.U.T!=\'2i\'&&z.U.T!=\'1J\'){z.el.E(\'T\',\'2i\')}z.1K=d;b=28 b==\'C\'?b:P;7N=1;2X(c){19\'4l\':z.e=W A.fx(z.el.I(0),A.1l(a-15,z.1e,b),\'O\');z.5x=2c(z.U.O)||0;z.9i=z.dt;7N=-1;1n;19\'41\':z.e=W A.fx(z.el.I(0),A.1l(a-15,z.1e,b),\'O\');z.5x=2c(z.U.O)||0;z.9i=z.dt;1n;19\'2D\':z.e=W A.fx(z.el.I(0),A.1l(a-15,z.1e,b),\'M\');z.5x=2c(z.U.M)||0;z.9i=z.ds;1n;19\'M\':z.e=W A.fx(z.el.I(0),A.1l(a-15,z.1e,b),\'M\');z.5x=2c(z.U.M)||0;z.9i=z.ds;7N=-1;1n}z.e2=W A.fx(z.el.I(0),A.1l(a,z.1e,C(){z.el.E(z.U);if(z.1K==\'3U\'){z.el.E(\'11\',\'1k\')}L z.el.E(\'11\',z.el.I(0).4f==\'1k\'?\'2v\':z.el.I(0).4f);A.2z(z.el.I(0),\'1j\')}),\'1E\');if(d==\'in\'){z.e.1G(z.5x+1Y*7N,z.5x);z.e2.1G(0,1)}L{z.e.1G(z.5x,z.5x+1Y*7N);z.e2.1G(1,0)}};A.fn.1U({i5:C(a,b,c,d){G B.1r(\'1j\',C(){W A.fx.9h(B,a,b,c,\'dq\',d)})},i4:C(a,b,c,d){G B.1r(\'1j\',C(){W A.fx.9h(B,a,b,c,\'9g\',d)})},i3:C(a,b,c,d){G B.1r(\'1j\',C(){W A.fx.9h(B,a,b,c,\'3E\',d)})}});A.fx.9h=C(e,a,b,c,d,f){if(!A.4n(e)){A.2z(e,\'1j\');G H}F z=B;z.el=A(e);z.1e=28 c==\'4B\'?c:f||P;z.29=28 c==\'C\'?c:P;if(d==\'3E\'){d=z.el.E(\'11\')==\'1k\'?\'9g\':\'dq\'}z.1l=a;z.S=b&&b.1F==bm?b:20;z.fx=A.fx.9u(e);z.1K=d;z.1T=C(){if(z.29&&z.29.1F==2w){z.29.1x(z.el.I(0))}if(z.1K==\'9g\'){z.el.1S()}L{z.el.2x()}A.fx.9n(z.fx.2Y.I(0),z.fx.U);A.2z(z.el.I(0),\'1j\')};if(z.1K==\'9g\'){z.el.1S();z.fx.2Y.E(\'S\',z.S+\'Q\').E(\'V\',\'9e\');z.ef=W A.fx(z.fx.2Y.I(0),A.1l(z.1l,z.1e,C(){z.ef=W A.fx(z.fx.2Y.I(0),A.1l(z.1l,z.1e,z.1T),\'S\');z.ef.1G(z.S,z.fx.U.1o.hb)}),\'V\');z.ef.1G(0,z.fx.U.1o.1D)}L{z.ef=W A.fx(z.fx.2Y.I(0),A.1l(z.1l,z.1e,C(){z.ef=W A.fx(z.fx.2Y.I(0),A.1l(z.1l,z.1e,z.1T),\'V\');z.ef.1G(z.fx.U.1o.1D,0)}),\'S\');z.ef.1G(z.fx.U.1o.hb,z.S)}};A.fn.i2=C(c,d,e,f){G B.1r(\'dp\',C(){B.6Q=A(B).1m("Y")||\'\';f=28 e==\'4B\'?e:f||P;e=28 e==\'C\'?e:P;F a=A(B).E(\'6P\');F b=B.2S;6k(a==\'b7\'&&b){a=A(b).E(\'6P\');b=b.2S}A(B).E(\'6P\',d);if(28 B.6Q==\'7M\')B.6Q=B.6Q["9d"];A(B).4S({\'6P\':a},c,f,C(){A.2z(B,\'dp\');if(28 A(B).1m("Y")==\'7M\'){A(B).1m("Y")["9d"]="";A(B).1m("Y")["9d"]=B.6Q}L{A(B).1m("Y",B.6Q)}if(e)e.1x(B)})})};A.4n=C(e){if(/^i1$|^i0$|^hZ$|^5W$|^hY$|^hX$|^hW$|^hV$|^hU$|^23$|^hT$|^hS$|^hR$|^hQ$|^hP$|^hO$|^hN$/i.3M(e.98))G H;L G 14};A.fx.9n=C(e,a){F c=e.6M;F b=c.Y;b.T=a.T;b.4M=a.3s.t;b.4K=a.3s.l;b.4L=a.3s.b;b.53=a.3s.r;b.O=a.O+\'Q\';b.M=a.M+\'Q\';e.2S.dn(c,e);e.2S.hM(e)};A.fx.9u=C(e){if(!A.4n(e))G H;F t=A(e);F a=e.Y;F b=H;if(t.E(\'11\')==\'1k\'){95=t.E(\'2W\');t.E(\'2W\',\'2B\').1S();b=14}F c={};c.T=t.E(\'T\');c.1o=A.12.2f(e);c.3s=A.12.b2(e);F d=e.4u?e.4u.dk:t.E(\'hK\');c.O=R(t.E(\'O\'))||0;c.M=R(t.E(\'M\'))||0;F f=\'hJ\'+R(Z.63()*aW);F g=1c.3x(/^3O$|^br$|^hI$|^hr$|^7Q$|^hH$|^7M$|^3q$|^hF$|^hE$|^hC$|^90$|^dl$|^hB$/i.3M(e.98)?\'1W\':e.98);A.1m(g,\'id\',f);F h=A(g).2H(\'hA\');F i=g.Y;F j=0;F k=0;if(c.T==\'2i\'||c.T==\'1J\'){j=c.O;k=c.M}i.O=j+\'Q\';i.M=k+\'Q\';i.T=c.T!=\'2i\'&&c.T!=\'1J\'?\'2i\':c.T;i.S=c.1o.hb+\'Q\';i.V=c.1o.1D+\'Q\';i.4M=c.3s.t;i.53=c.3s.r;i.4L=c.3s.b;i.4K=c.3s.l;i.2N=\'2B\';if(A.2R.46){i.dk=d}L{i.hz=d}if(A.2R=="46"){a.4X="7s(1E="+0.dg*1Y+")"}a.1E=0.dg;e.2S.dn(g,e);g.hy(e);a.4M=\'2G\';a.53=\'2G\';a.4L=\'2G\';a.4K=\'2G\';a.T=\'1J\';a.bV=\'1k\';a.O=\'2G\';a.M=\'2G\';if(b){t.2x();a.2W=95}G{U:c,2Y:A(g)}};A.fx.7H={hx:[0,1O,1O],hw:[dd,1O,1O],hv:[db,db,hu],hs:[0,0,0],hq:[0,0,1O],hp:[d6,42,42],hn:[0,1O,1O],hm:[0,0,6N],hl:[0,6N,6N],hk:[aX,aX,aX],hi:[0,1Y,0],hg:[hf,he,cZ],hd:[6N,0,6N],ha:[85,cZ,47],h7:[1O,cY,0],h6:[h5,50,h4],h3:[6N,0,0],h2:[h1,cX,h0],gZ:[gY,0,8U],gX:[1O,0,1O],gW:[1O,gU,0],gT:[0,67,0],gS:[75,0,gQ],gP:[dd,cU,cY],gO:[gL,gK,cU],gI:[cT,1O,1O],gH:[cS,gG,cS],gF:[8U,8U,8U],gD:[1O,gC,gB],gA:[1O,1O,cT],gw:[0,1O,0],gv:[1O,0,1O],gu:[67,0,0],gs:[0,0,67],gr:[67,67,0],gq:[1O,d6,0],gp:[1O,8R,gn],gm:[67,0,67],gl:[1O,0,0],gk:[8R,8R,8R],gj:[1O,1O,1O],gi:[1O,1O,0]};A.fx.5L=C(a,b){if(A.fx.7H[a])G{r:A.fx.7H[a][0],g:A.fx.7H[a][1],b:A.fx.7H[a][2]};L if(2L=/^6v\\(\\s*([0-9]{1,3})\\s*,\\s*([0-9]{1,3})\\s*,\\s*([0-9]{1,3})\\s*\\)$/.8Q(a))G{r:R(2L[1]),g:R(2L[2]),b:R(2L[3])};L if(2L=/6v\\(\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*,\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*,\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*\\)$/.8Q(a))G{r:2c(2L[1])*2.55,g:2c(2L[2])*2.55,b:2c(2L[3])*2.55};L if(2L=/^#([a-fA-6t-9])([a-fA-6t-9])([a-fA-6t-9])$/.8Q(a))G{r:R("6s"+2L[1]+2L[1]),g:R("6s"+2L[2]+2L[2]),b:R("6s"+2L[3]+2L[3])};L if(2L=/^#([a-fA-6t-9]{2})([a-fA-6t-9]{2})([a-fA-6t-9]{2})$/.8Q(a))G{r:R("6s"+2L[1]),g:R("6s"+2L[2]),b:R("6s"+2L[3])};L G b==14?H:{r:1O,g:1O,b:1O}};A.fx.cQ={5d:1,4y:1,5i:1,4x:1,4e:1,4a:1,S:1,M:1,bx:1,gh:1,4L:1,4K:1,53:1,4M:1,7y:1,5R:1,7x:1,8O:1,1E:1,ge:1,gc:1,4Q:1,4F:1,5g:1,5b:1,2D:1,gb:1,O:1,V:1,3j:1};A.fx.cN={6P:1,ga:1,g9:1,g8:1,g7:1,g6:1,g5:1};A.fx.7v=[\'g4\',\'g3\',\'g2\',\'g1\'];A.fx.aL={\'aK\':[\'2u\',\'cK\'],\'8E\':[\'2u\',\'aH\'],\'5X\':[\'5X\',\'\'],\'7E\':[\'7E\',\'\']};A.fn.1U({4S:C(b,c,d,f){G B.1r(C(){F a=A.1l(c,d,f);F e=W A.cI(B,a,b)})},aG:C(b,c){G B.1r(C(){F a=A.1l(b,c);F e=W A.aG(B,a)})},7w:C(a){G B.1y(C(){if(B.5e)A.aF(B,a)})},fZ:C(a){G B.1y(C(){if(B.5e)A.aF(B,a);if(B.1r&&B.1r[\'fx\'])B.1r.fx=[]})}});A.1U({aG:C(a,b){F z=B,5f;z.3f=C(){if(A.cF(b.1T))b.1T.1x(a)};z.2A=5Y(C(){z.3f()},b.1H);a.5e=z},1e:{b1:C(p,n,a,b,c){G((-Z.51(p*Z.2F)/2)+0.5)*b+a}},cI:C(f,g,h){F z=B,5f;F y=f.Y;F k=A.E(f,"2N");F l=A.E(f,"11");F o={};z.9a=(W 6p()).6y();g.1e=g.1e&&A.1e[g.1e]?g.1e:\'b1\';z.8H=C(a,b){if(A.fx.cQ[a]){if(b==\'1S\'||b==\'2x\'||b==\'3E\'){if(!f.5I)f.5I={};F r=2c(A.5S(f,a));f.5I[a]=r&&r>-aW?r:(2c(A.E(f,a))||0);b=b==\'3E\'?(l==\'1k\'?\'1S\':\'2x\'):b;g[b]=14;o[a]=b==\'1S\'?[0,f.5I[a]]:[f.5I[a],0];if(a!=\'1E\')y[a]=o[a][0]+(a!=\'3j\'&&a!=\'87\'?\'Q\':\'\');L A.1m(y,"1E",o[a][0])}L{o[a]=[2c(A.5S(f,a)),2c(b)||0]}}L if(A.fx.cN[a])o[a]=[A.fx.5L(A.5S(f,a)),A.fx.5L(b)];L if(/^5X$|7E$|2u$|8E$|aK$/i.3M(a)){F m=b.48(/\\s+/g,\' \').48(/6v\\s*\\(\\s*/g,\'6v(\').48(/\\s*,\\s*/g,\',\').48(/\\s*\\)/g,\')\').aD(/([^\\s]+)/g);2X(a){19\'5X\':19\'7E\':19\'aK\':19\'8E\':m[3]=m[3]||m[1]||m[0];m[2]=m[2]||m[0];m[1]=m[1]||m[0];1V(F i=0;i<A.fx.7v.1b;i++){F c=A.fx.aL[a][0]+A.fx.7v[i]+A.fx.aL[a][1];o[c]=a==\'8E\'?[A.fx.5L(A.5S(f,c)),A.fx.5L(m[i])]:[2c(A.5S(f,c)),2c(m[i])]}1n;19\'2u\':1V(F i=0;i<m.1b;i++){F d=2c(m[i]);F e=!fX(d)?\'cK\':(!/b7|1k|2B|fW|fV|fU|fT|fS|fQ|fP|fO/i.3M(m[i])?\'aH\':H);if(e){1V(F j=0;j<A.fx.7v.1b;j++){c=\'2u\'+A.fx.7v[j]+e;o[c]=e==\'aH\'?[A.fx.5L(A.5S(f,c)),A.fx.5L(m[i])]:[2c(A.5S(f,c)),d]}}L{y[\'fN\']=m[i]}}1n}}L{y[a]=b}G H};1V(p in h){if(p==\'Y\'){F q=A.ax(h[p]);1V(6I in q){B.8H(6I,q[6I])}}L if(p==\'2Z\'){if(1c.8D)1V(F i=0;i<1c.8D.1b;i++){F s=1c.8D[i].fM||1c.8D[i].fL||P;if(s){1V(F j=0;j<s.1b;j++){if(s[j].fK==\'.\'+h[p]){F u=W bw(\'\\.\'+h[p]+\' {\');F v=s[j].Y.9d;F q=A.ax(v.48(u,\'\').48(/}/g,\'\'));1V(6I in q){B.8H(6I,q[6I])}}}}}}L{B.8H(p,h[p])}}y.11=l==\'1k\'?\'2v\':l;y.2N=\'2B\';z.3f=C(){F t=(W 6p()).6y();if(t>g.1H+z.9a){5h(z.2A);z.2A=P;1V(p in o){if(p=="1E")A.1m(y,"1E",o[p][1]);L if(28 o[p][1]==\'7M\')y[p]=\'6v(\'+o[p][1].r+\',\'+o[p][1].g+\',\'+o[p][1].b+\')\';L y[p]=o[p][1]+(p!=\'3j\'&&p!=\'87\'?\'Q\':\'\')}if(g.2x||g.1S)1V(F p in f.5I)if(p=="1E")A.1m(y,p,f.5I[p]);L y[p]="";y.11=g.2x?\'1k\':(l!=\'1k\'?l:\'2v\');y.2N=k;f.5e=P;if(A.cF(g.1T))g.1T.1x(f)}L{F n=t-B.9a;F a=n/g.1H;1V(p in o){if(28 o[p][1]==\'7M\'){y[p]=\'6v(\'+R(A.1e[g.1e](a,n,o[p][0].r,(o[p][1].r-o[p][0].r),g.1H))+\',\'+R(A.1e[g.1e](a,n,o[p][0].g,(o[p][1].g-o[p][0].g),g.1H))+\',\'+R(A.1e[g.1e](a,n,o[p][0].b,(o[p][1].b-o[p][0].b),g.1H))+\')\'}L{F b=A.1e[g.1e](a,n,o[p][0],(o[p][1]-o[p][0]),g.1H);if(p=="1E")A.1m(y,"1E",b);L y[p]=b+(p!=\'3j\'&&p!=\'87\'?\'Q\':\'\')}}}};z.2A=5Y(C(){z.3f()},13);f.5e=z},aF:C(a,b){if(b)a.5e.9a-=fJ;L{1P.5h(a.5e.2A);a.5e=P;A.2z(a,"fx")}}});A.ax=C(a){F b={};if(28 a==\'4B\'){a=a.5u().6W(\';\');1V(F i=0;i<a.1b;i++){8B=a[i].6W(\':\');if(8B.1b==2){b[A.cE(8B[0].48(/\\-(\\w)/g,C(m,c){G c.fI()}))]=A.cE(8B[1])}}}G b};A.fn.1U({fH:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.4N(B,a,b,\'3K\',\'5o\',c)})},fG:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.4N(B,a,b,\'3Z\',\'5o\',c)})},fF:C(a,b,c){G B.1r(\'1j\',C(){if(A.E(B,\'11\')==\'1k\'){W A.fx.4N(B,a,b,\'3Z\',\'6n\',c)}L{W A.fx.4N(B,a,b,\'3Z\',\'5o\',c)}})},fE:C(a,b,c){G B.1r(\'1j\',C(){if(A.E(B,\'11\')==\'1k\'){W A.fx.4N(B,a,b,\'3K\',\'6n\',c)}L{W A.fx.4N(B,a,b,\'3K\',\'5o\',c)}})},fD:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.4N(B,a,b,\'3K\',\'6n\',c)})},fC:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.4N(B,a,b,\'3Z\',\'6n\',c)})}});A.fx.4N=C(e,a,b,c,d,f){if(!A.4n(e)){A.2z(e,\'1j\');G H}F z=B;F g=H;z.el=A(e);z.1e=28 b==\'4B\'?b:f||P;z.29=28 b==\'C\'?b:P;z.1K=d;z.1l=a;z.26=A.12.2f(e);z.U={};z.U.T=z.el.E(\'T\');z.U.11=z.el.E(\'11\');if(z.U.11==\'1k\'){95=z.el.E(\'2W\');z.el.1S();g=14}z.U.O=z.el.E(\'O\');z.U.M=z.el.E(\'M\');if(g){z.el.2x();z.el.E(\'2W\',95)}z.U.V=z.26.w+\'Q\';z.U.S=z.26.h+\'Q\';z.U.2N=z.el.E(\'2N\');z.26.O=R(z.U.O)||0;z.26.M=R(z.U.M)||0;if(z.U.T!=\'2i\'&&z.U.T!=\'1J\'){z.el.E(\'T\',\'2i\')}z.el.E(\'2N\',\'2B\').E(\'S\',d==\'6n\'&&c==\'3K\'?1:z.26.h+\'Q\').E(\'V\',d==\'6n\'&&c==\'3Z\'?1:z.26.w+\'Q\');z.1T=C(){z.el.E(z.U);if(z.1K==\'5o\')z.el.2x();L z.el.1S();A.2z(z.el.I(0),\'1j\')};2X(c){19\'3K\':z.eh=W A.fx(z.el.I(0),A.1l(a-15,z.1e,b),\'S\');z.et=W A.fx(z.el.I(0),A.1l(z.1l,z.1e,z.1T),\'O\');if(z.1K==\'5o\'){z.eh.1G(z.26.h,0);z.et.1G(z.26.O,z.26.O+z.26.h/2)}L{z.eh.1G(0,z.26.h);z.et.1G(z.26.O+z.26.h/2,z.26.O)}1n;19\'3Z\':z.eh=W A.fx(z.el.I(0),A.1l(a-15,z.1e,b),\'V\');z.et=W A.fx(z.el.I(0),A.1l(z.1l,z.1e,z.1T),\'M\');if(z.1K==\'5o\'){z.eh.1G(z.26.w,0);z.et.1G(z.26.M,z.26.M+z.26.w/2)}L{z.eh.1G(0,z.26.w);z.et.1G(z.26.M+z.26.w/2,z.26.M)}1n}};A.fn.au=C(b,c,d){G B.1r(\'1j\',C(){if(!A.4n(B)){A.2z(B,\'1j\');G H}F a=W A.fx.au(B,b,c,d);a.at()})};A.fx.au=C(a,b,c,d){F z=B;z.74=c;z.52=1;z.el=a;z.1l=b;z.29=d;A(z.el).1S();z.at=C(){z.52++;z.e=W A.fx(z.el,A.1l(z.1l,C(){z.ef=W A.fx(z.el,A.1l(z.1l,C(){if(z.52<=z.74)z.at();L{A.2z(z.el,\'1j\');if(z.29&&z.29.1F==2w){z.29.1x(z.el)}}}),\'1E\');z.ef.1G(0,1)}),\'1E\');z.e.1G(1,0)}};A.fn.1U({fB:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.5E(B,a,1,1Y,14,b,\'cz\',c)})},fy:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.5E(B,a,1Y,1,14,b,\'as\',c)})},fw:C(b,c,d){G B.1r(\'1j\',C(){F a=a||\'d2\';W A.fx.5E(B,b,1Y,cX,14,c,\'5c\',a)})},5E:C(a,b,c,d,e,f){G B.1r(\'1j\',C(){W A.fx.5E(B,a,b,c,d,e,\'5E\',f)})}});A.fx.5E=C(e,f,g,h,j,k,m,q){if(!A.4n(e)){A.2z(e,\'1j\');G H}F z=B;z.el=A(e);z.6m=R(g)||1Y;z.3v=R(h)||1Y;z.1e=28 k==\'4B\'?k:q||P;z.29=28 k==\'C\'?k:P;z.1H=A.1l(f).1H;z.bL=j||P;z.26=A.12.2f(e);z.U={V:z.el.E(\'V\'),S:z.el.E(\'S\'),4a:z.el.E(\'4a\')||\'1Y%\',T:z.el.E(\'T\'),11:z.el.E(\'11\'),O:z.el.E(\'O\'),M:z.el.E(\'M\'),2N:z.el.E(\'2N\'),4x:z.el.E(\'4x\'),5i:z.el.E(\'5i\'),5d:z.el.E(\'5d\'),4y:z.el.E(\'4y\'),5b:z.el.E(\'5b\'),5g:z.el.E(\'5g\'),4Q:z.el.E(\'4Q\'),4F:z.el.E(\'4F\')};z.V=R(z.U.V)||e.3P||0;z.S=R(z.U.S)||e.5r||0;z.O=R(z.U.O)||0;z.M=R(z.U.M)||0;1o=[\'em\',\'Q\',\'fv\',\'%\'];1V(i in 1o){if(z.U.4a.3o(1o[i])>0){z.cy=1o[i];z.4a=2c(z.U.4a)}if(z.U.4x.3o(1o[i])>0){z.cx=1o[i];z.aq=2c(z.U.4x)||0}if(z.U.5i.3o(1o[i])>0){z.cw=1o[i];z.ap=2c(z.U.5i)||0}if(z.U.5d.3o(1o[i])>0){z.cv=1o[i];z.ao=2c(z.U.5d)||0}if(z.U.4y.3o(1o[i])>0){z.cu=1o[i];z.an=2c(z.U.4y)||0}if(z.U.5b.3o(1o[i])>0){z.ct=1o[i];z.am=2c(z.U.5b)||0}if(z.U.5g.3o(1o[i])>0){z.cr=1o[i];z.al=2c(z.U.5g)||0}if(z.U.4Q.3o(1o[i])>0){z.cq=1o[i];z.ak=2c(z.U.4Q)||0}if(z.U.4F.3o(1o[i])>0){z.cp=1o[i];z.aj=2c(z.U.4F)||0}}if(z.U.T!=\'2i\'&&z.U.T!=\'1J\'){z.el.E(\'T\',\'2i\')}z.el.E(\'2N\',\'2B\');z.1K=m;2X(z.1K){19\'cz\':z.3V=z.O+z.26.h/2;z.4H=z.O;z.3Q=z.M+z.26.w/2;z.4r=z.M;1n;19\'as\':z.4H=z.O+z.26.h/2;z.3V=z.O;z.4r=z.M+z.26.w/2;z.3Q=z.M;1n;19\'5c\':z.4H=z.O-z.26.h/4;z.3V=z.O;z.4r=z.M-z.26.w/4;z.3Q=z.M;1n}z.ai=H;z.t=(W 6p).6y();z.4i=C(){5h(z.2A);z.2A=P};z.3f=C(){if(z.ai==H){z.el.1S();z.ai=14}F t=(W 6p).6y();F n=t-z.t;F p=n/z.1H;if(t>=z.1H+z.t){97(C(){o=1;if(z.1K){t=z.4H;l=z.4r;if(z.1K==\'5c\')o=0}z.ag(z.3v,l,t,14,o)},13);z.4i()}L{o=1;if(!A.1e||!A.1e[z.1e]){s=((-Z.51(p*Z.2F)/2)+0.5)*(z.3v-z.6m)+z.6m}L{s=A.1e[z.1e](p,n,z.6m,(z.3v-z.6m),z.1H)}if(z.1K){if(!A.1e||!A.1e[z.1e]){t=((-Z.51(p*Z.2F)/2)+0.5)*(z.4H-z.3V)+z.3V;l=((-Z.51(p*Z.2F)/2)+0.5)*(z.4r-z.3Q)+z.3Q;if(z.1K==\'5c\')o=((-Z.51(p*Z.2F)/2)+0.5)*(-0.9B)+0.9B}L{t=A.1e[z.1e](p,n,z.3V,(z.4H-z.3V),z.1H);l=A.1e[z.1e](p,n,z.3Q,(z.4r-z.3Q),z.1H);if(z.1K==\'5c\')o=A.1e[z.1e](p,n,0.9B,-0.9B,z.1H)}}z.ag(s,l,t,H,o)}};z.2A=5Y(C(){z.3f()},13);z.ag=C(a,b,c,d,e){z.el.E(\'S\',z.S*a/1Y+\'Q\').E(\'V\',z.V*a/1Y+\'Q\').E(\'M\',b+\'Q\').E(\'O\',c+\'Q\').E(\'4a\',z.4a*a/1Y+z.cy);if(z.aq)z.el.E(\'4x\',z.aq*a/1Y+z.cx);if(z.ap)z.el.E(\'5i\',z.ap*a/1Y+z.cw);if(z.ao)z.el.E(\'5d\',z.ao*a/1Y+z.cv);if(z.an)z.el.E(\'4y\',z.an*a/1Y+z.cu);if(z.am)z.el.E(\'5b\',z.am*a/1Y+z.ct);if(z.al)z.el.E(\'5g\',z.al*a/1Y+z.cr);if(z.ak)z.el.E(\'4Q\',z.ak*a/1Y+z.cq);if(z.aj)z.el.E(\'4F\',z.aj*a/1Y+z.cp);if(z.1K==\'5c\'){if(1P.6j)z.el.I(0).Y.4X="7s(1E="+e*1Y+")";z.el.I(0).Y.1E=e}if(d){if(z.bL){z.el.E(z.U)}if(z.1K==\'as\'||z.1K==\'5c\'){z.el.E(\'11\',\'1k\');if(z.1K==\'5c\'){if(1P.6j)z.el.I(0).Y.4X="7s(1E="+1Y+")";z.el.I(0).Y.1E=1}}L z.el.E(\'11\',\'2v\');if(z.29)z.29.1x(z.el.I(0));A.2z(z.el.I(0),\'1j\')}}};A.fn.1U({9A:C(a,b,c){o=A.1l(a);G B.1r(\'1j\',C(){W A.fx.9A(B,o,b,c)})},ft:C(a,b,c){G B.1y(C(){A(\'a[@2U*="#"]\',B).4U(C(e){co=B.2U.6W(\'#\');A(\'#\'+co[1]).9A(a,b,c);G H})})}});A.fx.9A=C(e,o,a,b){F z=B;z.o=o;z.e=e;z.2g=/cn|cm/.3M(a)?a:H;z.1e=b;p=A.12.3a(e);s=A.12.5O();z.4i=C(){5h(z.2A);z.2A=P;A.2z(z.e,\'1j\')};z.t=(W 6p).6y();s.h=s.h>s.ih?(s.h-s.ih):s.h;s.w=s.w>s.iw?(s.w-s.iw):s.w;z.4H=p.y>s.h?s.h:p.y;z.4r=p.x>s.w?s.w:p.x;z.3V=s.t;z.3Q=s.l;z.3f=C(){F t=(W 6p).6y();F n=t-z.t;F p=n/z.o.1H;if(t>=z.o.1H+z.t){z.4i();97(C(){z.ab(z.4H,z.4r)},13)}L{if(!z.2g||z.2g==\'cn\'){if(!A.1e||!A.1e[z.1e]){8v=((-Z.51(p*Z.2F)/2)+0.5)*(z.4H-z.3V)+z.3V}L{8v=A.1e[z.1e](p,n,z.3V,(z.4H-z.3V),z.o.1H)}}L{8v=z.3V}if(!z.2g||z.2g==\'cm\'){if(!A.1e||!A.1e[z.1e]){8u=((-Z.51(p*Z.2F)/2)+0.5)*(z.4r-z.3Q)+z.3Q}L{8u=A.1e[z.1e](p,n,z.3Q,(z.4r-z.3Q),z.o.1H)}}L{8u=z.3Q}z.ab(8v,8u)}};z.ab=C(t,l){1P.fs(l,t)};z.2A=5Y(C(){z.3f()},13)};A.fn.a8=C(a,b){G B.1r(\'1j\',C(){if(!A.4n(B)){A.2z(B,\'1j\');G H}F e=W A.fx.a8(B,a,b);e.a7()})};A.fx.a8=C(e,a,b){F z=B;z.el=A(e);z.el.1S();z.74=R(a)||3;z.29=b;z.52=1;z.U={};z.U.T=z.el.E(\'T\');z.U.O=R(z.el.E(\'O\'))||0;z.U.M=R(z.el.E(\'M\'))||0;if(z.U.T!=\'2i\'&&z.U.T!=\'1J\'){z.el.E(\'T\',\'2i\')}z.a7=C(){z.52++;z.e=W A.fx(z.el.I(0),{1H:60,1T:C(){z.e=W A.fx(z.el.I(0),{1H:60,1T:C(){z.e=W A.fx(e,{1H:60,1T:C(){if(z.52<=z.74)z.a7();L{z.el.E(\'T\',z.U.T).E(\'O\',z.U.O+\'Q\').E(\'M\',z.U.M+\'Q\');A.2z(z.el.I(0),\'1j\');if(z.29&&z.29.1F==2w){z.29.1x(z.el.I(0))}}}},\'M\');z.e.1G(z.U.M-20,z.U.M)}},\'M\');z.e.1G(z.U.M+20,z.U.M-20)}},\'M\');z.e.1G(z.U.M,z.U.M+20)}};A.fn.1U({dR:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'4l\',\'in\',c)})},c6:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'4l\',\'3U\',c)})},fr:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'4l\',\'3E\',c)})},fq:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'41\',\'in\',c)})},fp:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'41\',\'3U\',c)})},fo:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'41\',\'3E\',c)})},fm:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'M\',\'in\',c)})},fl:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'M\',\'3U\',c)})},fk:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'M\',\'3E\',c)})},fj:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'2D\',\'in\',c)})},fi:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'2D\',\'3U\',c)})},fh:C(a,b,c){G B.1r(\'1j\',C(){W A.fx.1u(B,a,b,\'2D\',\'3E\',c)})}});A.fx.1u=C(e,a,b,c,d,f){if(!A.4n(e)){A.2z(e,\'1j\');G H}F z=B;z.el=A(e);z.1e=28 b==\'4B\'?b:f||P;z.29=28 b==\'C\'?b:P;if(d==\'3E\'){d=z.el.E(\'11\')==\'1k\'?\'in\':\'3U\'}if(!e.4f)e.4f=z.el.E(\'11\');z.el.1S();z.1l=a;z.fx=A.fx.9u(e);z.1K=d;z.6T=c;z.1T=C(){if(z.1K==\'3U\')z.el.E(\'2W\',\'2B\');A.fx.9n(z.fx.2Y.I(0),z.fx.U);if(z.1K==\'in\'){z.el.E(\'11\',z.el.I(0).4f==\'1k\'?\'2v\':z.el.I(0).4f)}L{z.el.E(\'11\',\'1k\');z.el.E(\'2W\',\'cl\')}if(z.29&&z.29.1F==2w){z.29.1x(z.el.I(0))}A.2z(z.el.I(0),\'1j\')};2X(z.6T){19\'4l\':z.ef=W A.fx(z.el.I(0),A.1l(z.1l,z.1e,z.1T),\'O\');z.79=W A.fx(z.fx.2Y.I(0),A.1l(z.1l,z.1e),\'S\');if(z.1K==\'in\'){z.ef.1G(-z.fx.U.1o.hb,0);z.79.1G(0,z.fx.U.1o.hb)}L{z.ef.1G(0,-z.fx.U.1o.hb);z.79.1G(z.fx.U.1o.hb,0)}1n;19\'41\':z.ef=W A.fx(z.el.I(0),A.1l(z.1l,z.1e,z.1T),\'O\');if(z.1K==\'in\'){z.ef.1G(z.fx.U.1o.hb,0)}L{z.ef.1G(0,z.fx.U.1o.hb)}1n;19\'M\':z.ef=W A.fx(z.el.I(0),A.1l(z.1l,z.1e,z.1T),\'M\');z.79=W A.fx(z.fx.2Y.I(0),A.1l(z.1l,z.1e),\'V\');if(z.1K==\'in\'){z.ef.1G(-z.fx.U.1o.1D,0);z.79.1G(0,z.fx.U.1o.1D)}L{z.ef.1G(0,-z.fx.U.1o.1D);z.79.1G(z.fx.U.1o.1D,0)}1n;19\'2D\':z.ef=W A.fx(z.el.I(0),A.1l(z.1l,z.1e,z.1T),\'M\');if(z.1K==\'in\'){z.ef.1G(z.fx.U.1o.1D,0)}L{z.ef.1G(0,z.fx.U.1o.1D)}1n}};A.2O=P;A.fn.fg=C(o){G B.1r(\'1j\',C(){W A.fx.cj(B,o)})};A.fx.cj=C(e,o){if(A.2O==P){A(\'23\',1c).1L(\'<1W id="2O"></1W>\');A.2O=A(\'#2O\')}A.2O.E(\'11\',\'2v\').E(\'T\',\'1J\');F z=B;z.el=A(e);if(!o||!o.3v){G}if(o.3v.1F==8t&&1c.7o(o.3v)){o.3v=1c.7o(o.3v)}L if(!o.3v.ci){G}if(!o.1H){o.1H=ch}z.1H=o.1H;z.3v=o.3v;z.7e=o.2Z;z.1T=o.1T;if(z.7e){A.2O.2H(z.7e)}z.8s=0;z.8i=0;if(A.e0){z.8s=(R(A.2O.E(\'4y\'))||0)+(R(A.2O.E(\'5i\'))||0)+(R(A.2O.E(\'4F\'))||0)+(R(A.2O.E(\'5g\'))||0);z.8i=(R(A.2O.E(\'4x\'))||0)+(R(A.2O.E(\'5d\'))||0)+(R(A.2O.E(\'5b\'))||0)+(R(A.2O.E(\'4Q\'))||0)}z.2b=A.1U(A.12.3a(z.el.I(0)),A.12.2f(z.el.I(0)));z.3m=A.1U(A.12.3a(z.3v),A.12.2f(z.3v));z.2b.1D-=z.8s;z.2b.hb-=z.8i;z.3m.1D-=z.8s;z.3m.hb-=z.8i;z.29=o.1T;A.2O.E(\'V\',z.2b.1D+\'Q\').E(\'S\',z.2b.hb+\'Q\').E(\'O\',z.2b.y+\'Q\').E(\'M\',z.2b.x+\'Q\').4S({O:z.3m.y,M:z.3m.x,V:z.3m.1D,S:z.3m.hb},z.1H,C(){if(z.7e)A.2O.3S(z.7e);A.2O.E(\'11\',\'1k\');if(z.1T&&z.1T.1F==2w){z.1T.1x(z.el.I(0),[z.3v])}A.2z(z.el.I(0),\'1j\')})};A.1q={24:{2u:10,cf:\'1R/ff.ce\',cd:\'<3O 2E="1R/5o.cc" />\',cb:0.8,ca:\'fb 8G\',c9:\'6m\',3F:7n},fa:H,f8:H,5A:P,7m:H,7l:H,a3:C(a){if(!A.1q.7l||A.1q.7m)G;F b=a.6S||a.6R||-1;2X(b){19 35:if(A.1q.5A)A.1q.2b(P,A(\'a[@4o=\'+A.1q.5A+\']:f7\').I(0));1n;19 36:if(A.1q.5A)A.1q.2b(P,A(\'a[@4o=\'+A.1q.5A+\']:f6\').I(0));1n;19 37:19 8:19 33:19 80:19 f4:F c=A(\'#7j\');if(c.I(0).4q!=P){c.I(0).4q.1x(c.I(0))}1n;19 38:1n;19 39:19 34:19 32:19 fd:19 78:F d=A(\'#7h\');if(d.I(0).4q!=P){d.I(0).4q.1x(d.I(0))}1n;19 40:1n;19 27:A.1q.8q();1n}},6g:C(a){if(a)A.1U(A.1q.24,a);if(1P.3N){A(\'23\',1c).1C(\'5Q\',A.1q.a3)}L{A(1c).1C(\'5Q\',A.1q.a3)}A(\'a\').1y(C(){el=A(B);c5=el.1m(\'4o\')||\'\';c4=el.1m(\'2U\')||\'\';cg=/\\.cc|\\.f2|\\.7q|\\.ce|\\.f1/g;if(c4.5u().aD(cg)!=P&&c5.5u().3o(\'c2\')==0){el.1C(\'4U\',A.1q.2b)}});if(A.2R.46){3q=1c.3x(\'3q\');A(3q).1m({id:\'a1\',2E:\'dc:H;\',da:\'b0\',d7:\'b0\'}).E({11:\'1k\',T:\'1J\',O:\'0\',M:\'0\',4X:\'9x:9C.9E.a6(1E=0)\'});A(\'23\').1L(3q)}7r=1c.3x(\'1W\');A(7r).1m(\'id\',\'a0\').E({T:\'1J\',11:\'1k\',O:\'0\',M:\'0\',1E:0}).1L(1c.8b(\' \')).1C(\'4U\',A.1q.8q);5C=1c.3x(\'1W\');A(5C).1m(\'id\',\'c0\').E({4F:A.1q.24.2u+\'Q\'}).1L(1c.8b(\' \'));9Z=1c.3x(\'1W\');A(9Z).1m(\'id\',\'bY\').E({4F:A.1q.24.2u+\'Q\',4Q:A.1q.24.2u+\'Q\'}).1L(1c.8b(\' \'));9Y=1c.3x(\'a\');A(9Y).1m({id:\'f0\',2U:\'#\'}).E({T:\'1J\',2D:A.1q.24.2u+\'Q\',O:\'0\'}).1L(A.1q.24.cd).1C(\'4U\',A.1q.8q);6Z=1c.3x(\'1W\');A(6Z).1m(\'id\',\'9X\').E({T:\'2i\',9W:\'M\',5X:\'0 8x\',3j:1}).1L(5C).1L(9Z).1L(9Y);21=1c.3x(\'3O\');21.2E=A.1q.24.cf;A(21).1m(\'id\',\'bW\').E({T:\'1J\'});5G=1c.3x(\'a\');A(5G).1m({id:\'7j\',2U:\'#\'}).E({T:\'1J\',11:\'1k\',2N:\'2B\',cC:\'1k\'}).1L(1c.8b(\' \'));5F=1c.3x(\'a\');A(5F).1m({id:\'7h\',2U:\'#\'}).E({T:\'1J\',2N:\'2B\',cC:\'1k\'}).1L(1c.8b(\' \'));2q=1c.3x(\'1W\');A(2q).1m(\'id\',\'bT\').E({11:\'1k\',T:\'2i\',2N:\'2B\',9W:\'M\',5X:\'0 8x\',O:\'0\',M:\'0\',3j:2}).1L([21,5G,5F]);5Z=1c.3x(\'1W\');A(5Z).1m(\'id\',\'8m\').E({11:\'1k\',T:\'1J\',2N:\'2B\',O:\'0\',M:\'0\',9W:\'az\',6P:\'b7\',eY:\'0\'}).1L([2q,6Z]);A(\'23\').1L(7r).1L(5Z)},2b:C(e,a){el=a?A(a):A(B);8J=el.1m(\'4o\');F b,4E,5G,5F;if(8J!=\'c2\'){A.1q.5A=8J;7F=A(\'a[@4o=\'+8J+\']\');b=7F.1N();4E=7F.aY(a?a:B);5G=7F.I(4E-1);5F=7F.I(4E+1)}aw=el.1m(\'2U\');5C=el.1m(\'3T\');3R=A.12.5O();7r=A(\'#a0\');if(!A.1q.7l){A.1q.7l=14;if(A.2R.46){A(\'#a1\').E(\'S\',Z.3g(3R.ih,3R.h)+\'Q\').E(\'V\',Z.3g(3R.iw,3R.w)+\'Q\').1S()}7r.E(\'S\',Z.3g(3R.ih,3R.h)+\'Q\').E(\'V\',Z.3g(3R.iw,3R.w)+\'Q\').1S().bS(bz,A.1q.24.cb,C(){A.1q.aB(aw,5C,3R,b,4E,5G,5F)});A(\'#8m\').E(\'V\',Z.3g(3R.iw,3R.w)+\'Q\')}L{A(\'#7j\').I(0).4q=P;A(\'#7h\').I(0).4q=P;A.1q.aB(aw,5C,3R,b,4E,5G,5F)}G H},aB:C(a,b,c,d,e,f,g){A(\'#aA\').9U();8l=A(\'#7j\');8l.2x();8k=A(\'#7h\');8k.2x();21=A(\'#bW\');2q=A(\'#bT\');5Z=A(\'#8m\');6Z=A(\'#9X\').E(\'2W\',\'2B\');A(\'#c0\').3i(5C);A.1q.7m=14;if(d)A(\'#bY\').3i(A.1q.24.ca+\' \'+(e+1)+\' \'+A.1q.24.c9+\' \'+d);if(f){8l.I(0).4q=C(){B.4W();A.1q.2b(P,f);G H}}if(g){8k.I(0).4q=C(){B.4W();A.1q.2b(P,g);G H}}21.1S();7u=A.12.2f(2q.I(0));4C=Z.3g(7u.1D,21.I(0).V+A.1q.24.2u*2);59=Z.3g(7u.hb,21.I(0).S+A.1q.24.2u*2);21.E({M:(4C-21.I(0).V)/2+\'Q\',O:(59-21.I(0).S)/2+\'Q\'});2q.E({V:4C+\'Q\',S:59+\'Q\'}).1S();bQ=A.12.a5();5Z.E(\'O\',c.t+(bQ.h/15)+\'Q\');if(5Z.E(\'11\')==\'1k\'){5Z.1S().6U(A.1q.24.3F)}5H=W 8M;A(5H).1m(\'id\',\'aA\').1C(\'eP\',C(){4C=5H.V+A.1q.24.2u*2;59=5H.S+A.1q.24.2u*2;21.2x();2q.4S({S:59},7u.hb!=59?A.1q.24.3F:1,C(){2q.4S({V:4C},7u.1D!=4C?A.1q.24.3F:1,C(){2q.aJ(5H);A(5H).E({T:\'1J\',M:A.1q.24.2u+\'Q\',O:A.1q.24.2u+\'Q\'}).6U(A.1q.24.3F,C(){cL=A.12.2f(6Z.I(0));if(f){8l.E({M:A.1q.24.2u+\'Q\',O:A.1q.24.2u+\'Q\',V:4C/2-A.1q.24.2u*3+\'Q\',S:59-A.1q.24.2u*2+\'Q\'}).1S()}if(g){8k.E({M:4C/2+A.1q.24.2u*2+\'Q\',O:A.1q.24.2u+\'Q\',V:4C/2-A.1q.24.2u*3+\'Q\',S:59-A.1q.24.2u*2+\'Q\'}).1S()}6Z.E({V:4C+\'Q\',O:-cL.hb+\'Q\',2W:\'cl\'}).4S({O:-1},A.1q.24.3F,C(){A.1q.7m=H})})})})});5H.2E=a},8q:C(){A(\'#aA\').9U();A(\'#8m\').2x();A(\'#9X\').E(\'2W\',\'2B\');A(\'#a0\').bS(bz,0,C(){A(B).2x();if(A.2R.46){A(\'#a1\').2x()}});A(\'#7j\').I(0).4q=P;A(\'#7h\').I(0).4q=P;A.1q.5A=P;A.1q.7l=H;A.1q.7m=H;G H}};A.N={1v:P,3A:P,1g:P,1A:P,1o:P,T:P,7f:C(e){A.N.1g=(B.9T)?B.9T:B;A.N.1A=A.12.3W(e);A.N.1o={V:R(A(A.N.1g).E(\'V\'))||0,S:R(A(A.N.1g).E(\'S\'))||0};A.N.T={O:R(A(A.N.1g).E(\'O\'))||0,M:R(A(A.N.1g).E(\'M\'))||0};A(1c).1C(\'3t\',A.N.aO).1C(\'5n\',A.N.aN);if(28 A.N.1g.1h.bO===\'C\'){A.N.1g.1h.bO.1x(A.N.1g)}G H},aN:C(e){A(1c).3h(\'3t\',A.N.aO).3h(\'5n\',A.N.aN);if(28 A.N.1g.1h.cO===\'C\'){A.N.1g.1h.cO.1x(A.N.1g)}A.N.1g=P},aO:C(e){if(!A.N.1g){G}1A=A.12.3W(e);6c=A.N.T.O-A.N.1A.y+1A.y;77=A.N.T.M-A.N.1A.x+1A.x;6c=Z.3g(Z.3k(6c,A.N.1g.1h.7d-A.N.1o.S),A.N.1g.1h.6F);77=Z.3g(Z.3k(77,A.N.1g.1h.7c-A.N.1o.V),A.N.1g.1h.6u);if(28 A.N.1g.1h.4h===\'C\'){F a=A.N.1g.1h.4h.1x(A.N.1g,[77,6c]);if(28 a==\'eI\'&&a.1b==2){77=a[0];6c=a[1]}}A.N.1g.Y.O=6c+\'Q\';A.N.1g.Y.M=77+\'Q\';G H},2b:C(e){A(1c).1C(\'3t\',A.N.7g).1C(\'5n\',A.N.7w);A.N.1v=B.1v;A.N.3A=B.3A;A.N.1A=A.12.3W(e);A.N.1o={V:R(A(B.1v).E(\'V\'))||0,S:R(A(B.1v).E(\'S\'))||0};A.N.T={O:R(A(B.1v).E(\'O\'))||0,M:R(A(B.1v).E(\'M\'))||0};if(A.N.1v.1h.4c){A.N.1v.1h.4c.1x(A.N.1v,[B])}G H},7w:C(){A(1c).3h(\'3t\',A.N.7g).3h(\'5n\',A.N.7w);if(A.N.1v.1h.3C){A.N.1v.1h.3C.1x(A.N.1v,[A.N.3A])}A.N.1v=P;A.N.3A=P},5N:C(a,b){G Z.3k(Z.3g(A.N.1o.V+a*b,A.N.1v.1h.8O),A.N.1v.1h.5R)},5M:C(a,b){G Z.3k(Z.3g(A.N.1o.S+a*b,A.N.1v.1h.7x),A.N.1v.1h.7y)},bN:C(a){G Z.3k(Z.3g(a,A.N.1v.1h.7x),A.N.1v.1h.7y)},7g:C(e){if(A.N.1v==P){G}1A=A.12.3W(e);dx=1A.x-A.N.1A.x;dy=1A.y-A.N.1A.y;1B={V:A.N.1o.V,S:A.N.1o.S};2s={O:A.N.T.O,M:A.N.T.M};2X(A.N.3A){19\'e\':1B.V=A.N.5N(dx,1);1n;19\'eH\':1B.V=A.N.5N(dx,1);1B.S=A.N.5M(dy,1);1n;19\'w\':1B.V=A.N.5N(dx,-1);2s.M=A.N.T.M-1B.V+A.N.1o.V;1n;19\'9R\':1B.V=A.N.5N(dx,-1);2s.M=A.N.T.M-1B.V+A.N.1o.V;1B.S=A.N.5M(dy,1);1n;19\'7a\':1B.S=A.N.5M(dy,-1);2s.O=A.N.T.O-1B.S+A.N.1o.S;1B.V=A.N.5N(dx,-1);2s.M=A.N.T.M-1B.V+A.N.1o.V;1n;19\'n\':1B.S=A.N.5M(dy,-1);2s.O=A.N.T.O-1B.S+A.N.1o.S;1n;19\'9Q\':1B.S=A.N.5M(dy,-1);2s.O=A.N.T.O-1B.S+A.N.1o.S;1B.V=A.N.5N(dx,1);1n;19\'s\':1B.S=A.N.5M(dy,1);1n}if(A.N.1v.1h.44){if(A.N.3A==\'n\'||A.N.3A==\'s\')43=1B.S*A.N.1v.1h.44;L 43=1B.V;4z=A.N.bN(43*A.N.1v.1h.44);43=4z/A.N.1v.1h.44;2X(A.N.3A){19\'n\':19\'7a\':19\'9Q\':2s.O+=1B.S-4z;1n}2X(A.N.3A){19\'7a\':19\'w\':19\'9R\':2s.M+=1B.V-43;1n}1B.S=4z;1B.V=43}if(2s.O<A.N.1v.1h.6F){4z=1B.S+2s.O-A.N.1v.1h.6F;2s.O=A.N.1v.1h.6F;if(A.N.1v.1h.44){43=4z/A.N.1v.1h.44;2X(A.N.3A){19\'7a\':19\'w\':19\'9R\':2s.M+=1B.V-43;1n}1B.V=43}1B.S=4z}if(2s.M<A.N.1v.1h.6u){43=1B.V+2s.M-A.N.1v.1h.6u;2s.M=A.N.1v.1h.6u;if(A.N.1v.1h.44){4z=43*A.N.1v.1h.44;2X(A.N.3A){19\'n\':19\'7a\':19\'9Q\':2s.O+=1B.S-4z;1n}1B.S=4z}1B.V=43}if(2s.O+1B.S>A.N.1v.1h.7d){1B.S=A.N.1v.1h.7d-2s.O;if(A.N.1v.1h.44){1B.V=1B.S/A.N.1v.1h.44}}if(2s.M+1B.V>A.N.1v.1h.7c){1B.V=A.N.1v.1h.7c-2s.M;if(A.N.1v.1h.44){1B.S=1B.V*A.N.1v.1h.44}}F a=H;if(A.N.1v.1h.eG){a=A.N.1v.1h.eG.1x(A.N.1v,[1B,2s]);if(a){if(a.1o){A.1U(1B,a.1o)}if(a.T){A.1U(2s,a.T)}}}8f=A.N.1v.Y;8f.M=2s.M+\'Q\';8f.O=2s.O+\'Q\';8f.V=1B.V+\'Q\';8f.S=1B.S+\'Q\';G H},2l:C(b){if(!b||!b.3G||b.3G.1F!=6E){G}G B.1y(C(){F a=B;a.1h=b;a.1h.8O=b.8O||10;a.1h.7x=b.7x||10;a.1h.5R=b.5R||5P;a.1h.7y=b.7y||5P;a.1h.6F=b.6F||-8V;a.1h.6u=b.6u||-8V;a.1h.7c=b.7c||5P;a.1h.7d=b.7d||5P;bK=A(a).E(\'T\');if(!(bK==\'2i\'||bK==\'1J\')){a.Y.T=\'2i\'}eE=/n|9Q|e|eH|s|9R|w|7a/g;1V(i in a.1h.3G){if(i.5u().aD(eE)!=P){if(a.1h.3G[i].1F==8t){3c=A(a.1h.3G[i]);if(3c.1N()>0){a.1h.3G[i]=3c.I(0)}}if(a.1h.3G[i].4D){a.1h.3G[i].1v=a;a.1h.3G[i].3A=i;A(a.1h.3G[i]).1C(\'4R\',A.N.2b)}}}if(a.1h.5k){if(28 a.1h.5k===\'4B\'){9N=A(a.1h.5k);if(9N.1N()>0){9N.1y(C(){B.9T=a});9N.1C(\'4R\',A.N.7f)}}L if(a.1h.5k==14){A(B).1C(\'4R\',A.N.7f)}}})},4v:C(){G B.1y(C(){F a=B;1V(i in a.1h.3G){a.1h.3G[i].1v=P;a.1h.3G[i].3A=P;A(a.1h.3G[i]).3h(\'4R\',A.N.2b)}if(a.1h.5k){if(28 a.1h.5k===\'4B\'){3c=A(a.1h.5k);if(3c.1N()>0){3c.3h(\'4R\',A.N.7f)}}L if(a.1h.5k==14){A(B).3h(\'4R\',A.N.7f)}}a.1h=P})}};A.fn.1U({jk:A.N.2l,jj:A.N.4v});A.2t=P;A.6J=H;A.31=P;A.6B=[];A.9L=C(e){F a=e.6S||e.6R||-1;if(a==17||a==16){A.6J=14}};A.9J=C(e){A.6J=H};A.eB=C(e){B.f.1A=A.12.3W(e);B.f.1I=A.1U(A.12.3a(B),A.12.2f(B));B.f.4p=A.12.5O(B);B.f.1A.x-=B.f.1I.x;B.f.1A.y-=B.f.1I.y;A(B).1L(A.2t.I(0));if(B.f.hc)A.2t.2H(B.f.hc).E(\'11\',\'2v\');A.2t.E({11:\'2v\',V:\'2G\',S:\'2G\'});if(B.f.o){A.2t.E(\'1E\',B.f.o)}A.31=B;A.7A=H;A.6B=[];B.f.el.1y(C(){B.1I={x:B.7Y+(B.4u&&!A.2R.6l?R(B.4u.4y)||0:0)+(A.31.2P||0),y:B.7t+(B.4u&&!A.2R.6l?R(B.4u.4x)||0:0)+(A.31.2T||0),1D:B.3P,hb:B.5r};if(B.s==14){if(A.6J==H){B.s=H;A(B).3S(A.31.f.71)}L{A.7A=14;A.6B[A.6B.1b]=A.1m(B,\'id\')}}});A.9H.1x(B,[e]);A(1c).1C(\'3t\',A.9H).1C(\'5n\',A.bI);G H};A.9H=C(e){if(!A.31)G;A.eA.1x(A.31,[e])};A.eA=C(e){if(!A.31)G;F a=A.12.3W(e);F b=A.12.5O(A.31);a.x+=b.l-B.f.4p.l-B.f.1I.x;a.y+=b.t-B.f.4p.t-B.f.1I.y;F c=Z.3k(a.x,B.f.1A.x);F d=Z.3k(Z.3B(a.x-B.f.1A.x),Z.3B(B.f.4p.w-c));F f=Z.3k(a.y,B.f.1A.y);F g=Z.3k(Z.3B(a.y-B.f.1A.y),Z.3B(B.f.4p.h-f));if(B.2T>0&&a.y-20<B.2T){F h=Z.3k(b.t,10);f-=h;g+=h;B.2T-=h}L if(B.2T+B.f.1I.h<B.f.4p.h&&a.y+20>B.2T+B.f.1I.h){F h=Z.3k(B.f.4p.h-B.2T,10);B.2T+=h;if(B.2T!=b.t)g+=h}if(B.2P>0&&a.x-20<B.2P){F h=Z.3k(b.l,10);c-=h;d+=h;B.2P-=h}L if(B.2P+B.f.1I.w<B.f.4p.w&&a.x+20>B.2P+B.f.1I.w){F h=Z.3k(B.f.4p.w-B.2P,10);B.2P+=h;if(B.2P!=b.l)d+=h}A.2t.E({M:c+\'Q\',O:f+\'Q\',V:d+\'Q\',S:g+\'Q\'});A.2t.l=c+B.f.4p.l;A.2t.t=f+B.f.4p.t;A.2t.r=A.2t.l+d;A.2t.b=A.2t.t+g;A.7A=H;B.f.el.1y(C(){9G=A.6B.3o(A.1m(B,\'id\'));if(!(B.1I.x>A.2t.r||(B.1I.x+B.1I.1D)<A.2t.l||B.1I.y>A.2t.b||(B.1I.y+B.1I.hb)<A.2t.t)){A.7A=14;if(B.s!=14){B.s=14;A(B).2H(A.31.f.71)}if(9G!=-1){B.s=H;A(B).3S(A.31.f.71)}}L if((B.s==14)&&(9G==-1)){B.s=H;A(B).3S(A.31.f.71)}L if((!B.s)&&(A.6J==14)&&(9G!=-1)){B.s=14;A(B).2H(A.31.f.71)}});G H};A.bI=C(e){if(!A.31)G;A.ez.1x(A.31,[e])};A.ez=C(e){A(1c).3h(\'3t\',A.9H).3h(\'5n\',A.bI);if(!A.31)G;A.2t.E(\'11\',\'1k\');if(B.f.hc)A.2t.3S(B.f.hc);A.31=H;A(\'23\').1L(A.2t.I(0));if(A.7A==14){if(B.f.8d)B.f.8d(A.bF(A.1m(B,\'id\')))}L{if(B.f.8c)B.f.8c(A.bF(A.1m(B,\'id\')))}A.6B=[]};A.bF=C(s){F h=\'\';F o=[];if(a=A(\'#\'+s)){a.I(0).f.el.1y(C(){if(B.s==14){if(h.1b>0){h+=\'&\'}h+=s+\'[]=\'+A.1m(B,\'id\');o[o.1b]=A.1m(B,\'id\')}})}G{6A:h,o:o}};A.fn.jg=C(o){if(!A.2t){A(\'23\',1c).1L(\'<1W id="2t"></1W>\').1C(\'70\',A.9L).1C(\'5Q\',A.9J);A.2t=A(\'#2t\');A.2t.E({T:\'1J\',11:\'1k\'});if(1P.3N){A(\'23\',1c).1C(\'70\',A.9L).1C(\'5Q\',A.9J)}L{A(1c).1C(\'70\',A.9L).1C(\'5Q\',A.9J)}}if(!o){o={}}G B.1y(C(){if(B.ey)G;B.ey=14;B.f={a:o.3r,o:o.1E?2c(o.1E):H,71:o.ex?o.ex:H,hc:o.4G?o.4G:H,8d:o.8d?o.8d:H,8c:o.8c?o.8c:H};B.f.el=A(\'.\'+o.3r);A(B).1C(\'4R\',A.eB).E(\'T\',\'2i\')})};A.2Q={aT:1,ew:C(b){F b=b;G B.1y(C(){B.4g.69.1y(C(a){A.2Q.4s(B,b[a])})})},I:C(){F e=[];B.1y(C(b){if(B.bD){e[b]=[];F c=B;F d=A.12.2f(B);B.4g.69.1y(C(a){F x=B.7Y;F y=B.7t;7B=R(x*1Y/(d.w-B.3P));7C=R(y*1Y/(d.h-B.5r));e[b][a]=[7B||0,7C||0,x||0,y||0]})}});G e},ad:C(a){a.D.ep=a.D.1Z.w-a.D.1w.1D;a.D.eo=a.D.1Z.h-a.D.1w.hb;if(a.92.4g.bB){8Z=a.92.4g.69.I(a.bA+1);if(8Z){a.D.1Z.w=(R(A(8Z).E(\'M\'))||0)+a.D.1w.1D;a.D.1Z.h=(R(A(8Z).E(\'O\'))||0)+a.D.1w.hb}9f=a.92.4g.69.I(a.bA-1);if(9f){F b=R(A(9f).E(\'M\'))||0;F c=R(A(9f).E(\'M\'))||0;a.D.1Z.x+=b;a.D.1Z.y+=c;a.D.1Z.w-=b;a.D.1Z.h-=c}}a.D.ek=a.D.1Z.w-a.D.1w.1D;a.D.ej=a.D.1Z.h-a.D.1w.hb;if(a.D.2C){a.D.gx=((a.D.1Z.w-a.D.1w.1D)/a.D.2C)||1;a.D.gy=((a.D.1Z.h-a.D.1w.hb)/a.D.2C)||1;a.D.d1=a.D.ek/a.D.2C;a.D.d0=a.D.ej/a.D.2C}a.D.1Z.dx=a.D.1Z.x-a.D.22.x;a.D.1Z.dy=a.D.1Z.y-a.D.22.y;A.X.18.E(\'7z\',\'8T\')},3n:C(a,x,y){if(a.D.2C){d9=R(x/a.D.d1);7B=d9*1Y/a.D.2C;d5=R(y/a.D.d0);7C=d5*1Y/a.D.2C}L{7B=R(x*1Y/a.D.ep);7C=R(y*1Y/a.D.eo)}a.D.aa=[7B||0,7C||0,x||0,y||0];if(a.D.3n)a.D.3n.1x(a,a.D.aa)},d3:C(a){6K=a.6S||a.6R||-1;2X(6K){19 35:A.2Q.4s(B.3H,[91,91]);1n;19 36:A.2Q.4s(B.3H,[-91,-91]);1n;19 37:A.2Q.4s(B.3H,[-B.3H.D.gx||-1,0]);1n;19 38:A.2Q.4s(B.3H,[0,-B.3H.D.gy||-1]);1n;19 39:A.2Q.4s(B.3H,[B.3H.D.gx||1,0]);1n;19 40:A.X.4s(B.3H,[0,B.3H.D.gy||1]);1n}},4s:C(a,b){if(!a.D){G}a.D.1w=A.1U(A.12.3a(a),A.12.2f(a));a.D.22={x:R(A.E(a,\'M\'))||0,y:R(A.E(a,\'O\'))||0};a.D.49=A.E(a,\'T\');if(a.D.49!=\'2i\'&&a.D.49!=\'1J\'){a.Y.T=\'2i\'}A.X.ah(a);A.2Q.ad(a);dx=R(b[0])||0;dy=R(b[1])||0;2n=a.D.22.x+dx;2j=a.D.22.y+dy;if(a.D.2C){57=A.X.a9.1x(a,[2n,2j,dx,dy]);if(57.1F==6E){dx=57.dx;dy=57.dy}2n=a.D.22.x+dx;2j=a.D.22.y+dy}57=A.X.ae.1x(a,[2n,2j,dx,dy]);if(57&&57.1F==6E){dx=57.dx;dy=57.dy}2n=a.D.22.x+dx;2j=a.D.22.y+dy;if(a.D.4P&&(a.D.3n||a.D.2I)){A.2Q.3n(a,2n,2j)}2n=!a.D.2g||a.D.2g==\'3Z\'?2n:a.D.22.x||0;2j=!a.D.2g||a.D.2g==\'3K\'?2j:a.D.22.y||0;a.Y.M=2n+\'Q\';a.Y.O=2j+\'Q\'},2l:C(o){G B.1y(C(){if(B.bD==14||!o.3r||!A.12||!A.X||!A.1s){G}4Y=A(o.3r,B);if(4Y.1N()==0){G}F b={2e:\'7X\',4P:14,3n:o.3n&&o.3n.1F==2w?o.3n:P,2I:o.2I&&o.2I.1F==2w?o.2I:P,3c:B,1E:o.1E||H};if(o.2C&&R(o.2C)){b.2C=R(o.2C)||1;b.2C=b.2C>0?b.2C:1}if(4Y.1N()==1)4Y.6r(b);L{A(4Y.I(0)).6r(b);b.3c=P;4Y.6r(b)}4Y.70(A.2Q.d3);4Y.1m(\'aT\',A.2Q.aT++);B.bD=14;B.4g={};B.4g.ec=b.ec;B.4g.2C=b.2C;B.4g.69=4Y;B.4g.bB=o.bB?14:H;by=B;by.4g.69.1y(C(a){B.bA=a;B.92=by});if(o.5f&&o.5f.1F==6h){1V(i=o.5f.1b-1;i>=0;i--){if(o.5f[i].1F==6h&&o.5f[i].1b==2){el=B.4g.69.I(i);if(el.4D){A.2Q.4s(el,o.5f[i])}}}}})}};A.fn.1U({jc:A.2Q.2l,jb:A.2Q.ew,ja:A.2Q.I});A.2p={56:[],ea:C(){B.4W();1d=B.2S;id=A.1m(1d,\'id\');if(A.2p.56[id]!=P){1P.5h(A.2p.56[id])}1u=1d.J.3d+1;if(1d.J.1R.1b<1u){1u=1}1R=A(\'3O\',1d.J.4O);1d.J.3d=1u;if(1R.1N()>0){1R.6d(1d.J.3F,A.2p.7J)}},di:C(){B.4W();1d=B.2S;id=A.1m(1d,\'id\');if(A.2p.56[id]!=P){1P.5h(A.2p.56[id])}1u=1d.J.3d-1;1R=A(\'3O\',1d.J.4O);if(1u<1){1u=1d.J.1R.1b}1d.J.3d=1u;if(1R.1N()>0){1R.6d(1d.J.3F,A.2p.7J)}},2A:C(c){1d=1c.7o(c);if(1d.J.63){1u=1d.J.3d;6k(1u==1d.J.3d){1u=1+R(Z.63()*1d.J.1R.1b)}}L{1u=1d.J.3d+1;if(1d.J.1R.1b<1u){1u=1}}1R=A(\'3O\',1d.J.4O);1d.J.3d=1u;if(1R.1N()>0){1R.6d(1d.J.3F,A.2p.7J)}},go:C(o){F a;if(o&&o.1F==6E){if(o.21){a=1c.7o(o.21.1d);5v=1P.j8.2U.6W("#");o.21.5J=P;if(5v.1b==2){1u=R(5v[1]);1S=5v[1].48(1u,\'\');if(A.1m(a,\'id\')!=1S){1u=1}}L{1u=1}}if(o.84){o.84.4W();a=o.84.2S.2S;id=A.1m(a,\'id\');if(A.2p.56[id]!=P){1P.5h(A.2p.56[id])}5v=o.84.2U.6W("#");1u=R(5v[1]);1S=5v[1].48(1u,\'\');if(A.1m(a,\'id\')!=1S){1u=1}}if(a.J.1R.1b<1u||1u<1){1u=1}a.J.3d=1u;4t=A.12.2f(a);e4=A.12.9y(a);e3=A.12.6b(a);if(a.J.3e){a.J.3e.o.E(\'11\',\'1k\')}if(a.J.3b){a.J.3b.o.E(\'11\',\'1k\')}if(a.J.21){y=R(e4.t)+R(e3.t);if(a.J.1Q){if(a.J.1Q.4J==\'O\'){y+=a.J.1Q.45.hb}L{4t.h-=a.J.1Q.45.hb}}if(a.J.2o){if(a.J.2o&&a.J.2o.5V==\'O\'){y+=a.J.2o.45.hb}L{4t.h-=a.J.2o.45.hb}}if(!a.J.bu){a.J.e1=o.21?o.21.S:(R(a.J.21.E(\'S\'))||0);a.J.bu=o.21?o.21.V:(R(a.J.21.E(\'V\'))||0)}a.J.21.E(\'O\',y+(4t.h-a.J.e1)/2+\'Q\');a.J.21.E(\'M\',(4t.1D-a.J.bu)/2+\'Q\');a.J.21.E(\'11\',\'2v\')}1R=A(\'3O\',a.J.4O);if(1R.1N()>0){1R.6d(a.J.3F,A.2p.7J)}L{9w=A(\'a\',a.J.1Q.o).I(1u-1);A(9w).2H(a.J.1Q.5s);F b=W 8M();b.1d=A.1m(a,\'id\');b.1u=1u-1;b.2E=a.J.1R[a.J.3d-1].2E;if(b.1T){b.5J=P;A.2p.11.1x(b)}L{b.5J=A.2p.11}if(a.J.2o){a.J.2o.o.3i(a.J.1R[1u-1].5W)}}}},7J:C(){1d=B.2S.2S;1d.J.4O.E(\'11\',\'1k\');if(1d.J.1Q.5s){9w=A(\'a\',1d.J.1Q.o).3S(1d.J.1Q.5s).I(1d.J.3d-1);A(9w).2H(1d.J.1Q.5s)}F a=W 8M();a.1d=A.1m(1d,\'id\');a.1u=1d.J.3d-1;a.2E=1d.J.1R[1d.J.3d-1].2E;if(a.1T){a.5J=P;A.2p.11.1x(a)}L{a.5J=A.2p.11}if(1d.J.2o){1d.J.2o.o.3i(1d.J.1R[1d.J.3d-1].5W)}},11:C(){1d=1c.7o(B.1d);if(1d.J.3e){1d.J.3e.o.E(\'11\',\'1k\')}if(1d.J.3b){1d.J.3b.o.E(\'11\',\'1k\')}4t=A.12.2f(1d);y=0;if(1d.J.1Q){if(1d.J.1Q.4J==\'O\'){y+=1d.J.1Q.45.hb}L{4t.h-=1d.J.1Q.45.hb}}if(1d.J.2o){if(1d.J.2o&&1d.J.2o.5V==\'O\'){y+=1d.J.2o.45.hb}L{4t.h-=1d.J.2o.45.hb}}j4=A(\'.bt\',1d);y=y+(4t.h-B.S)/2;x=(4t.1D-B.V)/2;1d.J.4O.E(\'O\',y+\'Q\').E(\'M\',x+\'Q\').3i(\'<3O 2E="\'+B.2E+\'" />\');1d.J.4O.6U(1d.J.3F);3b=1d.J.3d+1;if(3b>1d.J.1R.1b){3b=1}3e=1d.J.3d-1;if(3e<1){3e=1d.J.1R.1b}1d.J.3b.o.E(\'11\',\'2v\').E(\'O\',y+\'Q\').E(\'M\',x+2*B.V/3+\'Q\').E(\'V\',B.V/3+\'Q\').E(\'S\',B.S+\'Q\').1m(\'3T\',1d.J.1R[3b-1].5W);1d.J.3b.o.I(0).2U=\'#\'+3b+A.1m(1d,\'id\');1d.J.3e.o.E(\'11\',\'2v\').E(\'O\',y+\'Q\').E(\'M\',x+\'Q\').E(\'V\',B.V/3+\'Q\').E(\'S\',B.S+\'Q\').1m(\'3T\',1d.J.1R[3e-1].5W);1d.J.3e.o.I(0).2U=\'#\'+3e+A.1m(1d,\'id\')},2l:C(o){if(!o||!o.2q||A.2p.56[o.2q])G;F a=A(\'#\'+o.2q);F c=a.I(0);if(c.Y.T!=\'1J\'&&c.Y.T!=\'2i\'){c.Y.T=\'2i\'}c.Y.2N=\'2B\';if(a.1N()==0)G;c.J={};c.J.1R=o.1R?o.1R:[];c.J.63=o.63&&o.63==14||H;7T=c.dj(\'j3\');1V(i=0;i<7T.1b;i++){6e=c.J.1R.1b;c.J.1R[6e]={2E:7T[i].2E,5W:7T[i].3T||7T[i].j2||\'\'}}if(c.J.1R.1b==0){G}c.J.49=A.1U(A.12.3a(c),A.12.2f(c));c.J.bp=A.12.9y(c);c.J.bo=A.12.6b(c);t=R(c.J.bp.t)+R(c.J.bo.t);b=R(c.J.bp.b)+R(c.J.bo.b);A(\'3O\',c).9U();c.J.3F=o.3F?o.3F:ch;if(o.4J||o.82||o.5s){c.J.1Q={};a.1L(\'<1W 68="dZ"></1W>\');c.J.1Q.o=A(\'.dZ\',c);if(o.82){c.J.1Q.82=o.82;c.J.1Q.o.2H(o.82)}if(o.5s){c.J.1Q.5s=o.5s}c.J.1Q.o.E(\'T\',\'1J\').E(\'V\',c.J.49.w+\'Q\');if(o.4J&&o.4J==\'O\'){c.J.1Q.4J=\'O\';c.J.1Q.o.E(\'O\',t+\'Q\')}L{c.J.1Q.4J=\'4e\';c.J.1Q.o.E(\'4e\',b+\'Q\')}c.J.1Q.9v=o.9v?o.9v:\' \';1V(F i=0;i<c.J.1R.1b;i++){6e=R(i)+1;c.J.1Q.o.1L(\'<a 2U="#\'+6e+o.2q+\'" 68="iY" 3T="\'+c.J.1R[i].5W+\'">\'+6e+\'</a>\'+(6e!=c.J.1R.1b?c.J.1Q.9v:\'\'))}A(\'a\',c.J.1Q.o).1C(\'4U\',C(){A.2p.go({84:B})});c.J.1Q.45=A.12.2f(c.J.1Q.o.I(0))}if(o.5V||o.81){c.J.2o={};a.1L(\'<1W 68="dW">&6G;</1W>\');c.J.2o.o=A(\'.dW\',c);if(o.81){c.J.2o.81=o.81;c.J.2o.o.2H(o.81)}c.J.2o.o.E(\'T\',\'1J\').E(\'V\',c.J.49.w+\'Q\');if(o.5V&&o.5V==\'O\'){c.J.2o.5V=\'O\';c.J.2o.o.E(\'O\',(c.J.1Q&&c.J.1Q.4J==\'O\'?c.J.1Q.45.hb+t:t)+\'Q\')}L{c.J.2o.5V=\'4e\';c.J.2o.o.E(\'4e\',(c.J.1Q&&c.J.1Q.4J==\'4e\'?c.J.1Q.45.hb+b:b)+\'Q\')}c.J.2o.45=A.12.2f(c.J.2o.o.I(0))}if(o.9j){c.J.3b={9j:o.9j};a.1L(\'<a 2U="#2\'+o.2q+\'" 68="dV">&6G;</a>\');c.J.3b.o=A(\'.dV\',c);c.J.3b.o.E(\'T\',\'1J\').E(\'11\',\'1k\').E(\'2N\',\'2B\').E(\'4a\',\'dU\').2H(c.J.3b.9j);c.J.3b.o.1C(\'4U\',A.2p.ea)}if(o.9t){c.J.3e={9t:o.9t};a.1L(\'<a 2U="#0\'+o.2q+\'" 68="dS">&6G;</a>\');c.J.3e.o=A(\'.dS\',c);c.J.3e.o.E(\'T\',\'1J\').E(\'11\',\'1k\').E(\'2N\',\'2B\').E(\'4a\',\'dU\').2H(c.J.3e.9t);c.J.3e.o.1C(\'4U\',A.2p.di)}a.aJ(\'<1W 68="bt"></1W>\');c.J.4O=A(\'.bt\',c);c.J.4O.E(\'T\',\'1J\').E(\'O\',\'2G\').E(\'M\',\'2G\').E(\'11\',\'1k\');if(o.21){a.aJ(\'<1W 68="dz" Y="11: 1k;"><3O 2E="\'+o.21+\'" /></1W>\');c.J.21=A(\'.dz\',c);c.J.21.E(\'T\',\'1J\');F d=W 8M();d.1d=o.2q;d.2E=o.21;if(d.1T){d.5J=P;A.2p.go({21:d})}L{d.5J=C(){A.2p.go({21:B})}}}L{A.2p.go({2q:c})}if(o.ba){dQ=R(o.ba)*8V}A.2p.56[o.2q]=o.ba?1P.5Y(\'A.2p.2A(\\\'\'+o.2q+\'\\\')\',dQ):P}};A.1d=A.2p.2l;A.1p={73:[],54:{},18:H,6X:P,2b:C(){if(A.X.1g==P){G}F a,3s,c,cs;A.1p.18.I(0).2Z=A.X.1g.D.5z;a=A.1p.18.I(0).Y;a.11=\'2v\';A.1p.18.1w=A.1U(A.12.3a(A.1p.18.I(0)),A.12.2f(A.1p.18.I(0)));a.V=A.X.1g.D.1w.1D+\'Q\';a.S=A.X.1g.D.1w.hb+\'Q\';3s=A.12.b2(A.X.1g);a.4M=3s.t;a.53=3s.r;a.4L=3s.b;a.4K=3s.l;if(A.X.1g.D.3L==14){c=A(A.X.1g).cA(14).I(0);cs=c.Y;cs.4M=\'2G\';cs.53=\'2G\';cs.4L=\'2G\';cs.4K=\'2G\';cs.11=\'2v\';A.1p.18.58().1L(c)}A(A.X.1g).dO(A.1p.18.I(0));A.X.1g.Y.11=\'1k\'},c7:C(e){if(!e.D.3I&&A.1s.4T.bC){if(e.D.3C)e.D.3C.1x(1g);A(e).E(\'T\',e.D.av||e.D.49);A(e).8j();A(A.1s.4T).dN(e)}A.1p.18.3S(e.D.5z).3i(\'&6G;\');A.1p.6X=P;F a=A.1p.18.I(0).Y;a.11=\'1k\';A.1p.18.dO(e);if(e.D.fx>0){A(e).6U(e.D.fx)}A(\'23\').1L(A.1p.18.I(0));F b=[];F c=H;1V(F i=0;i<A.1p.73.1b;i++){F d=A.1s.3p[A.1p.73[i]].I(0);F f=A.1m(d,\'id\');F g=A.1p.8g(f);if(d.1f.9P!=g.6A){d.1f.9P=g.6A;if(c==H&&d.1f.2I){c=d.1f.2I}g.id=f;b[b.1b]=g}}A.1p.73=[];if(c!=H&&b.1b>0){c(b)}},8n:C(e,o){if(!A.X.1g)G;F a=H;F i=0;if(e.1f.el.1N()>0){1V(i=e.1f.el.1N();i>0;i--){if(e.1f.el.I(i-1)!=A.X.1g){if(!e.5t.bb){if((e.1f.el.I(i-1).1I.y+e.1f.el.I(i-1).1I.hb/2)>A.X.1g.D.2j){a=e.1f.el.I(i-1)}L{1n}}L{if((e.1f.el.I(i-1).1I.x+e.1f.el.I(i-1).1I.1D/2)>A.X.1g.D.2n&&(e.1f.el.I(i-1).1I.y+e.1f.el.I(i-1).1I.hb/2)>A.X.1g.D.2j){a=e.1f.el.I(i-1)}}}}}if(a&&A.1p.6X!=a){A.1p.6X=a;A(a).iT(A.1p.18.I(0))}L if(!a&&(A.1p.6X!=P||A.1p.18.I(0).2S!=e)){A.1p.6X=P;A(e).1L(A.1p.18.I(0))}A.1p.18.I(0).Y.11=\'2v\'},bM:C(e){if(A.X.1g==P){G}e.1f.el.1y(C(){B.1I=A.1U(A.12.6w(B),A.12.6x(B))})},8g:C(s){F i;F h=\'\';F o={};if(s){if(A.1p.54[s]){o[s]=[];A(\'#\'+s+\' .\'+A.1p.54[s]).1y(C(){if(h.1b>0){h+=\'&\'}h+=s+\'[]=\'+A.1m(B,\'id\');o[s][o[s].1b]=A.1m(B,\'id\')})}L{1V(a in s){if(A.1p.54[s[a]]){o[s[a]]=[];A(\'#\'+s[a]+\' .\'+A.1p.54[s[a]]).1y(C(){if(h.1b>0){h+=\'&\'}h+=s[a]+\'[]=\'+A.1m(B,\'id\');o[s[a]][o[s[a]].1b]=A.1m(B,\'id\')})}}}}L{1V(i in A.1p.54){o[i]=[];A(\'#\'+i+\' .\'+A.1p.54[i]).1y(C(){if(h.1b>0){h+=\'&\'}h+=i+\'[]=\'+A.1m(B,\'id\');o[i][o[i].1b]=A.1m(B,\'id\')})}}G{6A:h,o:o}},dL:C(e){if(!e.ci){G}G B.1y(C(){if(!B.5t||!A(e).is(\'.\'+B.5t.3r))A(e).2H(B.5t.3r);A(e).6r(B.5t.D)})},4v:C(){G B.1y(C(){A(\'.\'+B.5t.3r).8j();A(B).ei();B.5t=P;B.dK=P})},2l:C(o){if(o.3r&&A.12&&A.X&&A.1s){if(!A.1p.18){A(\'23\',1c).1L(\'<1W id="dJ">&6G;</1W>\');A.1p.18=A(\'#dJ\');A.1p.18.I(0).Y.11=\'1k\'}B.ee({3r:o.3r,9F:o.9F?o.9F:H,8X:o.8X?o.8X:H,4G:o.4G?o.4G:H,76:o.76||o.ev,6C:o.6C||o.er,bC:14,2I:o.2I||o.iR,fx:o.fx?o.fx:H,3L:o.3L?14:H,5T:o.5T?o.5T:\'9S\'});G B.1y(C(){F a={5B:o.5B?14:H,dI:5P,1E:o.1E?2c(o.1E):H,5z:o.4G?o.4G:H,fx:o.fx?o.fx:H,3I:14,3L:o.3L?14:H,3c:o.3c?o.3c:P,2e:o.2e?o.2e:P,4c:o.4c&&o.4c.1F==2w?o.4c:H,4h:o.4h&&o.4h.1F==2w?o.4h:H,3C:o.3C&&o.3C.1F==2w?o.3C:H,2g:/3K|3Z/.3M(o.2g)?o.2g:H,5D:o.5D?R(o.5D)||0:H,2M:o.2M?o.2M:H};A(\'.\'+o.3r,B).6r(a);B.dK=14;B.5t={3r:o.3r,5B:o.5B?14:H,dI:5P,1E:o.1E?2c(o.1E):H,5z:o.4G?o.4G:H,fx:o.fx?o.fx:H,3I:14,3L:o.3L?14:H,3c:o.3c?o.3c:P,2e:o.2e?o.2e:P,bb:o.bb?14:H,D:a}})}}};A.fn.1U({iP:A.1p.2l,dN:A.1p.dL,iO:A.1p.4v});A.iN=A.1p.8g;A.2k={62:P,9o:H,9p:P,6a:C(e){A.2k.9o=14;A.2k.1S(e,B,14)},bk:C(e){if(A.2k.62!=B)G;A.2k.9o=H;A.2k.2x(e,B)},1S:C(e,a,b){if(A.2k.62!=P)G;if(!a){a=B}A.2k.62=a;1I=A.1U(A.12.3a(a),A.12.2f(a));7U=A(a);3T=7U.1m(\'3T\');2U=7U.1m(\'2U\');if(3T){A.2k.9p=3T;7U.1m(\'3T\',\'\');A(\'#dE\').3i(3T);if(2U)A(\'#bj\').3i(2U.48(\'iI://\',\'\'));L A(\'#bj\').3i(\'\');18=A(\'#7S\');if(a.4m.2Z){18.I(0).2Z=a.4m.2Z}L{18.I(0).2Z=\'\'}bi=A.12.2f(18.I(0));dD=b&&a.4m.T==\'bn\'?\'4e\':a.4m.T;2X(dD){19\'O\':2j=1I.y-bi.hb;2n=1I.x;1n;19\'M\':2j=1I.y;2n=1I.x-bi.1D;1n;19\'2D\':2j=1I.y;2n=1I.x+1I.1D;1n;19\'bn\':A(\'23\').1C(\'3t\',A.2k.3t);1A=A.12.3W(e);2j=1A.y+15;2n=1A.x+15;1n;8T:2j=1I.y+1I.hb;2n=1I.x;1n}18.E({O:2j+\'Q\',M:2n+\'Q\'});if(a.4m.4w==H){18.1S()}L{18.6U(a.4m.4w)}if(a.4m.2K)a.4m.2K.1x(a);7U.1C(\'86\',A.2k.2x).1C(\'4W\',A.2k.bk)}},3t:C(e){if(A.2k.62==P){A(\'23\').3h(\'3t\',A.2k.3t);G}1A=A.12.3W(e);A(\'#7S\').E({O:1A.y+15+\'Q\',M:1A.x+15+\'Q\'})},2x:C(e,a){if(!a){a=B}if(A.2k.9o!=14&&A.2k.62==a){A.2k.62=P;A(\'#7S\').6d(1);A(a).1m(\'3T\',A.2k.9p).3h(\'86\',A.2k.2x).3h(\'4W\',A.2k.bk);if(a.4m.2V)a.4m.2V.1x(a);A.2k.9p=P}},2l:C(b){if(!A.2k.18){A(\'23\').1L(\'<1W id="7S"><1W id="dE"></1W><1W id="bj"></1W></1W>\');A(\'#7S\').E({T:\'1J\',3j:5P,11:\'1k\'});A.2k.18=14}G B.1y(C(){if(A.1m(B,\'3T\')){B.4m={T:/O|4e|M|2D|bn/.3M(b.T)?b.T:\'4e\',2Z:b.2Z?b.2Z:H,4w:b.4w?b.4w:H,2K:b.2K&&b.2K.1F==2w?b.2K:H,2V:b.2V&&b.2V.1F==2w?b.2V:H};F a=A(B);a.1C(\'9r\',A.2k.1S);a.1C(\'6a\',A.2k.6a)}})}};A.fn.iH=A.2k.2l;A.7O={bl:C(e){6K=e.6S||e.6R||-1;if(6K==9){if(1P.3N){1P.3N.b6=14;1P.3N.b5=H}L{e.9b();e.99()}if(B.9q){1c.64.dv().3D="\\t";B.dB=C(){B.6a();B.dB=P}}L if(B.9m){2b=B.88;3m=B.dA;B.2m=B.2m.iG(0,2b)+"\\t"+B.2m.iF(3m);B.9m(2b+1,2b+1);B.6a()}G H}},4v:C(){G B.1y(C(){if(B.6V&&B.6V==14){A(B).3h(\'70\',A.7O.bl);B.6V=H}})},2l:C(){G B.1y(C(){if(B.4D==\'bs\'&&(!B.6V||B.6V==H)){A(B).1C(\'70\',A.7O.bl);B.6V=14}})}};A.fn.1U({iD:A.7O.2l,iC:A.7O.4v});A.12={3a:C(e){F x=0;F y=0;F a=e.Y;F b=H;if(A(e).E(\'11\')==\'1k\'){F c=a.2W;F d=a.T;b=14;a.2W=\'2B\';a.11=\'2v\';a.T=\'1J\'}F f=e;6k(f){x+=f.7Y+(f.4u&&!A.2R.6l?R(f.4u.4y)||0:0);y+=f.7t+(f.4u&&!A.2R.6l?R(f.4u.4x)||0:0);f=f.dY}f=e;6k(f&&f.4D&&f.4D.5u()!=\'23\'){x-=f.2P||0;y-=f.2T||0;f=f.2S}if(b==14){a.11=\'1k\';a.T=d;a.2W=c}G{x:x,y:y}},6x:C(a){F x=0,y=0;6k(a){x+=a.7Y||0;y+=a.7t||0;a=a.dY}G{x:x,y:y}},2f:C(e){F w=A.E(e,\'V\');F h=A.E(e,\'S\');F a=0;F b=0;F c=e.Y;if(A(e).E(\'11\')!=\'1k\'){a=e.3P;b=e.5r}L{F d=c.2W;F f=c.T;c.2W=\'2B\';c.11=\'2v\';c.T=\'1J\';a=e.3P;b=e.5r;c.11=\'1k\';c.T=f;c.2W=d}G{w:w,h:h,1D:a,hb:b}},6w:C(a){G{1D:a.3P||0,hb:a.5r||0}},a5:C(e){F h,w,de;if(e){w=e.83;h=e.7P}L{de=1c.4A;w=1P.bg||9z.bg||(de&&de.83)||1c.23.83;h=1P.bf||9z.bf||(de&&de.7P)||1c.23.7P}G{w:w,h:h}},5O:C(e){F t=0,l=0,w=0,h=0,iw=0,ih=0;if(e&&e.98.5u()!=\'23\'){t=e.2T;l=e.2P;w=e.be;h=e.bd;iw=0;ih=0}L{if(1c.4A){t=1c.4A.2T;l=1c.4A.2P;w=1c.4A.be;h=1c.4A.bd}L if(1c.23){t=1c.23.2T;l=1c.23.2P;w=1c.23.be;h=1c.23.bd}iw=9z.bg||1c.4A.83||1c.23.83||0;ih=9z.bf||1c.4A.7P||1c.23.7P||0}G{t:t,l:l,w:w,h:h,iw:iw,ih:ih}},b2:C(e,a){F c=A(e);F t=c.E(\'4M\')||\'\';F r=c.E(\'53\')||\'\';F b=c.E(\'4L\')||\'\';F l=c.E(\'4K\')||\'\';if(a)G{t:R(t)||0,r:R(r)||0,b:R(b)||0,l:R(l)};L G{t:t,r:r,b:b,l:l}},9y:C(e,a){F c=A(e);F t=c.E(\'5b\')||\'\';F r=c.E(\'5g\')||\'\';F b=c.E(\'4Q\')||\'\';F l=c.E(\'4F\')||\'\';if(a)G{t:R(t)||0,r:R(r)||0,b:R(b)||0,l:R(l)};L G{t:t,r:r,b:b,l:l}},6b:C(e,a){F c=A(e);F t=c.E(\'4x\')||\'\';F r=c.E(\'5i\')||\'\';F b=c.E(\'5d\')||\'\';F l=c.E(\'4y\')||\'\';if(a)G{t:R(t)||0,r:R(r)||0,b:R(b)||0,l:R(l)||0};L G{t:t,r:r,b:b,l:l}},3W:C(a){F x=a.iB||(a.iz+(1c.4A.2P||1c.23.2P))||0;F y=a.iy||(a.ix+(1c.4A.2T||1c.23.2T))||0;G{x:x,y:y}},bH:C(a,b){b(a);a=a.6M;6k(a){A.12.bH(a,b);a=a.iv}},ji:C(c){A.12.bH(c,C(a){1V(F b in a){if(28 a[b]===\'C\'){a[b]=P}}})},ir:C(a,b){F c=A.12.5O();F d=A.12.2f(a);if(!b||b==\'3K\')A(a).E({O:c.t+((Z.3g(c.h,c.ih)-c.t-d.hb)/2)+\'Q\'});if(!b||b==\'3Z\')A(a).E({M:c.l+((Z.3g(c.w,c.iw)-c.l-d.1D)/2)+\'Q\'})},iq:C(a,b){F c=A(\'3O[@2E*="7q"]\',a||1c),7q;c.1y(C(){7q=B.2E;B.2E=b;B.Y.4X="9x:9C.9E.ip(2E=\'"+7q+"\')"})}};[].3o||(6h.jn.3o=C(v,n){n=(n==P)?0:n;F m=B.1b;1V(F i=n;i<m;i++)if(B[i]==v)G i;G-1});',62,1202,'||||||||||||||||||||||||||||||||||||jQuery|this|function|dragCfg|css|var|return|false|get|ss|iAuto|else|left|iResize|top|null|px|parseInt|height|position|oldStyle|width|new|iDrag|style|Math||display|iUtil||true||||helper|case|autoCFG|length|document|slideshow|easing|dropCfg|dragged|resizeOptions|carouselCfg|interfaceFX|none|speed|attr|break|sizes|iSort|ImageBox|queue|iDrop|iAutoscroller|slide|resizeElement|oC|apply|each|fisheyeCfg|pointer|newSizes|bind|wb|opacity|constructor|custom|duration|pos|absolute|type|append|items|size|255|window|slideslinks|images|show|complete|extend|for|div|elsToScroll|100|cont||loader|oR|body|options||oldP||typeof|callback|accordionCfg|start|parseFloat||containment|getSize|axis|selectedItem|relative|ny|iTooltip|build|value|nx|slideCaption|islideshow|container|subject|newPosition|selectHelper|border|block|Function|hide|itemWidth|dequeue|timer|hidden|fractions|right|src|PI|0px|addClass|onChange|parentData|onShow|result|cursorAt|overflow|transferHelper|scrollLeft|iSlider|browser|parentNode|scrollTop|href|onHide|visibility|switch|wrapper|className|pre|selectdrug|||||||||getPosition|nextslide|handle|currentslide|prevslide|step|max|unbind|html|zIndex|min|iExpander|end|onSlide|indexOf|zones|iframe|accept|margins|mousemove|canvas|to|item|createElement|multipleSeparator|highlighted|resizeDirection|abs|onStop|text|toggle|fadeDuration|handlers|dragElem|so|distance|vertically|ghosting|test|event|img|offsetWidth|startLeft|pageSize|removeClass|title|out|startTop|getPointer|lastSuggestion|DropOutDirectiont|horizontally||down||nWidth|ratio|dimm|msie||replace|oP|fontSize|lastValue|onStart|currentPointer|bottom|ifxFirstDisplay|slideCfg|onDrag|clear|context|elToScroll|up|tooltipCFG|fxCheckTag|rel|scr|onclick|endLeft|dragmoveBy|slidePos|currentStyle|destroy|delay|borderTopWidth|borderLeftWidth|nHeight|documentElement|string|containerW|tagName|iteration|paddingLeft|helperclass|endTop|halign|linksPosition|marginLeft|marginBottom|marginTop|OpenClose|holder|si|paddingBottom|mousedown|animate|overzone|click|onDragModifier|blur|filter|toDrag|getAttribute||cos|cnt|marginRight|collected||slideshows|newCoords|empty|containerH|elementData|paddingTop|puff|borderBottomWidth|animationHandler|values|paddingRight|clearInterval|borderRightWidth|pow|dragHandle|BlindDirection|post|mouseup|close|onSelect|fxh|offsetHeight|activeLinkClass|sortCfg|toLowerCase|url|currentPanel|point|grid|hpc|currentRel|revert|captionText|snapDistance|Scale|nextImage|prevImage|imageEl|orig|onload|iFisheye|parseColor|getHeight|getWidth|getScroll|3000|keyup|maxWidth|curCSS|tolerance|reflections|captionPosition|caption|margin|setInterval|outerContainer||itemHeight|current|random|selection|limit|Expander|128|class|sliders|focus|getBorder|newTop|fadeOut|indic|user|init|Array|frameClass|ActiveXObject|while|opera|from|open|oD|Date|proximity|Draggable|0x|F0|minLeft|rgb|getSizeLite|getPositionLite|getTime|positionItems|hash|selectCurrent|onOut|onClick|Object|minTop|nbsp|onHighlight|np|selectKeyHelper|pressedKey|accordionPos|firstChild|139|scrollIntoView|backgroundColor|oldStyleAttr|keyCode|charCode|direction|fadeIn|hasTabsEnabled|split|inFrontOf|radiusY|captionEl|keydown|sc|selectClass|changed|times||onHover|newLeft||efx|nw|li|maxRight|maxBottom|classname|startDrag|move|ImageBoxNextImage|nRx|ImageBoxPrevImage|nRy|opened|animationInProgress|400|getElementById|count|png|overlay|alpha|offsetTop|containerSize|cssSides|stop|minHeight|maxHeight|cursor|selectedone|xproc|yproc|bounceout|padding|gallery|increment|namedColors|applyOn|showImage|reflectionSize|sin|object|directionIncrement|iTTabs|clientHeight|select|activeClass|tooltipHelper|imgs|jEl|insideParent|content|parent|offsetLeft|parentBorders||captionClass|linksClass|clientWidth|link||mouseout|fontWeight|selectionStart|expand|panels|createTextNode|onselectstop|onselect|hight|elS|serialize|dir|diffHeight|DraggableDestroy|nextImageEl|prevImageEl|ImageBoxOuterContainer|checkhover|blind|iCarousel|hideImage|hidehelper|diffWidth|String|sl|st|prot|auto|diffY|diffX|headers|rule|getFieldValues|styleSheets|borderColor|positionContainer|image|getValues|dragstop|linkRel|itemsText|isDraggable|Image|minchars|minWidth|panelSelector|exec|192|isDroppable|default|211|1000|5625|hoverclass|headerSelector|next|ul|2000|SliderContainer|protectRotation|childs|oldVisibility|source|setTimeout|nodeName|stopPropagation|startTime|preventDefault|hoverClass|cssText|1px|prev|unfold|DoFold|unit|nextslideClass|multiple|itemMinWidth|setSelectionRange|destroyWrapper|focused|oldTitle|createTextRange|mouseover|inCache|prevslideClass|buildWrapper|linksSeparator|lnk|progid|getPadding|self|ScrollTo|9999|DXImageTransform|helperClass|Microsoft|activeclass|iIndex|selectcheck|onDrop|selectKeyUp|autofill|selectKeyDown|panelHeight|handleEl|onActivate|os|ne|sw|intersect|dragEl|remove|data|textAlign|ImageBoxCaption|closeEl|captionImages|ImageBoxOverlay|ImageBoxIframe|clearTimeout|keyPressed|fade|getClient|Alpha|shake|Shake|snapToGrid|lastSi|scroll||modifyContainer|fitToContainer|currentValue|zoom|getContainment|firstStep|paddingLeftSize|paddingBottomSize|paddingRightSize|paddingTopSize|borderLeftSize|borderBottomSize|borderRightSize|borderTopSize|autoSize|shrink|pulse|Pulsate|initialPosition|imageSrc|parseStyle|sliderPos|center|ImageBoxCurrentImage|loadImage|parentPos|match|dragmove|stopAnim|pause|Color|unselectable|prepend|borderWidth|cssSidesEnd|draginit|stopDrag|moveDrag|asin|bouncein|paddingY|paddingX|tabindex|writeItems|INPUT|10000|169|index|sliderSize|no|linear|getMargins|spacer|rotationSpeed|returnValue|cancelBubble|transparent|angle|autocomplete|autoplay|floats|extraWidth|scrollHeight|scrollWidth|innerHeight|innerWidth|character|helperSize|tooltipURL|hidefocused|doTab|Number|mouse|oBor|oPad|entities||TEXTAREA|slideshowHolder|loaderWidth|inputWidth|RegExp|letterSpacing|sliderEl|300|SliderIteration|restricted|sortable|isSlider|bounce|Selectserialize|idsa|traverseDOM|selectstop|elm|elPosition|restore|measure|getHeightMinMax|onDragStart|fit|clientSize|field|fadeTo|ImageBoxContainer|on|listStyle|ImageBoxLoader|dragHelper|ImageBoxCaptionImages|getContext|ImageBoxCaptionText|update|imagebox|BlindUp|hrefAttr|relAttr|SlideOutUp|check|checkdrop|textImageFrom|textImage|overlayOpacity|jpg|closeHTML|gif|loaderSRC|imageTypes|500|childNodes|itransferTo|highlight|visible|horizontal|vertical|parts|paddingLeftUnit|paddingBottomUnit|paddingRightUnit||paddingTopUnit|borderLeftUnit|borderBottomUnit|borderRightUnit|borderTopUnit|fontUnit|grow|clone|sqrt|textDecoration|dragstart|trim|isFunction|valign|userSelect|fxe|KhtmlUserSelect|Width|captionSize|dhe|colorCssProps|onDragStop|iAccordion|cssProps|doScroll|144|224|230|keypress|off|150|140|107|fracH|fracW|easeout|dragmoveByKey|autocompleteHelper|yfrac|165|scrolling|radiusX|xfrac|frameborder|245|javascript|240||autocompleteIframe|999|protect|goprev|getElementsByTagName|styleFloat||parte|insertBefore|itemZIndex|interfaceColorFX|fold|mousex|leftUnit|topUnit|fakeAccordionClass|createRange|getSelectionStart|||slideshowLoader|selectionEnd|onblur|moveStart|filteredPosition|tooltipTitle|togglehor|togglever|inputValue|zindex|sortHelper|isSortable|addItem|checkCache|SortableAddItem|after|BlindDown|time|SlideInUp|slideshowPrevslide|elType|30px|slideshowNextSlide|slideshowCaption|expanderHelper|offsetParent|slideshowLinks|boxModel|loaderHeight||slideBor|slidePad|htmlEntities|wordSpacing|fontVariant|fontStretch|fontStyle|gonext|fontFamily|onslide|clickItem|Droppable||rgba||DroppableDestroy|maxy|maxx|||hoverItem|containerMaxy|containerMaxx||onout|addColorStop||iBounce|onhover|set|selectedclass|isSelectable|selectstopApply|selectcheckApply|selectstart|shc|360|directions|remeasure|onResize|se|array|scale|success|param|translate|POST|number|load|ajax|save|name|khtml|moz|find|ondragstart|onselectstart|lineHeigt|mozUserSelect|ImageBoxClose|bmp|jpeg|finishx|112|starty|first|last|firstResize|startx|imageLoaded|Showing|finishOpacity|110|Accordion|loading|TransferTo|SlideToggleRight|SlideOutRight|SlideInRight|SlideToggleLeft|SlideOutLeft|SlideInLeft||SlideToggleDown|SlideOutDown|SlideInDown|SlideToggleUp|scrollTo|ScrollToAnchors|flipv|pt|Puff||Shrink|Fisheye||Grow|OpenHorizontally|OpenVertically|SwitchVertically|SwitchHorizontally|CloseHorizontally|CloseVertically|toUpperCase|100000000|selectorText|rules|cssRules|borderStyle|outset|inset|ridge|resize|groove|double|solid|dashed|dotted|isNaN|fromHandler|stopAll|MozUserSelect|Left|Bottom|Right|Top|outlineColor|color|borderTopColor|borderRightColor|borderLeftColor|borderBottomColor|textIndent|outlineWidth|elasticboth|outlineOffset|wh|elasticout|lineHeight|yellow|white|silver|red|purple|203||pink|orange|olive|navy||maroon|magenta|lime|||elasticin|lightyellow|193|182|lightpink|bounceboth|lightgrey|238|lightgreen|lightcyan|Autocomplete|216|173|200|984375|lightblue|khaki|130|625|indigo|green|215|9375|gold|fuchsia|148|darkviolet|122|233|darksalmon|darkred|204|153|darkorchid|darkorange|30002|list|darkolivegreen|||darkmagenta|183|189|darkkhaki|easeboth|darkgreen|30001|darkgrey|darkcyan|darkblue|cyan|easein|brown|blue||black|hover|220|beige|azure|aqua|appendChild|cssFloat|fxWrapper|ol|table|fix|form|button|nodeValue|textarea|input|w_|float|Carousel|removeChild|meta|optgroup|option|frameset|frame|script|header|th|colgroup|col|tfoot|thead|tbody|td|tr|Highlight|FoldToggle|UnFold|Fold|DropToggleRight|DropInRight|DropOutRight|DropToggleLeft|DropInLeft|DropOutLeft|DropToggleUp||DropInUp||DropOutUp||DropToggleDown|100000|DropInDown|duplicate|DropOutDown||120|AlphaImageLoader|fixPNG|centerEl||rotationTimer|maxRotation|nextSibling||clientY|pageY|clientX|Bounce|pageX|DisableTabs|EnableTabs|moveEnd|substr|substring|ToolTip|http|collapse|BlindToggleHorizontally|BlindRight|BlindLeft|SortSerialize|SortableDestroy|Sortable|BlindToggleVertically|onchange|fillRect|before|Autoexpand|fill|password|WebKit|slideshowLink|quot|lt|amp|alt|IMG|par|appVersion|pW|navigator|location|fillStyle|SliderGetValues|SliderSetValues|Slider|recallDroppables|ondrop|createLinearGradient|Selectable|destination|purgeEvents|ResizableDestroy|Resizable|globalCompositeOperation|drawImage|prototype'.split('|'),0,{}))
diff -uNr a/mp-wp/wp-includes/js/jquery/jquery.color.js b/mp-wp/wp-includes/js/jquery/jquery.color.js
--- a/mp-wp/wp-includes/js/jquery/jquery.color.js e62baba43b453728b656000845e11ca673ed970e09ccc1271033decbc9acc02f309fd537b73cb5b063b76a7df98517cae28a47aef8c588fbff1d64bb6cbf1211
+++ b/mp-wp/wp-includes/js/jquery/jquery.color.js false
@@ -1,128 +0,0 @@
-/*
- * jQuery Color Animations
- * Copyright 2007 John Resig
- * Released under the MIT and GPL licenses.
- */
-
-(function(jQuery){
-
-    // We override the animation for all of these color styles
-    jQuery.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], function(i,attr){
-        jQuery.fx.step[attr] = function(fx){
-            if ( fx.state == 0 ) {
-                fx.start = getColor( fx.elem, attr );
-                fx.end = getRGB( fx.end );
-            }
-
-            fx.elem.style[attr] = "rgb(" + [
-                Math.max(Math.min( parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0]), 255), 0),
-                Math.max(Math.min( parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1]), 255), 0),
-                Math.max(Math.min( parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2]), 255), 0)
-            ].join(",") + ")";
-        }
-    });
-
-    // Color Conversion functions from highlightFade
-    // By Blair Mitchelmore
-    // http://jquery.offput.ca/highlightFade/
-
-    // Parse strings looking for color tuples [255,255,255]
-    function getRGB(color) {
-        var result;
-
-        // Check if we're already dealing with an array of colors
-        if ( color && color.constructor == Array && color.length == 3 )
-            return color;
-
-        // Look for rgb(num,num,num)
-        if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
-            return [parseInt(result[1]), parseInt(result[2]), parseInt(result[3])];
-
-        // Look for rgb(num%,num%,num%)
-        if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
-            return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
-
-        // Look for #a0b1c2
-        if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
-            return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
-
-        // Look for #fff
-        if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
-            return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
-
-        // Look for rgba(0, 0, 0, 0) == transparent in Safari 3
-        if (result = /rgba\(0, 0, 0, 0\)/.exec(color))
-            return colors['transparent']
-
-        // Otherwise, we're most likely dealing with a named color
-        return colors[jQuery.trim(color).toLowerCase()];
-    }
-
-    function getColor(elem, attr) {
-        var color;
-
-        do {
-            color = jQuery.curCSS(elem, attr);
-
-            // Keep going until we find an element that has color, or we hit the body
-            if ( color != '' && color != 'transparent' || jQuery.nodeName(elem, "body") )
-                break;
-
-            attr = "backgroundColor";
-        } while ( elem = elem.parentNode );
-
-        return getRGB(color);
-    };
-
-    // Some named colors to work with
-    // From Interface by Stefan Petre
-    // http://interface.eyecon.ro/
-
-    var colors = {
-        aqua:[0,255,255],
-        azure:[240,255,255],
-        beige:[245,245,220],
-        black:[0,0,0],
-        blue:[0,0,255],
-        brown:[165,42,42],
-        cyan:[0,255,255],
-        darkblue:[0,0,139],
-        darkcyan:[0,139,139],
-        darkgrey:[169,169,169],
-        darkgreen:[0,100,0],
-        darkkhaki:[189,183,107],
-        darkmagenta:[139,0,139],
-        darkolivegreen:[85,107,47],
-        darkorange:[255,140,0],
-        darkorchid:[153,50,204],
-        darkred:[139,0,0],
-        darksalmon:[233,150,122],
-        darkviolet:[148,0,211],
-        fuchsia:[255,0,255],
-        gold:[255,215,0],
-        green:[0,128,0],
-        indigo:[75,0,130],
-        khaki:[240,230,140],
-        lightblue:[173,216,230],
-        lightcyan:[224,255,255],
-        lightgreen:[144,238,144],
-        lightgrey:[211,211,211],
-        lightpink:[255,182,193],
-        lightyellow:[255,255,224],
-        lime:[0,255,0],
-        magenta:[255,0,255],
-        maroon:[128,0,0],
-        navy:[0,0,128],
-        olive:[128,128,0],
-        orange:[255,165,0],
-        pink:[255,192,203],
-        purple:[128,0,128],
-        violet:[128,0,128],
-        red:[255,0,0],
-        silver:[192,192,192],
-        white:[255,255,255],
-        yellow:[255,255,0],
-        transparent: [255,255,255]
-    };
-
-})(jQuery);
diff -uNr a/mp-wp/wp-includes/js/jquery/jquery.form.js b/mp-wp/wp-includes/js/jquery/jquery.form.js
--- a/mp-wp/wp-includes/js/jquery/jquery.form.js d9a49a9ac649969b2fdc809e43fe110f7c946427bc16d48e5247d150d4d8a223d3a388f62a8d6ece987c4c9307736a2e3faf2db3c25c47596822b7aa16a1e53e
+++ b/mp-wp/wp-includes/js/jquery/jquery.form.js false
@@ -1,872 +0,0 @@
-/*
- * jQuery Form Plugin
- * version: 2.02 (12/16/2007)
- * @requires jQuery v1.1 or later
- *
- * Examples at: http://malsup.com/jquery/form/
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- *
- * Revision: $Id$
- */
- (function($) {
-/**
- * ajaxSubmit() provides a mechanism for submitting an HTML form using AJAX.
- *
- * ajaxSubmit accepts a single argument which can be either a success callback function
- * or an options Object.  If a function is provided it will be invoked upon successful
- * completion of the submit and will be passed the response from the server.
- * If an options Object is provided, the following attributes are supported:
- *
- *  target:   Identifies the element(s) in the page to be updated with the server response.
- *            This value may be specified as a jQuery selection string, a jQuery object,
- *            or a DOM element.
- *            default value: null
- *
- *  url:      URL to which the form data will be submitted.
- *            default value: value of form's 'action' attribute
- *
- *  type:     The method in which the form data should be submitted, 'GET' or 'POST'.
- *            default value: value of form's 'method' attribute (or 'GET' if none found)
- *
- *  data:     Additional data to add to the request, specified as key/value pairs (see $.ajax).
- *
- *  beforeSubmit:  Callback method to be invoked before the form is submitted.
- *            default value: null
- *
- *  success:  Callback method to be invoked after the form has been successfully submitted
- *            and the response has been returned from the server
- *            default value: null
- *
- *  dataType: Expected dataType of the response.  One of: null, 'xml', 'script', or 'json'
- *            default value: null
- *
- *  semantic: Boolean flag indicating whether data must be submitted in semantic order (slower).
- *            default value: false
- *
- *  resetForm: Boolean flag indicating whether the form should be reset if the submit is successful
- *
- *  clearForm: Boolean flag indicating whether the form should be cleared if the submit is successful
- *
- *
- * The 'beforeSubmit' callback can be provided as a hook for running pre-submit logic or for
- * validating the form data.  If the 'beforeSubmit' callback returns false then the form will
- * not be submitted. The 'beforeSubmit' callback is invoked with three arguments: the form data
- * in array format, the jQuery object, and the options object passed into ajaxSubmit.
- * The form data array takes the following form:
- *
- *     [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
- *
- * If a 'success' callback method is provided it is invoked after the response has been returned
- * from the server.  It is passed the responseText or responseXML value (depending on dataType).
- * See jQuery.ajax for further details.
- *
- *
- * The dataType option provides a means for specifying how the server response should be handled.
- * This maps directly to the jQuery.httpData method.  The following values are supported:
- *
- *      'xml':    if dataType == 'xml' the server response is treated as XML and the 'success'
- *                   callback method, if specified, will be passed the responseXML value
- *      'json':   if dataType == 'json' the server response will be evaluted and passed to
- *                   the 'success' callback, if specified
- *      'script': if dataType == 'script' the server response is evaluated in the global context
- *
- *
- * Note that it does not make sense to use both the 'target' and 'dataType' options.  If both
- * are provided the target will be ignored.
- *
- * The semantic argument can be used to force form serialization in semantic order.
- * This is normally true anyway, unless the form contains input elements of type='image'.
- * If your form must be submitted with name/value pairs in semantic order and your form
- * contains an input of type='image" then pass true for this arg, otherwise pass false
- * (or nothing) to avoid the overhead for this logic.
- *
- *
- * When used on its own, ajaxSubmit() is typically bound to a form's submit event like this:
- *
- * $("#form-id").submit(function() {
- *     $(this).ajaxSubmit(options);
- *     return false; // cancel conventional submit
- * });
- *
- * When using ajaxForm(), however, this is done for you.
- *
- * @example
- * $('#myForm').ajaxSubmit(function(data) {
- *     alert('Form submit succeeded! Server returned: ' + data);
- * });
- * @desc Submit form and alert server response
- *
- *
- * @example
- * var options = {
- *     target: '#myTargetDiv'
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc Submit form and update page element with server response
- *
- *
- * @example
- * var options = {
- *     success: function(responseText) {
- *         alert(responseText);
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc Submit form and alert the server response
- *
- *
- * @example
- * var options = {
- *     beforeSubmit: function(formArray, jqForm) {
- *         if (formArray.length == 0) {
- *             alert('Please enter data.');
- *             return false;
- *         }
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc Pre-submit validation which aborts the submit operation if form data is empty
- *
- *
- * @example
- * var options = {
- *     url: myJsonUrl.php,
- *     dataType: 'json',
- *     success: function(data) {
- *        // 'data' is an object representing the the evaluated json data
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc json data returned and evaluated
- *
- *
- * @example
- * var options = {
- *     url: myXmlUrl.php,
- *     dataType: 'xml',
- *     success: function(responseXML) {
- *        // responseXML is XML document object
- *        var data = $('myElement', responseXML).text();
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc XML data returned from server
- *
- *
- * @example
- * var options = {
- *     resetForm: true
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc submit form and reset it if successful
- *
- * @example
- * $('#myForm).submit(function() {
- *    $(this).ajaxSubmit();
- *    return false;
- * });
- * @desc Bind form's submit event to use ajaxSubmit
- *
- *
- * @name ajaxSubmit
- * @type jQuery
- * @param options  object literal containing options which control the form submission process
- * @cat Plugins/Form
- * @return jQuery
- */
-$.fn.ajaxSubmit = function(options) {
-    if (typeof options == 'function')
-        options = { success: options };
-
-    options = $.extend({
-        url:  this.attr('action') || window.location.toString(),
-        type: this.attr('method') || 'GET'
-    }, options || {});
-
-    // hook for manipulating the form data before it is extracted;
-    // convenient for use with rich editors
-    var veto = {};
-    $.event.trigger('form.pre.serialize', [this, options, veto]);
-    if (veto.veto) return this;
-
-    var a = this.formToArray(options.semantic);
-	if (options.data) {
-	    for (var n in options.data)
-	        a.push( { name: n, value: options.data[n] } );
-	}
-
-    // give pre-submit callback an opportunity to abort the submit
-    if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) return this;
-
-    // fire vetoable 'validate' event
-    $.event.trigger('form.submit.validate', [a, this, options, veto]);
-    if (veto.veto) return this;
-
-    var q = $.param(a);//.replace(/%20/g,'+');
-
-    if (options.type.toUpperCase() == 'GET') {
-        options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
-        options.data = null;  // data is null for 'get'
-    }
-    else
-        options.data = q; // data is the query string for 'post'
-
-    var $form = this, callbacks = [];
-    if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
-    if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
-
-    // perform a load on the target only if dataType is not provided
-    if (!options.dataType && options.target) {
-        var oldSuccess = options.success || function(){};
-        callbacks.push(function(data) {
-            if (this.evalScripts)
-                $(options.target).attr("innerHTML", data).evalScripts().each(oldSuccess, arguments);
-            else // jQuery v1.1.4
-                $(options.target).html(data).each(oldSuccess, arguments);
-        });
-    }
-    else if (options.success)
-        callbacks.push(options.success);
-
-    options.success = function(data, status) {
-        for (var i=0, max=callbacks.length; i < max; i++)
-            callbacks[i](data, status, $form);
-    };
-
-    // are there files to upload?
-    var files = $('input:file', this).fieldValue();
-    var found = false;
-    for (var j=0; j < files.length; j++)
-        if (files[j])
-            found = true;
-
-    // options.iframe allows user to force iframe mode
-   if (options.iframe || found) { 
-       // hack to fix Safari hang (thanks to Tim Molendijk for this)
-       // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
-       if ($.browser.safari && options.closeKeepAlive)
-           $.get(options.closeKeepAlive, fileUpload);
-       else
-           fileUpload();
-       }
-   else
-       $.ajax(options);
-
-    // fire 'notify' event
-    $.event.trigger('form.submit.notify', [this, options]);
-    return this;
-
-
-    // private function for handling file uploads (hat tip to YAHOO!)
-    function fileUpload() {
-        var form = $form[0];
-        var opts = $.extend({}, $.ajaxSettings, options);
-
-        var id = 'jqFormIO' + $.fn.ajaxSubmit.counter++;
-        var $io = $('<iframe id="' + id + '" name="' + id + '" />');
-        var io = $io[0];
-        var op8 = $.browser.opera && window.opera.version() < 9;
-        if ($.browser.msie || op8) io.src = 'javascript:false;document.write("");';
-        $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
-
-        var xhr = { // mock object
-            responseText: null,
-            responseXML: null,
-            status: 0,
-            statusText: 'n/a',
-            getAllResponseHeaders: function() {},
-            getResponseHeader: function() {},
-            setRequestHeader: function() {}
-        };
-
-        var g = opts.global;
-        // trigger ajax global events so that activity/block indicators work like normal
-        if (g && ! $.active++) $.event.trigger("ajaxStart");
-        if (g) $.event.trigger("ajaxSend", [xhr, opts]);
-
-        var cbInvoked = 0;
-        var timedOut = 0;
-
-        // take a breath so that pending repaints get some cpu time before the upload starts
-        setTimeout(function() {
-            // make sure form attrs are set
-            var encAttr = form.encoding ? 'encoding' : 'enctype';
-            var t = $form.attr('target');
-            $form.attr({
-                target:   id,
-                method:  'POST',
-                action:   opts.url
-            });
-            form[encAttr] = 'multipart/form-data';
-
-            // support timout
-            if (opts.timeout)
-                setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
-
-            // add iframe to doc and submit the form
-            $io.appendTo('body');
-            io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
-            form.submit();
-            $form.attr('target', t); // reset target
-        }, 10);
-
-        function cb() {
-            if (cbInvoked++) return;
-
-            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
-
-            var ok = true;
-            try {
-                if (timedOut) throw 'timeout';
-                // extract the server response from the iframe
-                var data, doc;
-                doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
-                xhr.responseText = doc.body ? doc.body.innerHTML : null;
-                xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
-
-                if (opts.dataType == 'json' || opts.dataType == 'script') {
-                    var ta = doc.getElementsByTagName('textarea')[0];
-                    data = ta ? ta.value : xhr.responseText;
-                    if (opts.dataType == 'json')
-                        eval("data = " + data);
-                    else
-                        $.globalEval(data);
-                }
-                else if (opts.dataType == 'xml') {
-                    data = xhr.responseXML;
-                    if (!data && xhr.responseText != null)
-                        data = toXml(xhr.responseText);
-                }
-                else {
-                    data = xhr.responseText;
-                }
-            }
-            catch(e){
-                ok = false;
-                $.handleError(opts, xhr, 'error', e);
-            }
-
-            // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
-            if (ok) {
-                opts.success(data, 'success');
-                if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
-            }
-            if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
-            if (g && ! --$.active) $.event.trigger("ajaxStop");
-            if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
-
-            // clean up
-            setTimeout(function() {
-                $io.remove();
-                xhr.responseXML = null;
-            }, 100);
-        };
-
-        function toXml(s, doc) {
-            if (window.ActiveXObject) {
-                doc = new ActiveXObject('Microsoft.XMLDOM');
-                doc.async = 'false';
-                doc.loadXML(s);
-            }
-            else
-                doc = (new DOMParser()).parseFromString(s, 'text/xml');
-            return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
-        };
-    };
-};
-$.fn.ajaxSubmit.counter = 0; // used to create unique iframe ids
-
-/**
- * ajaxForm() provides a mechanism for fully automating form submission.
- *
- * The advantages of using this method instead of ajaxSubmit() are:
- *
- * 1: This method will include coordinates for <input type="image" /> elements (if the element
- *    is used to submit the form).
- * 2. This method will include the submit element's name/value data (for the element that was
- *    used to submit the form).
- * 3. This method binds the submit() method to the form for you.
- *
- * Note that for accurate x/y coordinates of image submit elements in all browsers
- * you need to also use the "dimensions" plugin (this method will auto-detect its presence).
- *
- * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
- * passes the options argument along after properly binding events for submit elements and
- * the form itself.  See ajaxSubmit for a full description of the options argument.
- *
- *
- * @example
- * var options = {
- *     target: '#myTargetDiv'
- * };
- * $('#myForm').ajaxSForm(options);
- * @desc Bind form's submit event so that 'myTargetDiv' is updated with the server response
- *       when the form is submitted.
- *
- *
- * @example
- * var options = {
- *     success: function(responseText) {
- *         alert(responseText);
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc Bind form's submit event so that server response is alerted after the form is submitted.
- *
- *
- * @example
- * var options = {
- *     beforeSubmit: function(formArray, jqForm) {
- *         if (formArray.length == 0) {
- *             alert('Please enter data.');
- *             return false;
- *         }
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc Bind form's submit event so that pre-submit callback is invoked before the form
- *       is submitted.
- *
- *
- * @name   ajaxForm
- * @param  options  object literal containing options which control the form submission process
- * @return jQuery
- * @cat    Plugins/Form
- * @type   jQuery
- */
-$.fn.ajaxForm = function(options) {
-    return this.ajaxFormUnbind().submit(submitHandler).each(function() {
-        // store options in hash
-        this.formPluginId = $.fn.ajaxForm.counter++;
-        $.fn.ajaxForm.optionHash[this.formPluginId] = options;
-        $(":submit,input:image", this).click(clickHandler);
-    });
-};
-
-$.fn.ajaxForm.counter = 1;
-$.fn.ajaxForm.optionHash = {};
-
-function clickHandler(e) {
-    var $form = this.form;
-    $form.clk = this;
-    if (this.type == 'image') {
-        if (e.offsetX != undefined) {
-            $form.clk_x = e.offsetX;
-            $form.clk_y = e.offsetY;
-        } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
-            var offset = $(this).offset();
-            $form.clk_x = e.pageX - offset.left;
-            $form.clk_y = e.pageY - offset.top;
-        } else {
-            $form.clk_x = e.pageX - this.offsetLeft;
-            $form.clk_y = e.pageY - this.offsetTop;
-        }
-    }
-    // clear form vars
-    setTimeout(function() { $form.clk = $form.clk_x = $form.clk_y = null; }, 10);
-};
-
-function submitHandler() {
-    // retrieve options from hash
-    var id = this.formPluginId;
-    var options = $.fn.ajaxForm.optionHash[id];
-    $(this).ajaxSubmit(options);
-    return false;
-};
-
-/**
- * ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
- *
- * @name   ajaxFormUnbind
- * @return jQuery
- * @cat    Plugins/Form
- * @type   jQuery
- */
-$.fn.ajaxFormUnbind = function() {
-    this.unbind('submit', submitHandler);
-    return this.each(function() {
-        $(":submit,input:image", this).unbind('click', clickHandler);
-    });
-
-};
-
-/**
- * formToArray() gathers form element data into an array of objects that can
- * be passed to any of the following ajax functions: $.get, $.post, or load.
- * Each object in the array has both a 'name' and 'value' property.  An example of
- * an array for a simple login form might be:
- *
- * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
- *
- * It is this array that is passed to pre-submit callback functions provided to the
- * ajaxSubmit() and ajaxForm() methods.
- *
- * The semantic argument can be used to force form serialization in semantic order.
- * This is normally true anyway, unless the form contains input elements of type='image'.
- * If your form must be submitted with name/value pairs in semantic order and your form
- * contains an input of type='image" then pass true for this arg, otherwise pass false
- * (or nothing) to avoid the overhead for this logic.
- *
- * @example var data = $("#myForm").formToArray();
- * $.post( "myscript.cgi", data );
- * @desc Collect all the data from a form and submit it to the server.
- *
- * @name formToArray
- * @param semantic true if serialization must maintain strict semantic ordering of elements (slower)
- * @type Array<Object>
- * @cat Plugins/Form
- */
-$.fn.formToArray = function(semantic) {
-    var a = [];
-    if (this.length == 0) return a;
-
-    var form = this[0];
-    var els = semantic ? form.getElementsByTagName('*') : form.elements;
-    if (!els) return a;
-    for(var i=0, max=els.length; i < max; i++) {
-        var el = els[i];
-        var n = el.name;
-        if (!n) continue;
-
-        if (semantic && form.clk && el.type == "image") {
-            // handle image inputs on the fly when semantic == true
-            if(!el.disabled && form.clk == el)
-                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-            continue;
-        }
-
-        var v = $.fieldValue(el, true);
-        if (v && v.constructor == Array) {
-            for(var j=0, jmax=v.length; j < jmax; j++)
-                a.push({name: n, value: v[j]});
-        }
-        else if (v !== null && typeof v != 'undefined')
-            a.push({name: n, value: v});
-    }
-
-    if (!semantic && form.clk) {
-        // input type=='image' are not found in elements array! handle them here
-        var inputs = form.getElementsByTagName("input");
-        for(var i=0, max=inputs.length; i < max; i++) {
-            var input = inputs[i];
-            var n = input.name;
-            if(n && !input.disabled && input.type == "image" && form.clk == input)
-                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-        }
-    }
-    return a;
-};
-
-
-/**
- * Serializes form data into a 'submittable' string. This method will return a string
- * in the format: name1=value1&amp;name2=value2
- *
- * The semantic argument can be used to force form serialization in semantic order.
- * If your form must be submitted with name/value pairs in semantic order then pass
- * true for this arg, otherwise pass false (or nothing) to avoid the overhead for
- * this logic (which can be significant for very large forms).
- *
- * @example var data = $("#myForm").formSerialize();
- * $.ajax('POST', "myscript.cgi", data);
- * @desc Collect all the data from a form into a single string
- *
- * @name formSerialize
- * @param semantic true if serialization must maintain strict semantic ordering of elements (slower)
- * @type String
- * @cat Plugins/Form
- */
-$.fn.formSerialize = function(semantic) {
-    //hand off to jQuery.param for proper encoding
-    return $.param(this.formToArray(semantic));
-};
-
-
-/**
- * Serializes all field elements in the jQuery object into a query string.
- * This method will return a string in the format: name1=value1&amp;name2=value2
- *
- * The successful argument controls whether or not serialization is limited to
- * 'successful' controls (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
- * The default value of the successful argument is true.
- *
- * @example var data = $("input").formSerialize();
- * @desc Collect the data from all successful input elements into a query string
- *
- * @example var data = $(":radio").formSerialize();
- * @desc Collect the data from all successful radio input elements into a query string
- *
- * @example var data = $("#myForm :checkbox").formSerialize();
- * @desc Collect the data from all successful checkbox input elements in myForm into a query string
- *
- * @example var data = $("#myForm :checkbox").formSerialize(false);
- * @desc Collect the data from all checkbox elements in myForm (even the unchecked ones) into a query string
- *
- * @example var data = $(":input").formSerialize();
- * @desc Collect the data from all successful input, select, textarea and button elements into a query string
- *
- * @name fieldSerialize
- * @param successful true if only successful controls should be serialized (default is true)
- * @type String
- * @cat Plugins/Form
- */
-$.fn.fieldSerialize = function(successful) {
-    var a = [];
-    this.each(function() {
-        var n = this.name;
-        if (!n) return;
-        var v = $.fieldValue(this, successful);
-        if (v && v.constructor == Array) {
-            for (var i=0,max=v.length; i < max; i++)
-                a.push({name: n, value: v[i]});
-        }
-        else if (v !== null && typeof v != 'undefined')
-            a.push({name: this.name, value: v});
-    });
-    //hand off to jQuery.param for proper encoding
-    return $.param(a);
-};
-
-
-/**
- * Returns the value(s) of the element in the matched set.  For example, consider the following form:
- *
- *  <form><fieldset>
- *      <input name="A" type="text" />
- *      <input name="A" type="text" />
- *      <input name="B" type="checkbox" value="B1" />
- *      <input name="B" type="checkbox" value="B2"/>
- *      <input name="C" type="radio" value="C1" />
- *      <input name="C" type="radio" value="C2" />
- *  </fieldset></form>
- *
- *  var v = $(':text').fieldValue();
- *  // if no values are entered into the text inputs
- *  v == ['','']
- *  // if values entered into the text inputs are 'foo' and 'bar'
- *  v == ['foo','bar']
- *
- *  var v = $(':checkbox').fieldValue();
- *  // if neither checkbox is checked
- *  v === undefined
- *  // if both checkboxes are checked
- *  v == ['B1', 'B2']
- *
- *  var v = $(':radio').fieldValue();
- *  // if neither radio is checked
- *  v === undefined
- *  // if first radio is checked
- *  v == ['C1']
- *
- * The successful argument controls whether or not the field element must be 'successful'
- * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
- * The default value of the successful argument is true.  If this value is false the value(s)
- * for each element is returned.
- *
- * Note: This method *always* returns an array.  If no valid value can be determined the
- *       array will be empty, otherwise it will contain one or more values.
- *
- * @example var data = $("#myPasswordElement").fieldValue();
- * alert(data[0]);
- * @desc Alerts the current value of the myPasswordElement element
- *
- * @example var data = $("#myForm :input").fieldValue();
- * @desc Get the value(s) of the form elements in myForm
- *
- * @example var data = $("#myForm :checkbox").fieldValue();
- * @desc Get the value(s) for the successful checkbox element(s) in the jQuery object.
- *
- * @example var data = $("#mySingleSelect").fieldValue();
- * @desc Get the value(s) of the select control
- *
- * @example var data = $(':text').fieldValue();
- * @desc Get the value(s) of the text input or textarea elements
- *
- * @example var data = $("#myMultiSelect").fieldValue();
- * @desc Get the values for the select-multiple control
- *
- * @name fieldValue
- * @param Boolean successful true if only the values for successful controls should be returned (default is true)
- * @type Array<String>
- * @cat Plugins/Form
- */
-$.fn.fieldValue = function(successful) {
-    for (var val=[], i=0, max=this.length; i < max; i++) {
-        var el = this[i];
-        var v = $.fieldValue(el, successful);
-        if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
-            continue;
-        v.constructor == Array ? $.merge(val, v) : val.push(v);
-    }
-    return val;
-};
-
-/**
- * Returns the value of the field element.
- *
- * The successful argument controls whether or not the field element must be 'successful'
- * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
- * The default value of the successful argument is true.  If the given element is not
- * successful and the successful arg is not false then the returned value will be null.
- *
- * Note: If the successful flag is true (default) but the element is not successful, the return will be null
- * Note: The value returned for a successful select-multiple element will always be an array.
- * Note: If the element has no value the return value will be undefined.
- *
- * @example var data = jQuery.fieldValue($("#myPasswordElement")[0]);
- * @desc Gets the current value of the myPasswordElement element
- *
- * @name fieldValue
- * @param Element el The DOM element for which the value will be returned
- * @param Boolean successful true if value returned must be for a successful controls (default is true)
- * @type String or Array<String> or null or undefined
- * @cat Plugins/Form
- */
-$.fieldValue = function(el, successful) {
-    var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
-    if (typeof successful == 'undefined') successful = true;
-
-    if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
-        (t == 'checkbox' || t == 'radio') && !el.checked ||
-        (t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
-        tag == 'select' && el.selectedIndex == -1))
-            return null;
-
-    if (tag == 'select') {
-        var index = el.selectedIndex;
-        if (index < 0) return null;
-        var a = [], ops = el.options;
-        var one = (t == 'select-one');
-        var max = (one ? index+1 : ops.length);
-        for(var i=(one ? index : 0); i < max; i++) {
-            var op = ops[i];
-            if (op.selected) {
-                // extra pain for IE...
-                var v = $.browser.msie && !(op.attributes['value'].specified) ? op.text : op.value;
-                if (one) return v;
-                a.push(v);
-            }
-        }
-        return a;
-    }
-    return el.value;
-};
-
-
-/**
- * Clears the form data.  Takes the following actions on the form's input fields:
- *  - input text fields will have their 'value' property set to the empty string
- *  - select elements will have their 'selectedIndex' property set to -1
- *  - checkbox and radio inputs will have their 'checked' property set to false
- *  - inputs of type submit, button, reset, and hidden will *not* be effected
- *  - button elements will *not* be effected
- *
- * @example $('form').clearForm();
- * @desc Clears all forms on the page.
- *
- * @name clearForm
- * @type jQuery
- * @cat Plugins/Form
- */
-$.fn.clearForm = function() {
-    return this.each(function() {
-        $('input,select,textarea', this).clearFields();
-    });
-};
-
-/**
- * Clears the selected form elements.  Takes the following actions on the matched elements:
- *  - input text fields will have their 'value' property set to the empty string
- *  - select elements will have their 'selectedIndex' property set to -1
- *  - checkbox and radio inputs will have their 'checked' property set to false
- *  - inputs of type submit, button, reset, and hidden will *not* be effected
- *  - button elements will *not* be effected
- *
- * @example $('.myInputs').clearFields();
- * @desc Clears all inputs with class myInputs
- *
- * @name clearFields
- * @type jQuery
- * @cat Plugins/Form
- */
-$.fn.clearFields = $.fn.clearInputs = function() {
-    return this.each(function() {
-        var t = this.type, tag = this.tagName.toLowerCase();
-        if (t == 'text' || t == 'password' || tag == 'textarea')
-            this.value = '';
-        else if (t == 'checkbox' || t == 'radio')
-            this.checked = false;
-        else if (tag == 'select')
-            this.selectedIndex = -1;
-    });
-};
-
-
-/**
- * Resets the form data.  Causes all form elements to be reset to their original value.
- *
- * @example $('form').resetForm();
- * @desc Resets all forms on the page.
- *
- * @name resetForm
- * @type jQuery
- * @cat Plugins/Form
- */
-$.fn.resetForm = function() {
-    return this.each(function() {
-        // guard against an input with the name of 'reset'
-        // note that IE reports the reset function as an 'object'
-        if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
-            this.reset();
-    });
-};
-
-
-/**
- * Enables or disables any matching elements.
- *
- * @example $(':radio').enabled(false);
- * @desc Disables all radio buttons
- *
- * @name select
- * @type jQuery
- * @cat Plugins/Form
- */
-$.fn.enable = function(b) { 
-    if (b == undefined) b = true;
-    return this.each(function() { 
-        this.disabled = !b 
-    });
-};
-
-/**
- * Checks/unchecks any matching checkboxes or radio buttons and
- * selects/deselects and matching option elements.
- *
- * @example $(':checkbox').selected();
- * @desc Checks all checkboxes
- *
- * @name select
- * @type jQuery
- * @cat Plugins/Form
- */
-$.fn.select = function(select) {
-    if (select == undefined) select = true;
-    return this.each(function() { 
-        var t = this.type;
-        if (t == 'checkbox' || t == 'radio')
-            this.checked = select;
-        else if (this.tagName.toLowerCase() == 'option') {
-            var $sel = $(this).parent('select');
-            if (select && $sel[0] && $sel[0].type == 'select-one') {
-                // deselect all other options
-                $sel.find('option').select(false);
-            }
-            this.selected = select;
-        }
-    });
-};
-
-})(jQuery);
diff -uNr a/mp-wp/wp-includes/js/jquery/jquery.hotkeys.js b/mp-wp/wp-includes/js/jquery/jquery.hotkeys.js
--- a/mp-wp/wp-includes/js/jquery/jquery.hotkeys.js b18433b4a5013cf3800abfce4bb5b2ca458d36c56c1a23686c00e7380e577cb8f68262f95e63cd174c085e861cf046734172402eda594a3550609a1310ac4c73
+++ b/mp-wp/wp-includes/js/jquery/jquery.hotkeys.js false
@@ -1,128 +0,0 @@
-/******************************************************************************************************************************
-
- * @ Original idea by by Binny V A, Original version: 2.00.A 
- * @ http://www.openjs.com/scripts/events/keyboard_shortcuts/
- * @ Original License : BSD
- 
- * @ jQuery Plugin by Tzury Bar Yochay 
-        mail: tzury.by@gmail.com
-        blog: evalinux.wordpress.com
-        face: facebook.com/profile.php?id=513676303
-        
-        (c) Copyrights 2007
-        
- * @ jQuery Plugin version Beta (0.0.2)
- * @ License: jQuery-License.
- 
-TODO:
-    add queue support (as in gmail) e.g. 'x' then 'y', etc.
-    add mouse + mouse wheel events.
-
-USAGE:
-    $.hotkeys.add('Ctrl+c', function(){ alert('copy anyone?');});
-    $.hotkeys.add('Ctrl+c', {target:'div#editor', type:'keyup', propagate: true},function(){ alert('copy anyone?');});>
-    $.hotkeys.remove('Ctrl+c'); 
-    $.hotkeys.remove('Ctrl+c', {target:'div#editor', type:'keypress'}); 
-    
-******************************************************************************************************************************/
-(function (jQuery){
-    this.version = '(beta)(0.0.3)';
-	this.all = {};
-    this.special_keys = {
-        27: 'esc', 9: 'tab', 32:'space', 13: 'return', 8:'backspace', 145: 'scroll', 20: 'capslock', 
-        144: 'numlock', 19:'pause', 45:'insert', 36:'home', 46:'del',35:'end', 33: 'pageup', 
-        34:'pagedown', 37:'left', 38:'up', 39:'right',40:'down', 112:'f1',113:'f2', 114:'f3', 
-        115:'f4', 116:'f5', 117:'f6', 118:'f7', 119:'f8', 120:'f9', 121:'f10', 122:'f11', 123:'f12'};
-        
-    this.shift_nums = { "`":"~", "1":"!", "2":"@", "3":"#", "4":"$", "5":"%", "6":"^", "7":"&", 
-        "8":"*", "9":"(", "0":")", "-":"_", "=":"+", ";":":", "'":"\"", ",":"<", 
-        ".":">",  "/":"?",  "\\":"|" };
-        
-    this.add = function(combi, options, callback) {
-        if (jQuery.isFunction(options)){
-            callback = options;
-            options = {};
-        }
-        var opt = {},
-            defaults = {type: 'keydown', propagate: false, disableInInput: false, target: jQuery('html')[0]},
-            that = this;
-        opt = jQuery.extend( opt , defaults, options || {} );
-        combi = combi.toLowerCase();        
-        
-        // inspect if keystroke matches
-        var inspector = function(event) {
-            event = jQuery.event.fix(event); // jQuery event normalization.
-            var element = event.target;
-            // @ TextNode -> nodeType == 3
-            element = (element.nodeType==3) ? element.parentNode : element;
-            
-            if(opt['disableInInput']) { // Disable shortcut keys in Input, Textarea fields
-                var target = jQuery(element);
-                if( target.is("input") || target.is("textarea")){
-                    return;
-                }
-            }
-            var code = event.which,
-                type = event.type,
-                character = String.fromCharCode(code).toLowerCase(),
-                special = that.special_keys[code],
-                shift = event.shiftKey,
-                ctrl = event.ctrlKey,
-                alt= event.altKey,
-                meta = event.metaKey,
-                propagate = true, // default behaivour
-                mapPoint = null;
-            
-            // in opera + safari, the event.target is unpredictable.
-            // for example: 'keydown' might be associated with HtmlBodyElement 
-            // or the element where you last clicked with your mouse.
-            if (jQuery.browser.opera || jQuery.browser.safari){
-                while (!that.all[element] && element.parentNode){
-                    element = element.parentNode;
-                }
-            }
-            var cbMap = that.all[element].events[type].callbackMap;
-            if(!shift && !ctrl && !alt && !meta) { // No Modifiers
-                mapPoint = cbMap[special] ||  cbMap[character]
-			}
-            // deals with combinaitons (alt|ctrl|shift+anything)
-            else{
-                var modif = '';
-                if(alt) modif +='alt+';
-                if(ctrl) modif+= 'ctrl+';
-                if(shift) modif += 'shift+';
-                if(meta) modif += 'meta+';
-                // modifiers + special keys or modifiers + characters or modifiers + shift characters
-                mapPoint = cbMap[modif+special] || cbMap[modif+character] || cbMap[modif+that.shift_nums[character]]
-            }
-            if (mapPoint){
-                mapPoint.cb(event);
-                if(!mapPoint.propagate) {
-                    event.stopPropagation();
-                    event.preventDefault();
-                    return false;
-                }
-            }
-		};        
-        // first hook for this element
-        if (!this.all[opt.target]){
-            this.all[opt.target] = {events:{}};
-        }
-        if (!this.all[opt.target].events[opt.type]){
-            this.all[opt.target].events[opt.type] = {callbackMap: {}}
-            jQuery.event.add(opt.target, opt.type, inspector);
-        }        
-        this.all[opt.target].events[opt.type].callbackMap[combi] =  {cb: callback, propagate:opt.propagate};                
-        return jQuery;
-	};    
-    this.remove = function(exp, opt) {
-        opt = opt || {};
-        target = opt.target || jQuery('html')[0];
-        type = opt.type || 'keydown';
-		exp = exp.toLowerCase();        
-        delete this.all[target].events[type].callbackMap[exp]        
-        return jQuery;
-	};
-    jQuery.hotkeys = this;
-    return jQuery;    
-})(jQuery);
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/jquery/jquery.js b/mp-wp/wp-includes/js/jquery/jquery.js
--- a/mp-wp/wp-includes/js/jquery/jquery.js 43b30f213100f411fd33cc0fd82302f8e7cfb5c86ff4a29b1963e53fd62b638a516d3498172a5040b8775520c0a93fd754efdf7568faa472017cd0d5f2c26f6f
+++ b/mp-wp/wp-includes/js/jquery/jquery.js false
@@ -1,11 +0,0 @@
-/*
- * jQuery 1.2.6 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-05-27 12:17:26 -0700 (Tue, 27 May 2008) $
- * $Rev: 5700 $
- */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(H(){J w=1c.4I,3n$=1c.$;J D=1c.4I=1c.$=H(a,b){I 2r D.18.5i(a,b)};J u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/,61=/^.[^:#\\[\\.]*$/,12;D.18=D.3V={5i:H(d,b){d=d||S;G(d.15){7[0]=d;7.K=1;I 7}G(1j d=="1W"){J c=u.2D(d);G(c&&(c[1]||!b)){G(c[1])d=D.4h([c[1]],b);N{J a=S.60(c[3]);G(a){G(a.2t!=c[3])I D().2u(d);I D(a)}d=[]}}N I D(b).2u(d)}N G(D.1F(d))I D(S)[D.18.25?"25":"3Y"](d);I 7.6V(D.2h(d))},5w:"1.2.6",8H:H(){I 7.K},K:0,3p:H(a){I a==12?D.2h(7):7[a]},2F:H(b){J a=D(b);a.5n=7;I a},6V:H(a){7.K=0;2q.3V.1A.1t(7,a);I 7},P:H(a,b){I D.P(7,a,b)},5h:H(b){J a=-1;I D.2E(b&&b.5w?b[0]:b,7)},1M:H(c,a,b){J d=c;G(c.1q==56)G(a===12)I 7[0]&&D[b||"1M"](7[0],c);N{d={};d[c]=a}I 7.P(H(i){R(c 1k d)D.1M(b?7.V:7,c,D.1e(7,d[c],b,i,c))})},1h:H(b,a){G((b==\'2d\'||b==\'1T\')&&3e(a)<0)a=12;I 7.1M(b,a,"24")},1r:H(b){G(1j b!="3y"&&b!=U)I 7.4F().3s((7[0]&&7[0].2z||S).5J(b));J a="";D.P(b||7,H(){D.P(7.3u,H(){G(7.15!=8)a+=7.15!=1?7.73:D.18.1r([7])})});I a},5W:H(b){G(7[0])D(b,7[0].2z).5y().38(7[0]).2i(H(){J a=7;1G(a.1s)a=a.1s;I a}).3s(7);I 7},8Z:H(a){I 7.P(H(){D(7).6P().5W(a)})},8S:H(a){I 7.P(H(){D(7).5W(a)})},3s:H(){I 7.3S(1a,M,Q,H(a){G(7.15==1)7.49(a)})},6E:H(){I 7.3S(1a,M,M,H(a){G(7.15==1)7.38(a,7.1s)})},6D:H(){I 7.3S(1a,Q,Q,H(a){7.1f.38(a,7)})},5p:H(){I 7.3S(1a,Q,M,H(a){7.1f.38(a,7.2J)})},3m:H(){I 7.5n||D([])},2u:H(b){J c=D.2i(7,H(a){I D.2u(b,a)});I 7.2F(/[^+>] [^+>]/.11(b)||b.1i("..")>-1?D.4u(c):c)},5y:H(e){J f=7.2i(H(){G(D.14.1g&&!D.4o(7)){J a=7.6n(M),5f=S.3t("1w");5f.49(a);I D.4h([5f.4l])[0]}N I 7.6n(M)});J d=f.2u("*").5M().P(H(){G(7[E]!=12)7[E]=U});G(e===M)7.2u("*").5M().P(H(i){G(7.15==3)I;J c=D.L(7,"3x");R(J a 1k c)R(J b 1k c[a])D.W.17(d[i],a,c[a][b],c[a][b].L)});I f},1E:H(b){I 7.2F(D.1F(b)&&D.3G(7,H(a,i){I b.1l(a,i)})||D.3f(b,7))},4W:H(b){G(b.1q==56)G(61.11(b))I 7.2F(D.3f(b,7,M));N b=D.3f(b,7);J a=b.K&&b[b.K-1]!==12&&!b.15;I 7.1E(H(){I a?D.2E(7,b)<0:7!=b})},17:H(a){I 7.2F(D.4u(D.39(7.3p(),1j a==\'1W\'?D(a):D.2h(a))))},3C:H(a){I!!a&&D.3f(a,7).K>0},7V:H(a){I 7.3C("."+a)},6a:H(b){G(b==12){G(7.K){J c=7[0];G(D.Y(c,"2y")){J e=c.63,62=[],16=c.16,2Y=c.O=="2y-2Y";G(e<0)I U;R(J i=2Y?e:0,2e=2Y?e+1:16.K;i<2e;i++){J d=16[i];G(d.3a){b=D.14.1g&&!d.au.2s.aq?d.1r:d.2s;G(2Y)I b;62.1A(b)}}I 62}N I(7[0].2s||"").1o(/\\r/g,"")}I 12}G(b.1q==4N)b+=\'\';I 7.P(H(){G(7.15!=1)I;G(b.1q==2q&&/5R|5A/.11(7.O))7.4M=(D.2E(7.2s,b)>=0||D.2E(7.32,b)>=0);N G(D.Y(7,"2y")){J a=D.2h(b);D("9U",7).P(H(){7.3a=(D.2E(7.2s,a)>=0||D.2E(7.1r,a)>=0)});G(!a.K)7.63=-1}N 7.2s=b})},2I:H(a){I a==12?(7[0]?7[0].4l:U):7.4F().3s(a)},7b:H(a){I 7.5p(a).1Z()},77:H(i){I 7.3w(i,i+1)},3w:H(){I 7.2F(2q.3V.3w.1t(7,1a))},2i:H(b){I 7.2F(D.2i(7,H(a,i){I b.1l(a,i,a)}))},5M:H(){I 7.17(7.5n)},L:H(d,b){J a=d.1Q(".");a[1]=a[1]?"."+a[1]:"";G(b===12){J c=7.5G("9B"+a[1]+"!",[a[0]]);G(c===12&&7.K)c=D.L(7[0],d);I c===12&&a[1]?7.L(a[0]):c}N I 7.1R("9v"+a[1]+"!",[a[0],b]).P(H(){D.L(7,d,b)})},3b:H(a){I 7.P(H(){D.3b(7,a)})},3S:H(g,f,h,d){J e=7.K>1,3z;I 7.P(H(){G(!3z){3z=D.4h(g,7.2z);G(h)3z.9o()}J b=7;G(f&&D.Y(7,"1X")&&D.Y(3z[0],"4H"))b=7.40("22")[0]||7.49(7.2z.3t("22"));J c=D([]);D.P(3z,H(){J a=e?D(7).5y(M)[0]:7;G(D.Y(a,"1m"))c=c.17(a);N{G(a.15==1)c=c.17(D("1m",a).1Z());d.1l(b,a)}});c.P(6R)})}};D.18.5i.3V=D.18;H 6R(i,a){G(a.4e)D.3T({1b:a.4e,31:Q,1L:"1m"});N D.5u(a.1r||a.6N||a.4l||"");G(a.1f)a.1f.30(a)}H 1x(){I+2r 8K}D.1n=D.18.1n=H(){J b=1a[0]||{},i=1,K=1a.K,4B=Q,16;G(b.1q==8I){4B=b;b=1a[1]||{};i=2}G(1j b!="3y"&&1j b!="H")b={};G(K==i){b=7;--i}R(;i<K;i++)G((16=1a[i])!=U)R(J c 1k 16){J a=b[c],2x=16[c];G(b===2x)6L;G(4B&&2x&&1j 2x=="3y"&&!2x.15)b[c]=D.1n(4B,a||(2x.K!=U?[]:{}),2x);N G(2x!==12)b[c]=2x}I b};J E="4I"+1x(),6K=0,5q={},6G=/z-?5h|8B-?8A|1y|6A|8w-?1T/i,3N=S.3N||{};D.1n({8u:H(a){1c.$=3n$;G(a)1c.4I=w;I D},1F:H(a){I!!a&&1j a!="1W"&&!a.Y&&a.1q!=2q&&/^[\\s[]?H/.11(a+"")},4o:H(a){I a.1B&&!a.1d||a.2g&&a.2z&&!a.2z.1d},5u:H(a){a=D.3l(a);G(a){J b=S.40("6v")[0]||S.1B,1m=S.3t("1m");1m.O="1r/4v";G(D.14.1g)1m.1r=a;N 1m.49(S.5J(a));b.38(1m,b.1s);b.30(1m)}},Y:H(b,a){I b.Y&&b.Y.2m()==a.2m()},1Y:{},L:H(c,d,b){c=c==1c?5q:c;J a=c[E];G(!a)a=c[E]=++6K;G(d&&!D.1Y[a])D.1Y[a]={};G(b!==12)D.1Y[a][d]=b;I d?D.1Y[a][d]:a},3b:H(c,b){c=c==1c?5q:c;J a=c[E];G(b){G(D.1Y[a]){3d D.1Y[a][b];b="";R(b 1k D.1Y[a])1V;G(!b)D.3b(c)}}N{23{3d c[E]}21(e){G(c.5k)c.5k(E)}3d D.1Y[a]}},P:H(d,a,c){J e,i=0,K=d.K;G(c){G(K==12){R(e 1k d)G(a.1t(d[e],c)===Q)1V}N R(;i<K;)G(a.1t(d[i++],c)===Q)1V}N{G(K==12){R(e 1k d)G(a.1l(d[e],e,d[e])===Q)1V}N R(J b=d[0];i<K&&a.1l(b,i,b)!==Q;b=d[++i]){}}I d},1e:H(b,a,c,i,d){G(D.1F(a))a=a.1l(b,i);I a&&a.1q==4N&&c=="24"&&!6G.11(d)?a+"2U":a},1D:{17:H(c,b){D.P((b||"").1Q(/\\s+/),H(i,a){G(c.15==1&&!D.1D.3Q(c.1D,a))c.1D+=(c.1D?" ":"")+a})},1Z:H(c,b){G(c.15==1)c.1D=b!=12?D.3G(c.1D.1Q(/\\s+/),H(a){I!D.1D.3Q(b,a)}).6r(" "):""},3Q:H(b,a){I D.2E(a,(b.1D||b).6p().1Q(/\\s+/))>-1}},6o:H(b,c,a){J e={};R(J d 1k c){e[d]=b.V[d];b.V[d]=c[d]}a.1l(b);R(J d 1k c)b.V[d]=e[d]},1h:H(d,e,c){G(e=="2d"||e=="1T"){J b,2L={3c:"5g",5D:"1C",19:"3H"},2S=e=="2d"?["5d","6i"]:["5b","6g"];H 5a(){b=e=="2d"?d.8g:d.8f;J a=0,2A=0;D.P(2S,H(){a+=3e(D.24(d,"55"+7,M))||0;2A+=3e(D.24(d,"2A"+7+"47",M))||0});b-=26.85(a+2A)}G(D(d).3C(":4i"))5a();N D.6o(d,2L,5a);I 26.2e(0,b)}I D.24(d,e,c)},24:H(f,l,k){J e,V=f.V;H 4d(b){G(!D.14.2f)I Q;J a=3N.53(b,U);I!a||a.52("4d")==""}G(l=="1y"&&D.14.1g){e=D.1M(V,"1y");I e==""?"1":e}G(D.14.2H&&l=="19"){J d=V.50;V.50="0 7Z 7Y";V.50=d}G(l.1I(/4g/i))l=y;G(!k&&V&&V[l])e=V[l];N G(3N.53){G(l.1I(/4g/i))l="4g";l=l.1o(/([A-Z])/g,"-$1").3h();J c=3N.53(f,U);G(c&&!4d(f))e=c.52(l);N{J g=[],2G=[],a=f,i=0;R(;a&&4d(a);a=a.1f)2G.6b(a);R(;i<2G.K;i++)G(4d(2G[i])){g[i]=2G[i].V.19;2G[i].V.19="3H"}e=l=="19"&&g[2G.K-1]!=U?"2P":(c&&c.52(l))||"";R(i=0;i<g.K;i++)G(g[i]!=U)2G[i].V.19=g[i]}G(l=="1y"&&e=="")e="1"}N G(f.4f){J h=l.1o(/\\-(\\w)/g,H(a,b){I b.2m()});e=f.4f[l]||f.4f[h];G(!/^\\d+(2U)?$/i.11(e)&&/^\\d/.11(e)){J j=V.1z,65=f.64.1z;f.64.1z=f.4f.1z;V.1z=e||0;e=V.aO+"2U";V.1z=j;f.64.1z=65}}I e},4h:H(l,h){J k=[];h=h||S;G(1j h.3t==\'12\')h=h.2z||h[0]&&h[0].2z||S;D.P(l,H(i,d){G(!d)I;G(d.1q==4N)d+=\'\';G(1j d=="1W"){d=d.1o(/(<(\\w+)[^>]*?)\\/>/g,H(b,a,c){I c.1I(/^(aN|43|7E|aH|4t|7z|aE|3A|aB|aA|az)$/i)?b:a+"></"+c+">"});J f=D.3l(d).3h(),1w=h.3t("1w");J e=!f.1i("<av")&&[1,"<2y 7u=\'7u\'>","</2y>"]||!f.1i("<at")&&[1,"<7t>","</7t>"]||f.1I(/^<(ar|22|ap|al|aj)/)&&[1,"<1X>","</1X>"]||!f.1i("<4H")&&[2,"<1X><22>","</22></1X>"]||(!f.1i("<ah")||!f.1i("<ae"))&&[3,"<1X><22><4H>","</4H></22></1X>"]||!f.1i("<7E")&&[2,"<1X><22></22><7p>","</7p></1X>"]||D.14.1g&&[1,"1w<1w>","</1w>"]||[0,"",""];1w.4l=e[1]+d+e[2];1G(e[0]--)1w=1w.5U;G(D.14.1g){J g=!f.1i("<1X")&&f.1i("<22")<0?1w.1s&&1w.1s.3u:e[1]=="<1X>"&&f.1i("<22")<0?1w.3u:[];R(J j=g.K-1;j>=0;--j)G(D.Y(g[j],"22")&&!g[j].3u.K)g[j].1f.30(g[j]);G(/^\\s/.11(d))1w.38(h.5J(d.1I(/^\\s*/)[0]),1w.1s)}d=D.2h(1w.3u)}G(d.K===0&&(!D.Y(d,"45")&&!D.Y(d,"2y")))I;G(d[0]==12||D.Y(d,"45")||d.16)k.1A(d);N k=D.39(k,d)});I k},1M:H(d,f,c){G(!d||d.15==3||d.15==8)I 12;J e=!D.4o(d),3W=c!==12,1g=D.14.1g;f=e&&D.2L[f]||f;G(d.2g){J g=/5x|4e|V/.11(f);G(f=="3a"&&D.14.2f)d.1f.63;G(f 1k d&&e&&!g){G(3W){G(f=="O"&&D.Y(d,"4t")&&d.1f)7m"O a5 a2\'t 9Z 9W";d[f]=c}G(D.Y(d,"45")&&d.7i(f))I d.7i(f).73;I d[f]}G(1g&&e&&f=="V")I D.1M(d.V,"9V",c);G(3W)d.9T(f,""+c);J h=1g&&e&&g?d.4K(f,2):d.4K(f);I h===U?12:h}G(1g&&f=="1y"){G(3W){d.6A=1;d.1E=(d.1E||"").1o(/7d\\([^)]*\\)/,"")+(3v(c)+\'\'=="9P"?"":"7d(1y="+c*79+")")}I d.1E&&d.1E.1i("1y=")>=0?(3e(d.1E.1I(/1y=([^)]*)/)[1])/79)+\'\':""}f=f.1o(/-([a-z])/9M,H(a,b){I b.2m()});G(3W)d[f]=c;I d[f]},3l:H(a){I(a||"").1o(/^\\s+|\\s+$/g,"")},2h:H(b){J a=[];G(b!=U){J i=b.K;G(i==U||b.1Q||b.4L||b.1l)a[0]=b;N 1G(i)a[--i]=b[i]}I a},2E:H(b,a){R(J i=0,K=a.K;i<K;i++)G(a[i]===b)I i;I-1},39:H(a,b){J i=0,T,36=a.K;G(D.14.1g){1G(T=b[i++])G(T.15!=8)a[36++]=T}N 1G(T=b[i++])a[36++]=T;I a},4u:H(a){J c=[],2w={};23{R(J i=0,K=a.K;i<K;i++){J b=D.L(a[i]);G(!2w[b]){2w[b]=M;c.1A(a[i])}}}21(e){c=a}I c},3G:H(c,a,d){J b=[];R(J i=0,K=c.K;i<K;i++)G(!d!=!a(c[i],i))b.1A(c[i]);I b},2i:H(d,a){J c=[];R(J i=0,K=d.K;i<K;i++){J b=a(d[i],i);G(b!=U)c[c.K]=b}I c.75.1t([],c)}});J v=9E.9C.3h();D.14={5F:(v.1I(/.+(?:9A|9z|9y|9w)[\\/: ]([\\d.]+)/)||[])[1],2f:/72/.11(v),2H:/2H/.11(v),1g:/1g/.11(v)&&!/2H/.11(v),3r:/3r/.11(v)&&!/(9s|72)/.11(v)};J y=D.14.1g?"70":"6Z";D.1n({6Y:!D.14.1g||S.6X=="6W",2L:{"R":"9n","9m":"1D","4g":y,6Z:y,70:y,9j:"9h",9g:"9e",9d:"9b",9a:"99"}});D.P({6S:H(a){I a.1f},96:H(a){I D.4T(a,"1f")},93:H(a){I D.2V(a,2,"2J")},90:H(a){I D.2V(a,2,"4D")},8Y:H(a){I D.4T(a,"2J")},8X:H(a){I D.4T(a,"4D")},8W:H(a){I D.5v(a.1f.1s,a)},8V:H(a){I D.5v(a.1s)},6P:H(a){I D.Y(a,"8U")?a.8T||a.8R.S:D.2h(a.3u)}},H(c,d){D.18[c]=H(b){J a=D.2i(7,d);G(b&&1j b=="1W")a=D.3f(b,a);I 7.2F(D.4u(a))}});D.P({6O:"3s",8Q:"6E",38:"6D",8P:"5p",8O:"7b"},H(c,b){D.18[c]=H(){J a=1a;I 7.P(H(){R(J i=0,K=a.K;i<K;i++)D(a[i])[b](7)})}});D.P({8N:H(a){D.1M(7,a,"");G(7.15==1)7.5k(a)},8M:H(a){D.1D.17(7,a)},8L:H(a){D.1D.1Z(7,a)},8J:H(a){D.1D[D.1D.3Q(7,a)?"1Z":"17"](7,a)},1Z:H(a){G(!a||D.1E(a,[7]).r.K){D("*",7).17(7).P(H(){D.W.1Z(7);D.3b(7)});G(7.1f)7.1f.30(7)}},4F:H(){D(">*",7).1Z();1G(7.1s)7.30(7.1s)}},H(a,b){D.18[a]=H(){I 7.P(b,1a)}});D.P(["6M","47"],H(i,c){J b=c.3h();D.18[b]=H(a){I 7[0]==1c?D.14.2H&&S.1d["5t"+c]||D.14.2f&&1c["5s"+c]||S.6X=="6W"&&S.1B["5t"+c]||S.1d["5t"+c]:7[0]==S?26.2e(26.2e(S.1d["4A"+c],S.1B["4A"+c]),26.2e(S.1d["2k"+c],S.1B["2k"+c])):a==12?(7.K?D.1h(7[0],b):U):7.1h(b,a.1q==56?a:a+"2U")}});H 2a(a,b){I a[0]&&3v(D.24(a[0],b,M),10)||0}J C=D.14.2f&&3v(D.14.5F)<8G?"(?:[\\\\w*3n-]|\\\\\\\\.)":"(?:[\\\\w\\8F-\\8E*3n-]|\\\\\\\\.)",6J=2r 4y("^>\\\\s*("+C+"+)"),6I=2r 4y("^("+C+"+)(#)("+C+"+)"),6H=2r 4y("^([#.]?)("+C+"*)");D.1n({6F:{"":H(a,i,m){I m[2]=="*"||D.Y(a,m[2])},"#":H(a,i,m){I a.4K("2t")==m[2]},":":{8D:H(a,i,m){I i<m[3]-0},8C:H(a,i,m){I i>m[3]-0},2V:H(a,i,m){I m[3]-0==i},77:H(a,i,m){I m[3]-0==i},3o:H(a,i){I i==0},3P:H(a,i,m,r){I i==r.K-1},6C:H(a,i){I i%2==0},6B:H(a,i){I i%2},"3o-4w":H(a){I a.1f.40("*")[0]==a},"3P-4w":H(a){I D.2V(a.1f.5U,1,"4D")==a},"8z-4w":H(a){I!D.2V(a.1f.5U,2,"4D")},6S:H(a){I a.1s},4F:H(a){I!a.1s},8y:H(a,i,m){I(a.6N||a.8x||D(a).1r()||"").1i(m[3])>=0},4i:H(a){I"1C"!=a.O&&D.1h(a,"19")!="2P"&&D.1h(a,"5D")!="1C"},1C:H(a){I"1C"==a.O||D.1h(a,"19")=="2P"||D.1h(a,"5D")=="1C"},8v:H(a){I!a.3O},3O:H(a){I a.3O},4M:H(a){I a.4M},3a:H(a){I a.3a||D.1M(a,"3a")},1r:H(a){I"1r"==a.O},5R:H(a){I"5R"==a.O},5A:H(a){I"5A"==a.O},5o:H(a){I"5o"==a.O},3K:H(a){I"3K"==a.O},5m:H(a){I"5m"==a.O},6z:H(a){I"6z"==a.O},6y:H(a){I"6y"==a.O},2p:H(a){I"2p"==a.O||D.Y(a,"2p")},4t:H(a){I/4t|2y|6x|2p/i.11(a.Y)},3Q:H(a,i,m){I D.2u(m[3],a).K},8t:H(a){I/h\\d/i.11(a.Y)},8s:H(a){I D.3G(D.3M,H(b){I a==b.T}).K}}},6w:[/^(\\[) *@?([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,2r 4y("^([:.#]*)("+C+"+)")],3f:H(a,c,b){J d,1u=[];1G(a&&a!=d){d=a;J f=D.1E(a,c,b);a=f.t.1o(/^\\s*,\\s*/,"");1u=b?c=f.r:D.39(1u,f.r)}I 1u},2u:H(t,o){G(1j t!="1W")I[t];G(o&&o.15!=1&&o.15!=9)I[];o=o||S;J d=[o],2w=[],3P,Y;1G(t&&3P!=t){J r=[];3P=t;t=D.3l(t);J l=Q,3k=6J,m=3k.2D(t);G(m){Y=m[1].2m();R(J i=0;d[i];i++)R(J c=d[i].1s;c;c=c.2J)G(c.15==1&&(Y=="*"||c.Y.2m()==Y))r.1A(c);d=r;t=t.1o(3k,"");G(t.1i(" ")==0)6L;l=M}N{3k=/^([>+~])\\s*(\\w*)/i;G((m=3k.2D(t))!=U){r=[];J k={};Y=m[2].2m();m=m[1];R(J j=0,3j=d.K;j<3j;j++){J n=m=="~"||m=="+"?d[j].2J:d[j].1s;R(;n;n=n.2J)G(n.15==1){J g=D.L(n);G(m=="~"&&k[g])1V;G(!Y||n.Y.2m()==Y){G(m=="~")k[g]=M;r.1A(n)}G(m=="+")1V}}d=r;t=D.3l(t.1o(3k,""));l=M}}G(t&&!l){G(!t.1i(",")){G(o==d[0])d.4s();2w=D.39(2w,d);r=d=[o];t=" "+t.6t(1,t.K)}N{J h=6I;J m=h.2D(t);G(m){m=[0,m[2],m[3],m[1]]}N{h=6H;m=h.2D(t)}m[2]=m[2].1o(/\\\\/g,"");J f=d[d.K-1];G(m[1]=="#"&&f&&f.60&&!D.4o(f)){J p=f.60(m[2]);G((D.14.1g||D.14.2H)&&p&&1j p.2t=="1W"&&p.2t!=m[2])p=D(\'[@2t="\'+m[2]+\'"]\',f)[0];d=r=p&&(!m[3]||D.Y(p,m[3]))?[p]:[]}N{R(J i=0;d[i];i++){J a=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];G(a=="*"&&d[i].Y.3h()=="3y")a="3A";r=D.39(r,d[i].40(a))}G(m[1]==".")r=D.5l(r,m[2]);G(m[1]=="#"){J e=[];R(J i=0;r[i];i++)G(r[i].4K("2t")==m[2]){e=[r[i]];1V}r=e}d=r}t=t.1o(h,"")}}G(t){J b=D.1E(t,r);d=r=b.r;t=D.3l(b.t)}}G(t)d=[];G(d&&o==d[0])d.4s();2w=D.39(2w,d);I 2w},5l:H(r,m,a){m=" "+m+" ";J c=[];R(J i=0;r[i];i++){J b=(" "+r[i].1D+" ").1i(m)>=0;G(!a&&b||a&&!b)c.1A(r[i])}I c},1E:H(t,r,h){J d;1G(t&&t!=d){d=t;J p=D.6w,m;R(J i=0;p[i];i++){m=p[i].2D(t);G(m){t=t.8r(m[0].K);m[2]=m[2].1o(/\\\\/g,"");1V}}G(!m)1V;G(m[1]==":"&&m[2]=="4W")r=61.11(m[3])?D.1E(m[3],r,M).r:D(r).4W(m[3]);N G(m[1]==".")r=D.5l(r,m[2],h);N G(m[1]=="["){J g=[],O=m[3];R(J i=0,3j=r.K;i<3j;i++){J a=r[i],z=a[D.2L[m[2]]||m[2]];G(z==U||/5x|4e|3a/.11(m[2]))z=D.1M(a,m[2])||\'\';G((O==""&&!!z||O=="="&&z==m[5]||O=="!="&&z!=m[5]||O=="^="&&z&&!z.1i(m[5])||O=="$="&&z.6t(z.K-m[5].K)==m[5]||(O=="*="||O=="~=")&&z.1i(m[5])>=0)^h)g.1A(a)}r=g}N G(m[1]==":"&&m[2]=="2V-4w"){J e={},g=[],11=/(-?)(\\d*)n((?:\\+|-)?\\d*)/.2D(m[3]=="6C"&&"2n"||m[3]=="6B"&&"2n+1"||!/\\D/.11(m[3])&&"8q+"+m[3]||m[3]),3o=(11[1]+(11[2]||1))-0,d=11[3]-0;R(J i=0,3j=r.K;i<3j;i++){J j=r[i],1f=j.1f,2t=D.L(1f);G(!e[2t]){J c=1;R(J n=1f.1s;n;n=n.2J)G(n.15==1)n.4r=c++;e[2t]=M}J b=Q;G(3o==0){G(j.4r==d)b=M}N G((j.4r-d)%3o==0&&(j.4r-d)/3o>=0)b=M;G(b^h)g.1A(j)}r=g}N{J f=D.6F[m[1]];G(1j f=="3y")f=f[m[2]];G(1j f=="1W")f=6s("Q||H(a,i){I "+f+";}");r=D.3G(r,H(a,i){I f(a,i,m,r)},h)}}I{r:r,t:t}},4T:H(b,c){J a=[],1u=b[c];1G(1u&&1u!=S){G(1u.15==1)a.1A(1u);1u=1u[c]}I a},2V:H(a,e,c,b){e=e||1;J d=0;R(;a;a=a[c])G(a.15==1&&++d==e)1V;I a},5v:H(n,a){J r=[];R(;n;n=n.2J){G(n.15==1&&n!=a)r.1A(n)}I r}});D.W={17:H(f,i,g,e){G(f.15==3||f.15==8)I;G(D.14.1g&&f.4L)f=1c;G(!g.29)g.29=7.29++;G(e!=12){J h=g;g=7.3J(h,H(){I h.1t(7,1a)});g.L=e}J j=D.L(f,"3x")||D.L(f,"3x",{}),1H=D.L(f,"1H")||D.L(f,"1H",H(){G(1j D!="12"&&!D.W.5j)I D.W.1H.1t(1a.3I.T,1a)});1H.T=f;D.P(i.1Q(/\\s+/),H(c,b){J a=b.1Q(".");b=a[0];g.O=a[1];J d=j[b];G(!d){d=j[b]={};G(!D.W.2C[b]||D.W.2C[b].4q.1l(f)===Q){G(f.4a)f.4a(b,1H,Q);N G(f.6q)f.6q("4p"+b,1H)}}d[g.29]=g;D.W.28[b]=M});f=U},29:1,28:{},1Z:H(e,h,f){G(e.15==3||e.15==8)I;J i=D.L(e,"3x"),1K,5h;G(i){G(h==12||(1j h=="1W"&&h.8p(0)=="."))R(J g 1k i)7.1Z(e,g+(h||""));N{G(h.O){f=h.2o;h=h.O}D.P(h.1Q(/\\s+/),H(b,a){J c=a.1Q(".");a=c[0];G(i[a]){G(f)3d i[a][f.29];N R(f 1k i[a])G(!c[1]||i[a][f].O==c[1])3d i[a][f];R(1K 1k i[a])1V;G(!1K){G(!D.W.2C[a]||D.W.2C[a].4G.1l(e)===Q){G(e.6m)e.6m(a,D.L(e,"1H"),Q);N G(e.6l)e.6l("4p"+a,D.L(e,"1H"))}1K=U;3d i[a]}}})}R(1K 1k i)1V;G(!1K){J d=D.L(e,"1H");G(d)d.T=U;D.3b(e,"3x");D.3b(e,"1H")}}},1R:H(h,c,f,g,i){c=D.2h(c);G(h.1i("!")>=0){h=h.3w(0,-1);J a=M}G(!f){G(7.28[h])D("*").17([1c,S]).1R(h,c)}N{G(f.15==3||f.15==8)I 12;J b,1K,18=D.1F(f[h]||U),W=!c[0]||!c[0].37;G(W){c.6b({O:h,2N:f,37:H(){},3X:H(){},4J:1x()});c[0][E]=M}c[0].O=h;G(a)c[0].6k=M;J d=D.L(f,"1H");G(d)b=d.1t(f,c);G((!18||(D.Y(f,\'a\')&&h=="4n"))&&f["4p"+h]&&f["4p"+h].1t(f,c)===Q)b=Q;G(W)c.4s();G(i&&D.1F(i)){1K=i.1t(f,b==U?c:c.75(b));G(1K!==12)b=1K}G(18&&g!==Q&&b!==Q&&!(D.Y(f,\'a\')&&h=="4n")){7.5j=M;23{f[h]()}21(e){}}7.5j=Q}I b},1H:H(b){J a,1K,2T,5e,4m;b=1a[0]=D.W.6j(b||1c.W);2T=b.O.1Q(".");b.O=2T[0];2T=2T[1];5e=!2T&&!b.6k;4m=(D.L(7,"3x")||{})[b.O];R(J j 1k 4m){J c=4m[j];G(5e||c.O==2T){b.2o=c;b.L=c.L;1K=c.1t(7,1a);G(a!==Q)a=1K;G(1K===Q){b.37();b.3X()}}}I a},2L:"8o 8n 8m 8l 2p 8k 42 5c 6h 5I 8j L 8i 8h 4k 2o 59 58 8e 8c 57 6f 8b 8a 4j 88 87 86 6d 2N 4J 6c O 84 83 2S".1Q(" "),6j:H(b){G(b[E]==M)I b;J c=b;b={82:c};R(J i=7.2L.K,1e;i;){1e=7.2L[--i];b[1e]=c[1e]}b[E]=M;b.37=H(){G(c.37)c.37();c.81=Q};b.3X=H(){G(c.3X)c.3X();c.80=M};b.4J=b.4J||1x();G(!b.2N)b.2N=b.6d||S;G(b.2N.15==3)b.2N=b.2N.1f;G(!b.4j&&b.4k)b.4j=b.4k==b.2N?b.6c:b.4k;G(b.57==U&&b.5c!=U){J a=S.1B,1d=S.1d;b.57=b.5c+(a&&a.2c||1d&&1d.2c||0)-(a.69||0);b.6f=b.6h+(a&&a.2l||1d&&1d.2l||0)-(a.68||0)}G(!b.2S&&((b.42||b.42===0)?b.42:b.59))b.2S=b.42||b.59;G(!b.58&&b.5I)b.58=b.5I;G(!b.2S&&b.2p)b.2S=(b.2p&1?1:(b.2p&2?3:(b.2p&4?2:0)));I b},3J:H(a,b){b.29=a.29=a.29||b.29||7.29++;I b},2C:{25:{4q:H(){54();I},4G:H(){I}},4c:{4q:H(){G(D.14.1g)I Q;D(7).2O("51",D.W.2C.4c.2o);I M},4G:H(){G(D.14.1g)I Q;D(7).3L("51",D.W.2C.4c.2o);I M},2o:H(a){G(F(a,7))I M;a.O="4c";I D.W.1H.1t(7,1a)}},3F:{4q:H(){G(D.14.1g)I Q;D(7).2O("4Z",D.W.2C.3F.2o);I M},4G:H(){G(D.14.1g)I Q;D(7).3L("4Z",D.W.2C.3F.2o);I M},2o:H(a){G(F(a,7))I M;a.O="3F";I D.W.1H.1t(7,1a)}}}};D.18.1n({2O:H(c,a,b){I c=="4Y"?7.2Y(c,a,b):7.P(H(){D.W.17(7,c,b||a,b&&a)})},2Y:H(d,b,c){J e=D.W.3J(c||b,H(a){D(7).3L(a,e);I(c||b).1t(7,1a)});I 7.P(H(){D.W.17(7,d,e,c&&b)})},3L:H(a,b){I 7.P(H(){D.W.1Z(7,a,b)})},1R:H(c,a,b){I 7.P(H(){D.W.1R(c,a,7,M,b)})},5G:H(c,a,b){I 7[0]&&D.W.1R(c,a,7[0],Q,b)},2B:H(b){J c=1a,i=1;1G(i<c.K)D.W.3J(b,c[i++]);I 7.4n(D.W.3J(b,H(a){7.4X=(7.4X||0)%i;a.37();I c[7.4X++].1t(7,1a)||Q}))},7X:H(a,b){I 7.2O(\'4c\',a).2O(\'3F\',b)},25:H(a){54();G(D.2Q)a.1l(S,D);N D.3D.1A(H(){I a.1l(7,D)});I 7}});D.1n({2Q:Q,3D:[],25:H(){G(!D.2Q){D.2Q=M;G(D.3D){D.P(D.3D,H(){7.1l(S)});D.3D=U}D(S).5G("25")}}});J x=Q;H 54(){G(x)I;x=M;G(S.4a&&!D.14.2H)S.4a("67",D.25,Q);G(D.14.1g&&1c==1P)(H(){G(D.2Q)I;23{S.1B.7W("1z")}21(3g){3E(1a.3I,0);I}D.25()})();G(D.14.2H)S.4a("67",H(){G(D.2Q)I;R(J i=0;i<S.4V.K;i++)G(S.4V[i].3O){3E(1a.3I,0);I}D.25()},Q);G(D.14.2f){J a;(H(){G(D.2Q)I;G(S.3i!="66"&&S.3i!="1O"){3E(1a.3I,0);I}G(a===12)a=D("V, 7z[7U=7T]").K;G(S.4V.K!=a){3E(1a.3I,0);I}D.25()})()}D.W.17(1c,"3Y",D.25)}D.P(("7S,7R,3Y,7Q,4A,4Y,4n,7P,"+"89,7O,7N,51,4Z,7M,2y,"+"5m,8d,7L,7K,3g").1Q(","),H(i,b){D.18[b]=H(a){I a?7.2O(b,a):7.1R(b)}});J F=H(a,c){J b=a.4j;1G(b&&b!=c)23{b=b.1f}21(3g){b=c}I b==c};D(1c).2O("4Y",H(){D("*").17(S).3L()});D.18.1n({6e:D.18.3Y,3Y:H(g,d,c){G(1j g!=\'1W\')I 7.6e(g);J e=g.1i(" ");G(e>=0){J i=g.3w(e,g.K);g=g.3w(0,e)}c=c||H(){};J f="2R";G(d)G(D.1F(d)){c=d;d=U}N G(1j d==\'3y\'){d=D.3A(d);f="7J"}J h=7;D.3T({1b:g,O:f,1L:"2I",L:d,1O:H(a,b){G(b=="1U"||b=="7I")h.2I(i?D("<1w/>").3s(a.4U.1o(/<1m(.|\\s)*?\\/1m>/g,"")).2u(i):a.4U);h.P(c,[a.4U,b,a])}});I 7},aL:H(){I D.3A(7.7H())},7H:H(){I 7.2i(H(){I D.Y(7,"45")?D.2h(7.aK):7}).1E(H(){I 7.32&&!7.3O&&(7.4M||/2y|6x/i.11(7.Y)||/1r|1C|3K/i.11(7.O))}).2i(H(i,c){J b=D(7).6a();I b==U?U:b.1q==2q?D.2i(b,H(a,i){I{32:c.32,2s:a}}):{32:c.32,2s:b}}).3p()}});D.P("7G,7D,7C,7B,6u,7A".1Q(","),H(i,o){D.18[o]=H(f){I 7.2O(o,f)}});J B=1x();D.1n({3p:H(d,b,a,c){G(D.1F(b)){a=b;b=U}I D.3T({O:"2R",1b:d,L:b,1U:a,1L:c})},aG:H(b,a){I D.3p(b,U,a,"1m")},aF:H(c,b,a){I D.3p(c,b,a,"3B")},aD:H(d,b,a,c){G(D.1F(b)){a=b;b={}}I D.3T({O:"7J",1b:d,L:b,1U:a,1L:c})},aC:H(a){D.1n(D.5Z,a)},5Z:{1b:5Y.5x,28:M,O:"2R",2W:0,7y:"4x/x-ay-45-ax",7v:M,31:M,L:U,5r:U,3K:U,4z:{2K:"4x/2K, 1r/2K",2I:"1r/2I",1m:"1r/4v, 4x/4v",3B:"4x/3B, 1r/4v",1r:"1r/as",4S:"*/*"}},4R:{},3T:H(s){s=D.1n(M,s,D.1n(M,{},D.5Z,s));J g,33=/=\\?(&|$)/g,1v,L,O=s.O.2m();G(s.L&&s.7v&&1j s.L!="1W")s.L=D.3A(s.L);G(s.1L=="4Q"){G(O=="2R"){G(!s.1b.1I(33))s.1b+=(s.1b.1I(/\\?/)?"&":"?")+(s.4Q||"7s")+"=?"}N G(!s.L||!s.L.1I(33))s.L=(s.L?s.L+"&":"")+(s.4Q||"7s")+"=?";s.1L="3B"}G(s.1L=="3B"&&(s.L&&s.L.1I(33)||s.1b.1I(33))){g="4Q"+B++;G(s.L)s.L=(s.L+"").1o(33,"="+g+"$1");s.1b=s.1b.1o(33,"="+g+"$1");s.1L="1m";1c[g]=H(a){L=a;1U();1O();1c[g]=12;23{3d 1c[g]}21(e){}G(i)i.30(h)}}G(s.1L=="1m"&&s.1Y==U)s.1Y=Q;G(s.1Y===Q&&O=="2R"){J j=1x();J k=s.1b.1o(/(\\?|&)3n=.*?(&|$)/,"$am="+j+"$2");s.1b=k+((k==s.1b)?(s.1b.1I(/\\?/)?"&":"?")+"3n="+j:"")}G(s.L&&O=="2R"){s.1b+=(s.1b.1I(/\\?/)?"&":"?")+s.L;s.L=U}G(s.28&&!D.4P++)D.W.1R("7G");J n=/^(?:\\w+:)?\\/\\/([^\\/?#]+)/;G(s.1L=="1m"&&O=="2R"&&n.11(s.1b)&&n.2D(s.1b)[1]!=5Y.ak){J i=S.40("6v")[0];J h=S.3t("1m");h.4e=s.1b;G(s.7r)h.ai=s.7r;G(!g){J l=Q;h.ag=h.af=H(){G(!l&&(!7.3i||7.3i=="66"||7.3i=="1O")){l=M;1U();1O();i.30(h)}}}i.49(h);I 12}J m=Q;J c=1c.7q?2r 7q("ad.ac"):2r 6Q();G(s.5r)c.7o(O,s.1b,s.31,s.5r,s.3K);N c.7o(O,s.1b,s.31);23{G(s.L)c.4O("ab-aa",s.7y);G(s.5T)c.4O("a9-5S-a8",D.4R[s.1b]||"a7, a6 a4 a3 5O:5O:5O a1");c.4O("X-a0-9Y","6Q");c.4O("9X",s.1L&&s.4z[s.1L]?s.4z[s.1L]+", */*":s.4z.4S)}21(e){}G(s.7k&&s.7k(c,s)===Q){s.28&&D.4P--;c.7j();I Q}G(s.28)D.W.1R("7A",[c,s]);J d=H(a){G(!m&&c&&(c.3i==4||a=="2W")){m=M;G(f){7h(f);f=U}1v=a=="2W"?"2W":!D.7g(c)?"3g":s.5T&&D.7f(c,s.1b)?"7I":"1U";G(1v=="1U"){23{L=D.6U(c,s.1L,s.9S)}21(e){1v="5L"}}G(1v=="1U"){J b;23{b=c.5K("7e-5S")}21(e){}G(s.5T&&b)D.4R[s.1b]=b;G(!g)1U()}N D.5E(s,c,1v);1O();G(s.31)c=U}};G(s.31){J f=4L(d,13);G(s.2W>0)3E(H(){G(c){c.7j();G(!m)d("2W")}},s.2W)}23{c.9R(s.L)}21(e){D.5E(s,c,U,e)}G(!s.31)d();H 1U(){G(s.1U)s.1U(L,1v);G(s.28)D.W.1R("6u",[c,s])}H 1O(){G(s.1O)s.1O(c,1v);G(s.28)D.W.1R("7C",[c,s]);G(s.28&&!--D.4P)D.W.1R("7D")}I c},5E:H(s,a,b,e){G(s.3g)s.3g(a,b,e);G(s.28)D.W.1R("7B",[a,s,e])},4P:0,7g:H(a){23{I!a.1v&&5Y.9Q=="5o:"||(a.1v>=7c&&a.1v<9O)||a.1v==7a||a.1v==9N||D.14.2f&&a.1v==12}21(e){}I Q},7f:H(a,c){23{J b=a.5K("7e-5S");I a.1v==7a||b==D.4R[c]||D.14.2f&&a.1v==12}21(e){}I Q},6U:H(a,c,b){J d=a.5K("9L-O"),2K=c=="2K"||!c&&d&&d.1i("2K")>=0,L=2K?a.9K:a.4U;G(2K&&L.1B.2g=="5L")7m"5L";G(b)L=b(L,c);G(c=="1m")D.5u(L);G(c=="3B")L=6s("("+L+")");I L},3A:H(a){J s=[];H 17(b,a){s[s.K]=78(b)+\'=\'+78(a)};G(a.1q==2q||a.5w)D.P(a,H(){17(7.32,7.2s)});N R(J j 1k a)G(a[j]&&a[j].1q==2q)D.P(a[j],H(){17(j,7)});N 17(j,D.1F(a[j])?a[j]():a[j]);I s.6r("&").1o(/%20/g,"+")}});D.18.1n({1N:H(c,b){I c?7.2j({1T:"1N",2d:"1N",1y:"1N"},c,b):7.1E(":1C").P(H(){7.V.19=7.5H||"";G(D.1h(7,"19")=="2P"){J a=D("<"+7.2g+" />").6O("1d");7.V.19=a.1h("19");G(7.V.19=="2P")7.V.19="3H";a.1Z()}}).3m()},1J:H(b,a){I b?7.2j({1T:"1J",2d:"1J",1y:"1J"},b,a):7.1E(":4i").P(H(){7.5H=7.5H||D.1h(7,"19");7.V.19="2P"}).3m()},76:D.18.2B,2B:H(a,b){I D.1F(a)&&D.1F(b)?7.76.1t(7,1a):a?7.2j({1T:"2B",2d:"2B",1y:"2B"},a,b):7.P(H(){D(7)[D(7).3C(":1C")?"1N":"1J"]()})},9J:H(b,a){I 7.2j({1T:"1N"},b,a)},9I:H(b,a){I 7.2j({1T:"1J"},b,a)},9H:H(b,a){I 7.2j({1T:"2B"},b,a)},9G:H(b,a){I 7.2j({1y:"1N"},b,a)},9F:H(b,a){I 7.2j({1y:"1J"},b,a)},9D:H(c,a,b){I 7.2j({1y:a},c,b)},2j:H(k,j,i,g){J h=D.74(j,i,g);I 7[h.35===Q?"P":"35"](H(){G(7.15!=1)I Q;J f=D.1n({},h),p,1C=D(7).3C(":1C"),41=7;R(p 1k k){G(k[p]=="1J"&&1C||k[p]=="1N"&&!1C)I f.1O.1l(7);G(p=="1T"||p=="2d"){f.19=D.1h(7,"19");f.34=7.V.34}}G(f.34!=U)7.V.34="1C";f.44=D.1n({},k);D.P(k,H(c,a){J e=2r D.27(41,f,c);G(/2B|1N|1J/.11(a))e[a=="2B"?1C?"1N":"1J":a](k);N{J b=a.6p().1I(/^([+-]=)?([\\d+-.]+)(.*)$/),2b=e.1u(M)||0;G(b){J d=3e(b[2]),2M=b[3]||"2U";G(2M!="2U"){41.V[c]=(d||1)+2M;2b=((d||1)/e.1u(M))*2b;41.V[c]=2b+2M}G(b[1])d=((b[1]=="-="?-1:1)*d)+2b;e.3Z(2b,d,2M)}N e.3Z(2b,a,"")}});I M})},35:H(a,b){G(D.1F(a)||(a&&a.1q==2q)){b=a;a="27"}G(!a||(1j a=="1W"&&!b))I A(7[0],a);I 7.P(H(){G(b.1q==2q)A(7,a,b);N{A(7,a).1A(b);G(A(7,a).K==1)b.1l(7)}})},9x:H(b,c){J a=D.3M;G(b)7.35([]);7.P(H(){R(J i=a.K-1;i>=0;i--)G(a[i].T==7){G(c)a[i](M);a.7l(i,1)}});G(!c)7.5C();I 7}});J A=H(b,c,a){G(b){c=c||"27";J q=D.L(b,c+"35");G(!q||a)q=D.L(b,c+"35",D.2h(a))}I q};D.18.5C=H(a){a=a||"27";I 7.P(H(){J q=A(7,a);q.4s();G(q.K)q[0].1l(7)})};D.1n({74:H(b,a,c){J d=b&&b.1q==9u?b:{1O:c||!c&&a||D.1F(b)&&b,2v:b,3U:c&&a||a&&a.1q!=9t&&a};d.2v=(d.2v&&d.2v.1q==4N?d.2v:D.27.5N[d.2v])||D.27.5N.71;d.5P=d.1O;d.1O=H(){G(d.35!==Q)D(7).5C();G(D.1F(d.5P))d.5P.1l(7)};I d},3U:{7n:H(p,n,b,a){I b+a*p},5Q:H(p,n,b,a){I((-26.9r(p*26.9q)/2)+0.5)*a+b}},3M:[],46:U,27:H(b,c,a){7.16=c;7.T=b;7.1e=a;G(!c.3R)c.3R={}}});D.27.3V={4E:H(){G(7.16.2Z)7.16.2Z.1l(7.T,7.1x,7);(D.27.2Z[7.1e]||D.27.2Z.4S)(7);G(7.1e=="1T"||7.1e=="2d")7.T.V.19="3H"},1u:H(a){G(7.T[7.1e]!=U&&7.T.V[7.1e]==U)I 7.T[7.1e];J r=3e(D.1h(7.T,7.1e,a));I r&&r>-9p?r:3e(D.24(7.T,7.1e))||0},3Z:H(c,b,d){7.5B=1x();7.2b=c;7.3m=b;7.2M=d||7.2M||"2U";7.1x=7.2b;7.36=7.4C=0;7.4E();J e=7;H t(a){I e.2Z(a)}t.T=7.T;D.3M.1A(t);G(D.46==U){D.46=4L(H(){J a=D.3M;R(J i=0;i<a.K;i++)G(!a[i]())a.7l(i--,1);G(!a.K){7h(D.46);D.46=U}},13)}},1N:H(){7.16.3R[7.1e]=D.1M(7.T.V,7.1e);7.16.1N=M;7.3Z(0,7.1u());G(7.1e=="2d"||7.1e=="1T")7.T.V[7.1e]="9l";D(7.T).1N()},1J:H(){7.16.3R[7.1e]=D.1M(7.T.V,7.1e);7.16.1J=M;7.3Z(7.1u(),0)},2Z:H(a){J t=1x();G(a||t>7.16.2v+7.5B){7.1x=7.3m;7.36=7.4C=1;7.4E();7.16.44[7.1e]=M;J b=M;R(J i 1k 7.16.44)G(7.16.44[i]!==M)b=Q;G(b){G(7.16.19!=U){7.T.V.34=7.16.34;7.T.V.19=7.16.19;G(D.1h(7.T,"19")=="2P")7.T.V.19="3H"}G(7.16.1J)7.T.V.19="2P";G(7.16.1J||7.16.1N)R(J p 1k 7.16.44)D.1M(7.T.V,p,7.16.3R[p])}G(b)7.16.1O.1l(7.T);I Q}N{J n=t-7.5B;7.4C=n/7.16.2v;7.36=D.3U[7.16.3U||(D.3U.5Q?"5Q":"7n")](7.4C,n,0,1,7.16.2v);7.1x=7.2b+((7.3m-7.2b)*7.36);7.4E()}I M}};D.1n(D.27,{5N:{9k:9i,an:7c,71:ao},2Z:{2c:H(a){a.T.2c=a.1x},2l:H(a){a.T.2l=a.1x},1y:H(a){D.1M(a.T.V,"1y",a.1x)},4S:H(a){a.T.V[a.1e]=a.1x+a.2M}}});D.18.2k=H(){J b=0,1P=0,T=7[0],3q;G(T)9f(D.14){J d=T.1f,48=T,1p=T.1p,1S=T.2z,5V=2f&&3v(5F)<9c&&!/aw/i.11(v),1h=D.24,2X=1h(T,"3c")=="2X";G(!(3r&&T==S.1d)&&T.6T){J c=T.6T();17(c.1z+26.2e(1S.1B.2c,1S.1d.2c),c.1P+26.2e(1S.1B.2l,1S.1d.2l));17(-1S.1B.69,-1S.1B.68)}N{17(T.5X,T.5z);1G(1p){17(1p.5X,1p.5z);G(3r&&!/^t(98|d|h)$/i.11(1p.2g)||2f&&!5V)2A(1p);G(!2X&&1h(1p,"3c")=="2X")2X=M;48=/^1d$/i.11(1p.2g)?48:1p;1p=1p.1p}1G(d&&d.2g&&!/^1d|2I$/i.11(d.2g)){G(!/^97|1X.*$/i.11(1h(d,"19")))17(-d.2c,-d.2l);G(3r&&1h(d,"34")!="4i")2A(d);d=d.1f}G((5V&&(2X||1h(48,"3c")=="5g"))||(3r&&1h(48,"3c")!="5g"))17(-1S.1d.5X,-1S.1d.5z);G(2X)17(26.2e(1S.1B.2c,1S.1d.2c),26.2e(1S.1B.2l,1S.1d.2l))}3q={1P:1P,1z:b}}H 2A(a){17(D.24(a,"7w",M),D.24(a,"7x",M))}H 17(l,t){b+=3v(l,10)||0;1P+=3v(t,10)||0}I 3q};D.18.1n({3c:H(){J a=0,1P=0,3q;G(7[0]){J b=7.1p(),2k=7.2k(),4b=/^1d|2I$/i.11(b[0].2g)?{1P:0,1z:0}:b.2k();2k.1P-=2a(7,\'95\');2k.1z-=2a(7,\'94\');4b.1P+=2a(b,\'7x\');4b.1z+=2a(b,\'7w\');3q={1P:2k.1P-4b.1P,1z:2k.1z-4b.1z}}I 3q},1p:H(){J a=7[0].1p;1G(a&&(!/^1d|2I$/i.11(a.2g)&&D.1h(a,\'3c\')==\'aI\'))a=a.1p;I D(a)}});D.P([\'5d\',\'5b\'],H(i,b){J c=\'4A\'+b;D.18[c]=H(a){G(!7[0])I;I a!=12?7.P(H(){7==1c||7==S?1c.aJ(!i?a:D(1c).2c(),i?a:D(1c).2l()):7[c]=a}):7[0]==1c||7[0]==S?41[i?\'92\':\'91\']||D.6Y&&S.1B[c]||S.1d[c]:7[0][c]}});D.P(["6M","47"],H(i,b){J c=i?"5d":"5b",43=i?"6i":"6g";D.18["5s"+b]=H(){I 7[b.3h()]()+2a(7,"55"+c)+2a(7,"55"+43)};D.18["aM"+b]=H(a){I 7["5s"+b]()+2a(7,"2A"+c+"47")+2a(7,"2A"+43+"47")+(a?2a(7,"7F"+c)+2a(7,"7F"+43):0)}})})();',62,671,'|||||||this|||||||||||||||||||||||||||||||||||if|function|return|var|length|data|true|else|type|each|false|for|document|elem|null|style|event||nodeName|||test|undefined||browser|nodeType|options|add|fn|display|arguments|url|window|body|prop|parentNode|msie|css|indexOf|typeof|in|call|script|extend|replace|offsetParent|constructor|text|firstChild|apply|cur|status|div|now|opacity|left|push|documentElement|hidden|className|filter|isFunction|while|handle|match|hide|ret|dataType|attr|show|complete|top|split|trigger|doc|height|success|break|string|table|cache|remove||catch|tbody|try|curCSS|ready|Math|fx|global|guid|num|start|scrollLeft|width|max|safari|tagName|makeArray|map|animate|offset|scrollTop|toUpperCase||handler|button|Array|new|value|id|find|duration|done|copy|select|ownerDocument|border|toggle|special|exec|inArray|pushStack|stack|opera|html|nextSibling|xml|props|unit|target|bind|none|isReady|GET|which|namespace|px|nth|timeout|fixed|one|step|removeChild|async|name|jsre|overflow|queue|pos|preventDefault|insertBefore|merge|selected|removeData|position|delete|parseFloat|multiFilter|error|toLowerCase|readyState|rl|re|trim|end|_|first|get|results|mozilla|append|createElement|childNodes|parseInt|slice|events|object|elems|param|json|is|readyList|setTimeout|mouseleave|grep|block|callee|proxy|password|unbind|timers|defaultView|disabled|last|has|orig|domManip|ajax|easing|prototype|set|stopPropagation|load|custom|getElementsByTagName|self|charCode|br|curAnim|form|timerId|Width|offsetChild|appendChild|addEventListener|parentOffset|mouseenter|color|src|currentStyle|float|clean|visible|relatedTarget|fromElement|innerHTML|handlers|click|isXMLDoc|on|setup|nodeIndex|shift|input|unique|javascript|child|application|RegExp|accepts|scroll|deep|state|previousSibling|update|empty|teardown|tr|jQuery|timeStamp|getAttribute|setInterval|checked|Number|setRequestHeader|active|jsonp|lastModified|_default|dir|responseText|styleSheets|not|lastToggle|unload|mouseout|outline|mouseover|getPropertyValue|getComputedStyle|bindReady|padding|String|pageX|metaKey|keyCode|getWH|Top|clientX|Left|all|container|absolute|index|init|triggered|removeAttribute|classFilter|submit|prevObject|file|after|windowData|username|inner|client|globalEval|sibling|jquery|href|clone|offsetTop|checkbox|startTime|dequeue|visibility|handleError|version|triggerHandler|oldblock|ctrlKey|createTextNode|getResponseHeader|parsererror|andSelf|speeds|00|old|swing|radio|Modified|ifModified|lastChild|safari2|wrapAll|offsetLeft|location|ajaxSettings|getElementById|isSimple|values|selectedIndex|runtimeStyle|rsLeft|loaded|DOMContentLoaded|clientTop|clientLeft|val|unshift|toElement|srcElement|_load|pageY|Bottom|clientY|Right|fix|exclusive|detachEvent|removeEventListener|cloneNode|swap|toString|attachEvent|join|eval|substr|ajaxSuccess|head|parse|textarea|reset|image|zoom|odd|even|before|prepend|expr|exclude|quickClass|quickID|quickChild|uuid|continue|Height|textContent|appendTo|contents|XMLHttpRequest|evalScript|parent|getBoundingClientRect|httpData|setArray|CSS1Compat|compatMode|boxModel|cssFloat|styleFloat|def|webkit|nodeValue|speed|concat|_toggle|eq|encodeURIComponent|100|304|replaceWith|200|alpha|Last|httpNotModified|httpSuccess|clearInterval|getAttributeNode|abort|beforeSend|splice|throw|linear|open|colgroup|ActiveXObject|scriptCharset|callback|fieldset|multiple|processData|borderLeftWidth|borderTopWidth|contentType|link|ajaxSend|ajaxError|ajaxComplete|ajaxStop|col|margin|ajaxStart|serializeArray|notmodified|POST|keyup|keypress|change|mousemove|mouseup|dblclick|resize|focus|blur|stylesheet|rel|hasClass|doScroll|hover|black|solid|cancelBubble|returnValue|originalEvent|wheelDelta|view|round|shiftKey|screenY|screenX|mousedown|relatedNode|prevValue|originalTarget|keydown|newValue|offsetHeight|offsetWidth|eventPhase|detail|currentTarget|cancelable|bubbles|attrName|attrChange|altKey|charAt|0n|substring|animated|header|noConflict|enabled|line|innerText|contains|only|weight|font|gt|lt|uFFFF|u0128|417|size|Boolean|toggleClass|Date|removeClass|addClass|removeAttr|replaceAll|insertAfter|prependTo|contentWindow|wrap|contentDocument|iframe|children|siblings|prevAll|nextAll|wrapInner|prev|pageXOffset|pageYOffset|next|marginLeft|marginTop|parents|inline|able|rowSpan|rowspan|cellSpacing|522|cellspacing|maxLength|with|maxlength|readOnly|600|readonly|slow|1px|class|htmlFor|reverse|10000|PI|cos|compatible|Function|Object|setData|ie|stop|ra|it|rv|getData|userAgent|fadeTo|navigator|fadeOut|fadeIn|slideToggle|slideUp|slideDown|responseXML|content|ig|1223|300|NaN|protocol|send|dataFilter|setAttribute|option|cssText|changed|Accept|With|be|Requested|GMT|can|1970|Jan|property|01|Thu|Since|If|Type|Content|XMLHTTP|Microsoft|th|onreadystatechange|onload|td|charset|cap|host|colg|1_|fast|400|tfoot|specified|thead|plain|leg|attributes|opt|adobeair|urlencoded|www|embed|area|hr|ajaxSetup|post|meta|getJSON|getScript|img|static|scrollTo|elements|serialize|outer|abbr|pixelLeft'.split('|'),0,{}));jQuery.noConflict();
diff -uNr a/mp-wp/wp-includes/js/jquery/jquery.schedule.js b/mp-wp/wp-includes/js/jquery/jquery.schedule.js
--- a/mp-wp/wp-includes/js/jquery/jquery.schedule.js 7d8bd27584517373e8dafa6da4c7bdff9c9d2580d1e9845a70e90d58e4977f02797828a1b612ed65accd677f900766e63b8f61b95203039266e61bc159e184e3
+++ b/mp-wp/wp-includes/js/jquery/jquery.schedule.js false
@@ -1,36 +0,0 @@
-
-(function($){$.scheduler=function(){this.bucket={};return;};$.scheduler.prototype={schedule:function(){var ctx={"id":null,"time":1000,"repeat":false,"protect":false,"obj":null,"func":function(){},"args":[]};function _isfn(fn){return(!!fn&&typeof fn!="string"&&typeof fn[0]=="undefined"&&RegExp("function","i").test(fn+""));};var i=0;var override=false;if(typeof arguments[i]=="object"&&arguments.length>1){override=true;i++;}
-if(typeof arguments[i]=="object"){for(var option in arguments[i])
-if(typeof ctx[option]!="undefined")
-ctx[option]=arguments[i][option];i++;}
-if(typeof arguments[i]=="number"||(typeof arguments[i]=="string"&&arguments[i].match(RegExp("^[0-9]+[smhdw]$"))))
-ctx["time"]=arguments[i++];if(typeof arguments[i]=="boolean")
-ctx["repeat"]=arguments[i++];if(typeof arguments[i]=="boolean")
-ctx["protect"]=arguments[i++];if(typeof arguments[i]=="object"&&typeof arguments[i+1]=="string"&&_isfn(arguments[i][arguments[i+1]])){ctx["obj"]=arguments[i++];ctx["func"]=arguments[i++];}
-else if(typeof arguments[i]!="undefined"&&(_isfn(arguments[i])||typeof arguments[i]=="string"))
-ctx["func"]=arguments[i++];while(typeof arguments[i]!="undefined")
-ctx["args"].push(arguments[i++]);if(override){if(typeof arguments[1]=="object"){for(var option in arguments[0])
-if(typeof ctx[option]!="undefined"&&typeof arguments[1][option]=="undefined")
-ctx[option]=arguments[0][option];}
-else{for(var option in arguments[0])
-if(typeof ctx[option]!="undefined")
-ctx[option]=arguments[0][option];}
-i++;}
-ctx["_scheduler"]=this;ctx["_handle"]=null;var match=String(ctx["time"]).match(RegExp("^([0-9]+)([smhdw])$"));if(match&&match[0]!="undefined"&&match[1]!="undefined")
-ctx["time"]=String(parseInt(match[1])*{s:1000,m:1000*60,h:1000*60*60,d:1000*60*60*24,w:1000*60*60*24*7}[match[2]]);if(ctx["id"]==null)
-ctx["id"]=(String(ctx["repeat"])+":"
-+String(ctx["protect"])+":"
-+String(ctx["time"])+":"
-+String(ctx["obj"])+":"
-+String(ctx["func"])+":"
-+String(ctx["args"]));if(ctx["protect"])
-if(typeof this.bucket[ctx["id"]]!="undefined")
-return this.bucket[ctx["id"]];if(!_isfn(ctx["func"])){if(ctx["obj"]!=null&&typeof ctx["obj"]=="object"&&typeof ctx["func"]=="string"&&_isfn(ctx["obj"][ctx["func"]]))
-ctx["func"]=ctx["obj"][ctx["func"]];else
-ctx["func"]=eval("function () { "+ctx["func"]+" }");}
-ctx["_handle"]=this._schedule(ctx);this.bucket[ctx["id"]]=ctx;return ctx;},reschedule:function(ctx){if(typeof ctx=="string")
-ctx=this.bucket[ctx];ctx["_handle"]=this._schedule(ctx);return ctx;},_schedule:function(ctx){var trampoline=function(){var obj=(ctx["obj"]!=null?ctx["obj"]:ctx);(ctx["func"]).apply(obj,ctx["args"]);if(typeof(ctx["_scheduler"]).bucket[ctx["id"]]!="undefined"&&ctx["repeat"])
-(ctx["_scheduler"])._schedule(ctx);else
-delete(ctx["_scheduler"]).bucket[ctx["id"]];};return setTimeout(trampoline,ctx["time"]);},cancel:function(ctx){if(typeof ctx=="string")
-ctx=this.bucket[ctx];if(typeof ctx=="object"){clearTimeout(ctx["_handle"]);delete this.bucket[ctx["id"]];}}};$.extend({scheduler$:new $.scheduler(),schedule:function(){return $.scheduler$.schedule.apply($.scheduler$,arguments)},reschedule:function(){return $.scheduler$.reschedule.apply($.scheduler$,arguments)},cancel:function(){return $.scheduler$.cancel.apply($.scheduler$,arguments)}});$.fn.extend({schedule:function(){var a=[{}];for(var i=0;i<arguments.length;i++)
-a.push(arguments[i]);return this.each(function(){a[0]={"id":this,"obj":this};return $.schedule.apply($,a);});}});})(jQuery);
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/jquery/jquery.table-hotkeys.js b/mp-wp/wp-includes/js/jquery/jquery.table-hotkeys.js
--- a/mp-wp/wp-includes/js/jquery/jquery.table-hotkeys.js 7c3c4b55c51d91ab842ac90ce93af4326272be0be9f8350619f92a402eb8266067c2ada83f67d0ffe182143886909f0ce3d143ef2e24c25110fa4cdefe6506cb
+++ b/mp-wp/wp-includes/js/jquery/jquery.table-hotkeys.js false
@@ -1,93 +0,0 @@
-(function($){
-	$.fn.filter_visible = function(depth) {
-		depth = depth || 3;
-		var is_visible = function() {
-			var p = $(this);
-			for(i=0; i<depth-1; ++i) {
-				if (!p.is(':visible')) return false;
-				p = p.parent();
-			}
-			return true;
-		}
-		return this.filter(is_visible);
-	};
-	$.table_hotkeys = function(table, keys, opts) {
-		opts = $.extend($.table_hotkeys.defaults, opts);
-		var selected_class = opts.class_prefix + opts.selected_suffix;
-		var destructive_class = opts.class_prefix + opts.destructive_suffix;
-		var set_current_row = function (tr) {
-			if ($.table_hotkeys.current_row) $.table_hotkeys.current_row.removeClass(selected_class);
-			tr.addClass(selected_class);
-			tr[0].scrollIntoView(false);
-			$.table_hotkeys.current_row = tr;
-		};
-		var adjacent_row_callback = function(which) {
-			if (!adjacent_row(which) && $.isFunction(opts[which+'_page_link_cb'])) {
-				opts[which+'_page_link_cb']();
-			}
-		};
-		var get_adjacent_row = function(which) {
-			if (!$.table_hotkeys.current_row) {
-				var first_row = get_first_row();
-				$.table_hotkeys.current_row = first_row;
-				return first_row[0];
-			}
-			var method = 'prev' == which? $.fn.prevAll : $.fn.nextAll;
-			return method.call($.table_hotkeys.current_row, opts.cycle_expr).filter_visible()[0];
-		};
-		var adjacent_row = function(which) {
-			var adj = get_adjacent_row(which);
-			if (!adj) return false;
-			set_current_row($(adj));
-			return true;
-		};
-		var prev_row = function() { return adjacent_row('prev'); };
-		var next_row = function() { return adjacent_row('next'); };
-		var check = function() {
-			$(opts.checkbox_expr, $.table_hotkeys.current_row).each(function() {
-				this.checked = !this.checked;
-			});
-		};
-		var get_first_row = function() {
-			return $(opts.cycle_expr, table).filter_visible().eq(opts.start_row_index);
-		};
-		var get_last_row = function() {
-			var rows = $(opts.cycle_expr, table).filter_visible();
-			return rows.eq(rows.length-1);
-		};
-		var make_key_callback = function(expr) {
-			return function() {
-				if ( null == $.table_hotkeys.current_row ) return false;
-				var clickable = $(expr, $.table_hotkeys.current_row);
-				if (!clickable.length) return false;
-				if (clickable.is('.'+destructive_class)) next_row() || prev_row();
-				clickable.click();
-			}
-		};
-		var first_row = get_first_row();
-		if (!first_row.length) return;
-		if (opts.highlight_first)
-			set_current_row(first_row);
-		else if (opts.highlight_last)
-			set_current_row(get_last_row());
-		jQuery.hotkeys.add(opts.prev_key, opts.hotkeys_opts, function() {return adjacent_row_callback('prev')});
-		jQuery.hotkeys.add(opts.next_key, opts.hotkeys_opts, function() {return adjacent_row_callback('next')});
-		jQuery.hotkeys.add(opts.mark_key, opts.hotkeys_opts, check);
-		jQuery.each(keys, function() {
-			if ($.isFunction(this[1])) {
-				var callback = this[1];
-				var key = this[0];
-				jQuery.hotkeys.add(key, opts.hotkeys_opts, function(event) { return callback(event, $.table_hotkeys.current_row); });
-			} else {
-				var key = this;
-				jQuery.hotkeys.add(key, opts.hotkeys_opts, make_key_callback('.'+opts.class_prefix+key));
-			}
-		});
-
-	};
-	$.table_hotkeys.current_row = null;
-	$.table_hotkeys.defaults = {cycle_expr: 'tr', class_prefix: 'vim-', selected_suffix: 'current',
-		destructive_suffix: 'destructive', hotkeys_opts: {disableInInput: true, type: 'keypress'},
-		checkbox_expr: ':checkbox', next_key: 'j', prev_key: 'k', mark_key: 'x',
-		start_row_index: 2, highlight_first: false, highlight_last: false, next_page_link_cb: false, prev_page_link_cb: false};
-})(jQuery);
diff -uNr a/mp-wp/wp-includes/js/jquery/suggest.js b/mp-wp/wp-includes/js/jquery/suggest.js
--- a/mp-wp/wp-includes/js/jquery/suggest.js 58f566e9688bbf7461ae81dfcca82360f54effbb3ea29d7fa039dd36f3df497214971aabd9730e26e04a7a0294b217b27ff5f12085609708f9a039c42097e09a
+++ b/mp-wp/wp-includes/js/jquery/suggest.js false
@@ -1,332 +0,0 @@
-/*
- *	jquery.suggest 1.1b - 2007-08-06
- * Patched by Mark Jaquith with Alexander Dick's "multiple items" patch to allow for auto-suggesting of more than one tag before submitting
- * See: http://www.vulgarisoip.com/2007/06/29/jquerysuggest-an-alternative-jquery-based-autocomplete-library/#comment-7228
- *	
- *	Uses code and techniques from following libraries:
- *	1. http://www.dyve.net/jquery/?autocomplete
- *	2. http://dev.jquery.com/browser/trunk/plugins/interface/iautocompleter.js	
- *
- *	All the new stuff written by Peter Vulgaris (www.vulgarisoip.com)	
- *	Feel free to do whatever you want with this file
- *
- */
-
-(function($) {
-
-	$.suggest = function(input, options) {
-
-		var $input = $(input).attr("autocomplete", "off");
-		var $results = $(document.createElement("ul"));
-
-		var timeout = false;		// hold timeout ID for suggestion results to appear	
-		var prevLength = 0;			// last recorded length of $input.val()
-		var cache = [];				// cache MRU list
-		var cacheSize = 0;			// size of cache in chars (bytes?)
-		
-		$results.addClass(options.resultsClass).appendTo('body');
-			
-
-		resetPosition();
-		$(window)
-			.load(resetPosition)		// just in case user is changing size of page while loading
-			.resize(resetPosition);
-
-		$input.blur(function() {
-			setTimeout(function() { $results.hide() }, 200);
-		});
-		
-		
-		// help IE users if possible
-		try {
-			$results.bgiframe();
-		} catch(e) { }
-
-
-		// I really hate browser detection, but I don't see any other way
-		if ($.browser.mozilla)
-			$input.keypress(processKey);	// onkeypress repeats arrow keys in Mozilla/Opera
-		else
-			$input.keydown(processKey);		// onkeydown repeats arrow keys in IE/Safari
-		
-
-
-
-		function resetPosition() {
-			// requires jquery.dimension plugin
-			var offset = $input.offset();
-			$results.css({
-				top: (offset.top + input.offsetHeight) + 'px',
-				left: offset.left + 'px'
-			});
-		}
-		
-		
-		function processKey(e) {
-			
-			// handling up/down/escape requires results to be visible
-			// handling enter/tab requires that AND a result to be selected
-			if ((/27$|38$|40$/.test(e.keyCode) && $results.is(':visible')) ||
-				(/^13$|^9$/.test(e.keyCode) && getCurrentResult())) {
-				
-				if (e.preventDefault)
-					e.preventDefault();
-				if (e.stopPropagation)
-					e.stopPropagation();
-
-				e.cancelBubble = true;
-				e.returnValue = false;
-			
-				switch(e.keyCode) {
-
-					case 38: // up
-						prevResult();
-						break;
-			
-					case 40: // down
-						nextResult();
-						break;
-
-					case 9:  // tab
-					case 13: // return
-						selectCurrentResult();
-						break;
-						
-					case 27: //	escape
-						$results.hide();
-						break;
-
-				}
-				
-			} else if ($input.val().length != prevLength) {
-
-				if (timeout) 
-					clearTimeout(timeout);
-				timeout = setTimeout(suggest, options.delay);
-				prevLength = $input.val().length;
-				
-			}			
-				
-			
-		}
-		
-		
-		function suggest() {
-		
-			var q = $.trim($input.val());
-
-			if ( options.multiple ) {
-				var multipleSepPos = q.lastIndexOf(options.multipleSep);
-				if ( multipleSepPos != -1 ) {
-					q = q.substr(multipleSepPos + options.multipleSep.length);
-				}
-			}
-			if (q.length >= options.minchars) {
-				
-				cached = checkCache(q);
-				
-				if (cached) {
-				
-					displayItems(cached['items']);
-					
-				} else {
-				
-					$.get(options.source, {q: q}, function(txt) {
-
-						$results.hide();
-						
-						var items = parseTxt(txt, q);
-						
-						displayItems(items);
-						addToCache(q, items, txt.length);
-						
-					});
-					
-				}
-				
-			} else {
-			
-				$results.hide();
-				
-			}
-				
-		}
-		
-		
-		function checkCache(q) {
-
-			for (var i = 0; i < cache.length; i++)
-				if (cache[i]['q'] == q) {
-					cache.unshift(cache.splice(i, 1)[0]);
-					return cache[0];
-				}
-			
-			return false;
-		
-		}
-		
-		function addToCache(q, items, size) {
-
-			while (cache.length && (cacheSize + size > options.maxCacheSize)) {
-				var cached = cache.pop();
-				cacheSize -= cached['size'];
-			}
-			
-			cache.push({
-				q: q,
-				size: size,
-				items: items
-				});
-				
-			cacheSize += size;
-		
-		}
-		
-		function displayItems(items) {
-			
-			if (!items)
-				return;
-				
-			if (!items.length) {
-				$results.hide();
-				return;
-			}
-
-			resetPosition(); // when the form moves after the page has loaded
-
-			var html = '';
-			for (var i = 0; i < items.length; i++)
-				html += '<li>' + items[i] + '</li>';
-
-			$results.html(html).show();
-			
-			$results
-				.children('li')
-				.mouseover(function() {
-					$results.children('li').removeClass(options.selectClass);
-					$(this).addClass(options.selectClass);
-				})
-				.click(function(e) {
-					e.preventDefault(); 
-					e.stopPropagation();
-					selectCurrentResult();
-				});
-						
-		}
-		
-		function parseTxt(txt, q) {
-			
-			var items = [];
-			var tokens = txt.split(options.delimiter);
-			
-			// parse returned data for non-empty items
-			for (var i = 0; i < tokens.length; i++) {
-				var token = $.trim(tokens[i]);
-				if (token) {
-					token = token.replace(
-						new RegExp(q, 'ig'), 
-						function(q) { return '<span class="' + options.matchClass + '">' + q + '</span>' }
-						);
-					items[items.length] = token;
-				}
-			}
-			
-			return items;
-		}
-		
-		function getCurrentResult() {
-		
-			if (!$results.is(':visible'))
-				return false;
-		
-			var $currentResult = $results.children('li.' + options.selectClass);
-			
-			if (!$currentResult.length)
-				$currentResult = false;
-				
-			return $currentResult;
-
-		}
-		
-		function selectCurrentResult() {
-		
-			$currentResult = getCurrentResult();
-		
-			if ($currentResult) {
-				if ( options.multiple ) {
-					if ( $input.val().indexOf(options.multipleSep) != -1 ) {
-						$currentVal = $input.val().substr( 0, ( $input.val().lastIndexOf(options.multipleSep) + options.multipleSep.length ) );
-					} else {
-						$currentVal = "";
-					}
-					$input.val( $currentVal + $currentResult.text() + options.multipleSep);
-					$input.focus();
-				} else {
-					$input.val($currentResult.text());
-				}
-				$results.hide();
-				
-				if (options.onSelect)
-					options.onSelect.apply($input[0]);
-					
-			}
-		
-		}
-		
-		function nextResult() {
-		
-			$currentResult = getCurrentResult();
-		
-			if ($currentResult)
-				$currentResult
-					.removeClass(options.selectClass)
-					.next()
-						.addClass(options.selectClass);
-			else
-				$results.children('li:first-child').addClass(options.selectClass);
-		
-		}
-		
-		function prevResult() {
-		
-			$currentResult = getCurrentResult();
-		
-			if ($currentResult)
-				$currentResult
-					.removeClass(options.selectClass)
-					.prev()
-						.addClass(options.selectClass);
-			else
-				$results.children('li:last-child').addClass(options.selectClass);
-		
-		}
-
-	}
-	
-	$.fn.suggest = function(source, options) {
-	
-		if (!source)
-			return;
-	
-		options = options || {};
-		options.multiple = options.multiple || false;
-		options.multipleSep = options.multipleSep || ", ";
-		options.source = source;
-		options.delay = options.delay || 100;
-		options.resultsClass = options.resultsClass || 'ac_results';
-		options.selectClass = options.selectClass || 'ac_over';
-		options.matchClass = options.matchClass || 'ac_match';
-		options.minchars = options.minchars || 2;
-		options.delimiter = options.delimiter || '\n';
-		options.onSelect = options.onSelect || false;
-		options.maxCacheSize = options.maxCacheSize || 65536;
-
-		this.each(function() {
-			new $.suggest(this, options);
-		});
-
-		return this;
-		
-	};
-	
-})(jQuery);
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/jquery/ui.core.js b/mp-wp/wp-includes/js/jquery/ui.core.js
--- a/mp-wp/wp-includes/js/jquery/ui.core.js b00eb412f06614416c25c244cecafa925478507603bb3e1420d58dca716c98102b07611caaa3ce28e0b335cf732782344ba8ea8539924e576cfadd1fb3ea03d0
+++ b/mp-wp/wp-includes/js/jquery/ui.core.js false
@@ -1,2 +0,0 @@
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(3(C){C.8={2r:{V:3(E,F,H){6 G=C.8[E].o;1v(6 D 2q H){G.w[D]=G.w[D]||[];G.w[D].2p([F,H[D]])}},1p:3(D,F,E){6 H=D.w[F];5(!H){4}1v(6 G=0;G<H.1e;G++){5(D.a[H[G][0]]){H[G][1].v(D.c,E)}}}},p:{},d:3(D){5(C.8.p[D]){4 C.8.p[D]}6 E=C(\'<2o 2n="8-2m">\').1k(D).d({2l:"2k",12:"-1u",2j:"-1u",2i:"2h"}).2g("1t");C.8.p[D]=!!((!(/2f|2e/).h(E.d("2d"))||(/^[1-9]/).h(E.d("2c"))||(/^[1-9]/).h(E.d("2b"))||!(/1r/).h(E.d("2a"))||!(/29|28\\(0, 0, 0, 0\\)/).h(E.d("27"))));26{C("1t").1s(0).25(E.1s(0))}24(F){}4 C.8.p[D]},23:3(D){C(D).k("j","1i").d("1q","1r")},22:3(D){C(D).k("j","21").d("1q","")},20:3(G,E){6 D=/12/.h(E||"12")?"1Z":"1Y",F=7;5(G[D]>0){4 f}G[D]=1;F=G[D]>0?f:7;G[D]=0;4 F}};6 B=C.10.u;C.10.u=3(){C("*",2).V(2).1X("u");4 B.v(2,1o)};3 A(E,F,G){6 D=C[E][F].1W||[];D=(X D=="W"?D.11(/,?\\s+/):D);4(C.1V(G,D)!=-1)}C.m=3(E,D){6 F=E.11(".")[0];E=E.11(".")[1];C.10[E]=3(J){6 H=(X J=="W"),I=1U.o.1T.1p(1o,1);5(H&&A(F,E,J)){6 G=C.Z(2[0],E);4(G?G[J].v(G,I):1S)}4 2.1R(3(){6 K=C.Z(2,E);5(H&&K&&C.1Q(K[J])){K[J].v(K,I)}1P{5(!H){C.Z(2,E,1O C[F][E](2,J))}}})};C[F][E]=3(I,H){6 G=2;2.e=E;2.1j=F+"-"+E;2.a=C.1n({},C.m.q,C[F][E].q,H);2.c=C(I).g("n."+E,3(L,J,K){4 G.n(J,K)}).g("Y."+E,3(K,J){4 G.Y(J)}).g("u",3(){4 G.1l()});2.1m()};C[F][E].o=C.1n({},C.m.o,D)};C.m.o={1m:3(){},1l:3(){2.c.1N(2.e)},Y:3(D){4 2.a[D]},n:3(D,E){2.a[D]=E;5(D=="l"){2.c[E?"1k":"1M"](2.1j+"-l")}},1L:3(){2.n("l",7)},1K:3(){2.n("l",f)}};C.m.q={l:7};C.8.14={1J:3(){6 D=2;2.c.g("1I."+2.e,3(E){4 D.1g(E)});5(C.U.T){2.1h=2.c.k("j");2.c.k("j","1i")}2.1H=7},1G:3(){2.c.R("."+2.e);(C.U.T&&2.c.k("j",2.1h))},1g:3(F){(2.b&&2.i(F));2.t=F;6 E=2,G=(F.1F==1),D=(X 2.a.y=="W"?C(F.1f).1E().V(F.1f).1D(2.a.y).1e:7);5(!G||D||!2.15(F)){4 f}2.r=!2.a.x;5(!2.r){2.1C=1B(3(){E.r=f},2.a.x)}5(2.P(F)&&2.N(F)){2.b=(2.M(F)!==7);5(!2.b){F.1A();4 f}}2.S=3(H){4 E.1d(H)};2.Q=3(H){4 E.i(H)};C(1c).g("1b."+2.e,2.S).g("1a."+2.e,2.Q);4 7},1d:3(D){5(C.U.T&&!D.1z){4 2.i(D)}5(2.b){2.z(D);4 7}5(2.P(D)&&2.N(D)){2.b=(2.M(2.t,D)!==7);(2.b?2.z(D):2.i(D))}4!2.b},i:3(D){C(1c).R("1b."+2.e,2.S).R("1a."+2.e,2.Q);5(2.b){2.b=7;2.16(D)}4 7},P:3(D){4(O.1y(O.18(2.t.19-D.19),O.18(2.t.17-D.17))>=2.a.13)},N:3(D){4 2.r},M:3(D){},z:3(D){},16:3(D){},15:3(D){4 f}};C.8.14.q={y:1x,13:1,x:0}})(1w)',62,152,'||this|function|return|if|var|false|ui||options|_mouseStarted|element|css|widgetName|true|bind|test|mouseUp|unselectable|attr|disabled|widget|setData|prototype|cssCache|defaults|_mouseDelayMet||_mouseDownEvent|remove|apply|plugins|delay|cancel|mouseDrag|||||||||||||mouseStart|mouseDelayMet|Math|mouseDistanceMet|_mouseUpDelegate|unbind|_mouseMoveDelegate|msie|browser|add|string|typeof|getData|data|fn|split|top|distance|mouse|mouseCapture|mouseStop|pageY|abs|pageX|mouseup|mousemove|document|mouseMove|length|target|mouseDown|_mouseUnselectable|on|widgetBaseClass|addClass|destroy|init|extend|arguments|call|MozUserSelect|none|get|body|5000px|for|jQuery|null|max|button|preventDefault|setTimeout|_mouseDelayTimer|filter|parents|which|mouseDestroy|started|mousedown|mouseInit|disable|enable|removeClass|removeData|new|else|isFunction|each|undefined|slice|Array|inArray|getter|triggerHandler|scrollLeft|scrollTop|hasScroll|off|enableSelection|disableSelection|catch|removeChild|try|backgroundColor|rgba|transparent|backgroundImage|width|height|cursor|default|auto|appendTo|block|display|left|absolute|position|gen|class|div|push|in|plugin'.split('|'),0,{}))
-
diff -uNr a/mp-wp/wp-includes/js/jquery/ui.dialog.js b/mp-wp/wp-includes/js/jquery/ui.dialog.js
--- a/mp-wp/wp-includes/js/jquery/ui.dialog.js 70866e334cb0f7333d2088493eb7315c603bb2438fb3f03e719f3fad471f143c527f78903b5f4b911be999e690a37d11eb662ef12595b00c77ff761c76cc4809
+++ b/mp-wp/wp-includes/js/jquery/ui.dialog.js false
@@ -1 +0,0 @@
-(function(B){var A={dragStart:"start.draggable",drag:"drag.draggable",dragStop:"stop.draggable",maxHeight:"maxHeight.resizable",minHeight:"minHeight.resizable",maxWidth:"maxWidth.resizable",minWidth:"minWidth.resizable",resizeStart:"start.resizable",resize:"drag.resizable",resizeStop:"stop.resizable"};B.widget("ui.dialog",{init:function(){var J=this,K=this.options,D=typeof K.resizable=="string"?K.resizable:"n,e,s,w,se,sw,ne,nw",E=this.element.addClass("ui-dialog-content").wrap("<div/>").wrap("<div/>"),G=(this.uiDialogContainer=E.parent().addClass("ui-dialog-container").css({position:"relative",width:"100%",height:"100%"})),H=K.title||E.attr("title")||"",C=(this.uiDialogTitlebar=B('<div class="ui-dialog-titlebar"/>')).append('<span class="ui-dialog-title">'+H+"</span>").append('<a href="#" class="ui-dialog-titlebar-close"><span>X</span></a>').prependTo(G),I=(this.uiDialog=G.parent()).appendTo(document.body).hide().addClass("ui-dialog").addClass(K.dialogClass).addClass(E.attr("className")).removeClass("ui-dialog-content").css({position:"absolute",width:K.width,height:K.height,overflow:"hidden",zIndex:K.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(L){if(K.closeOnEscape){var M=27;(L.keyCode&&L.keyCode==M&&J.close())}}).mousedown(function(){J.moveToTop()}),F=(this.uiDialogButtonPane=B("<div/>")).addClass("ui-dialog-buttonpane").css({position:"absolute",bottom:0}).appendTo(I);this.uiDialogTitlebarClose=B(".ui-dialog-titlebar-close",C).hover(function(){B(this).addClass("ui-dialog-titlebar-close-hover")},function(){B(this).removeClass("ui-dialog-titlebar-close-hover")}).mousedown(function(L){L.stopPropagation()}).click(function(){J.close();return false});this.uiDialogTitlebar.find("*").add(this.uiDialogTitlebar).each(function(){B.ui.disableSelection(this)});if(B.fn.draggable){I.draggable({cancel:".ui-dialog-content",helper:K.dragHelper,handle:".ui-dialog-titlebar",start:function(M,L){J.moveToTop();(K.dragStart&&K.dragStart.apply(J.element[0],arguments))},drag:function(M,L){(K.drag&&K.drag.apply(J.element[0],arguments))},stop:function(M,L){(K.dragStop&&K.dragStop.apply(J.element[0],arguments));B.ui.dialog.overlay.resize()}});(K.draggable||I.draggable("disable"))}if(B.fn.resizable){I.resizable({cancel:".ui-dialog-content",helper:K.resizeHelper,maxWidth:K.maxWidth,maxHeight:K.maxHeight,minWidth:K.minWidth,minHeight:K.minHeight,start:function(){(K.resizeStart&&K.resizeStart.apply(J.element[0],arguments))},resize:function(M,L){(K.autoResize&&J.size.apply(J));(K.resize&&K.resize.apply(J.element[0],arguments))},handles:D,stop:function(M,L){(K.autoResize&&J.size.apply(J));(K.resizeStop&&K.resizeStop.apply(J.element[0],arguments));B.ui.dialog.overlay.resize()}});(K.resizable||I.resizable("disable"))}this.createButtons(K.buttons);this.isOpen=false;(K.bgiframe&&B.fn.bgiframe&&I.bgiframe());(K.autoOpen&&this.open())},setData:function(C,D){(A[C]&&this.uiDialog.data(A[C],D));switch(C){case"buttons":this.createButtons(D);break;case"draggable":this.uiDialog.draggable(D?"enable":"disable");break;case"height":this.uiDialog.height(D);break;case"position":this.position(D);break;case"resizable":(typeof D=="string"&&this.uiDialog.data("handles.resizable",D));this.uiDialog.resizable(D?"enable":"disable");break;case"title":B(".ui-dialog-title",this.uiDialogTitlebar).text(D);break;case"width":this.uiDialog.width(D);break}B.widget.prototype.setData.apply(this,arguments)},position:function(H){var D=B(window),E=B(document),F=E.scrollTop(),C=E.scrollLeft(),G=F;if(B.inArray(H,["center","top","right","bottom","left"])>=0){H=[H=="right"||H=="left"?H:"center",H=="top"||H=="bottom"?H:"middle"]}if(H.constructor!=Array){H=["center","middle"]}if(H[0].constructor==Number){C+=H[0]}else{switch(H[0]){case"left":C+=0;break;case"right":C+=D.width()-this.uiDialog.width();break;default:case"center":C+=(D.width()-this.uiDialog.width())/2}}if(H[1].constructor==Number){F+=H[1]}else{switch(H[1]){case"top":F+=0;break;case"bottom":F+=D.height()-this.uiDialog.height();break;default:case"middle":F+=(D.height()-this.uiDialog.height())/2}}F=Math.max(F,G);this.uiDialog.css({top:F,left:C})},size:function(){var D=this.uiDialogContainer,G=this.uiDialogTitlebar,E=this.element,F=parseInt(E.css("margin-top"),10)+parseInt(E.css("margin-bottom"),10),C=parseInt(E.css("margin-left"),10)+parseInt(E.css("margin-right"),10);E.height(D.height()-G.outerHeight()-F);E.width(D.width()-C)},open:function(){if(this.isOpen){return }this.overlay=this.options.modal?new B.ui.dialog.overlay(this):null;(this.uiDialog.next().length>0)&&this.uiDialog.appendTo("body");this.position(this.options.position);this.uiDialog.show(this.options.show);this.options.autoResize&&this.size();this.moveToTop(true);var C=null;var D={options:this.options};this.uiDialogTitlebarClose.focus();this.element.triggerHandler("dialogopen",[C,D],this.options.open);this.isOpen=true},moveToTop:function(E){if((this.options.modal&&!E)||(!this.options.stack&&!this.options.modal)){return this.element.triggerHandler("dialogfocus",[null,{options:this.options}],this.options.focus)}var D=this.options.zIndex,C=this.options;B(".ui-dialog:visible").each(function(){D=Math.max(D,parseInt(B(this).css("z-index"),10)||C.zIndex)});(this.overlay&&this.overlay.$el.css("z-index",++D));this.uiDialog.css("z-index",++D);this.element.triggerHandler("dialogfocus",[null,{options:this.options}],this.options.focus)},close:function(){(this.overlay&&this.overlay.destroy());this.uiDialog.hide(this.options.hide);var D=null;var C={options:this.options};this.element.triggerHandler("dialogclose",[D,C],this.options.close);B.ui.dialog.overlay.resize();this.isOpen=false},destroy:function(){(this.overlay&&this.overlay.destroy());this.uiDialog.hide();this.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content").hide().appendTo("body");this.uiDialog.remove()},createButtons:function(F){var E=this,C=false,D=this.uiDialogButtonPane;D.empty().hide();B.each(F,function(){return !(C=true)});if(C){D.show();B.each(F,function(G,H){B("<button/>").text(G).click(function(){H.apply(E.element[0],arguments)}).appendTo(D)})}}});B.extend(B.ui.dialog,{defaults:{autoOpen:true,autoResize:true,bgiframe:false,buttons:{},closeOnEscape:true,draggable:true,height:200,minHeight:100,minWidth:150,modal:false,overlay:{},position:"center",resizable:true,stack:true,width:300,zIndex:1000},overlay:function(C){this.$el=B.ui.dialog.overlay.create(C)}});B.extend(B.ui.dialog.overlay,{instances:[],events:B.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(C){return C+".dialog-overlay"}).join(" "),create:function(D){if(this.instances.length===0){setTimeout(function(){B("a, :input").bind(B.ui.dialog.overlay.events,function(){var F=false;var H=B(this).parents(".ui-dialog");if(H.length){var E=B(".ui-dialog-overlay");if(E.length){var G=parseInt(E.css("z-index"),10);E.each(function(){G=Math.max(G,parseInt(B(this).css("z-index"),10))});F=parseInt(H.css("z-index"),10)>G}else{F=true}}return F})},1);B(document).bind("keydown.dialog-overlay",function(E){var F=27;(E.keyCode&&E.keyCode==F&&D.close())});B(window).bind("resize.dialog-overlay",B.ui.dialog.overlay.resize)}var C=B("<div/>").appendTo(document.body).addClass("ui-dialog-overlay").css(B.extend({borderWidth:0,margin:0,padding:0,position:"absolute",top:0,left:0,width:this.width(),height:this.height()},D.options.overlay));(D.options.bgiframe&&B.fn.bgiframe&&C.bgiframe());this.instances.push(C);return C},destroy:function(C){this.instances.splice(B.inArray(this.instances,C),1);if(this.instances.length===0){B("a, :input").add([document,window]).unbind(".dialog-overlay")}C.remove()},height:function(){if(B.browser.msie&&B.browser.version<7){var D=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);var C=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);if(D<C){return B(window).height()+"px"}else{return D+"px"}}else{return B(document).height()+"px"}},width:function(){if(B.browser.msie&&B.browser.version<7){var C=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);var D=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);if(C<D){return B(window).width()+"px"}else{return C+"px"}}else{return B(document).width()+"px"}},resize:function(){var C=B([]);B.each(B.ui.dialog.overlay.instances,function(){C=C.add(this)});C.css({width:0,height:0}).css({width:B.ui.dialog.overlay.width(),height:B.ui.dialog.overlay.height()})}});B.extend(B.ui.dialog.overlay.prototype,{destroy:function(){B.ui.dialog.overlay.destroy(this.$el)}})})(jQuery)
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/jquery/ui.draggable.js b/mp-wp/wp-includes/js/jquery/ui.draggable.js
--- a/mp-wp/wp-includes/js/jquery/ui.draggable.js 0d37215b4e51f4e111c1ab33db5ec769c95df733b33de2a78e2a7cf5daef95d4c919361bdad08e803fbf8a4435697bda1ed3f6a4565efe8b011b2567690d410e
+++ b/mp-wp/wp-includes/js/jquery/ui.draggable.js false
@@ -1 +0,0 @@
-(function(A){A.widget("ui.draggable",A.extend({},A.ui.mouse,{init:function(){var B=this.options;if(B.helper=="original"&&!(/(relative|absolute|fixed)/).test(this.element.css("position"))){this.element.css("position","relative")}this.element.addClass("ui-draggable");(B.disabled&&this.element.addClass("ui-draggable-disabled"));this.mouseInit()},mouseStart:function(F){var H=this.options;if(this.helper||H.disabled||A(F.target).is(".ui-resizable-handle")){return false}var C=!this.options.handle||!A(this.options.handle,this.element).length?true:false;A(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==F.target){C=true}});if(!C){return false}if(A.ui.ddmanager){A.ui.ddmanager.current=this}this.helper=A.isFunction(H.helper)?A(H.helper.apply(this.element[0],[F])):(H.helper=="clone"?this.element.clone():this.element);if(!this.helper.parents("body").length){this.helper.appendTo((H.appendTo=="parent"?this.element[0].parentNode:H.appendTo))}if(this.helper[0]!=this.element[0]&&!(/(fixed|absolute)/).test(this.helper.css("position"))){this.helper.css("position","absolute")}this.margins={left:(parseInt(this.element.css("marginLeft"),10)||0),top:(parseInt(this.element.css("marginTop"),10)||0)};this.cssPosition=this.helper.css("position");this.offset=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.offset.click={left:F.pageX-this.offset.left,top:F.pageY-this.offset.top};this.offsetParent=this.helper.offsetParent();var B=this.offsetParent.offset();if(this.offsetParent[0]==document.body&&A.browser.mozilla){B={top:0,left:0}}this.offset.parent={top:B.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:B.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)};var E=this.element.position();this.offset.relative=this.cssPosition=="relative"?{top:E.top-(parseInt(this.helper.css("top"),10)||0)+this.offsetParent[0].scrollTop,left:E.left-(parseInt(this.helper.css("left"),10)||0)+this.offsetParent[0].scrollLeft}:{top:0,left:0};this.originalPosition=this.generatePosition(F);this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(H.cursorAt){if(H.cursorAt.left!=undefined){this.offset.click.left=H.cursorAt.left+this.margins.left}if(H.cursorAt.right!=undefined){this.offset.click.left=this.helperProportions.width-H.cursorAt.right+this.margins.left}if(H.cursorAt.top!=undefined){this.offset.click.top=H.cursorAt.top+this.margins.top}if(H.cursorAt.bottom!=undefined){this.offset.click.top=this.helperProportions.height-H.cursorAt.bottom+this.margins.top}}if(H.containment){if(H.containment=="parent"){H.containment=this.helper[0].parentNode}if(H.containment=="document"||H.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,A(H.containment=="document"?document:window).width()-this.offset.relative.left-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.element.css("marginRight"),10)||0),(A(H.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.offset.relative.top-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.element.css("marginBottom"),10)||0)]}if(!(/^(document|window|parent)$/).test(H.containment)){var D=A(H.containment)[0];var G=A(H.containment).offset();this.containment=[G.left+(parseInt(A(D).css("borderLeftWidth"),10)||0)-this.offset.relative.left-this.offset.parent.left,G.top+(parseInt(A(D).css("borderTopWidth"),10)||0)-this.offset.relative.top-this.offset.parent.top,G.left+Math.max(D.scrollWidth,D.offsetWidth)-(parseInt(A(D).css("borderLeftWidth"),10)||0)-this.offset.relative.left-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.element.css("marginRight"),10)||0),G.top+Math.max(D.scrollHeight,D.offsetHeight)-(parseInt(A(D).css("borderTopWidth"),10)||0)-this.offset.relative.top-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.element.css("marginBottom"),10)||0)]}}this.propagate("start",F);this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(A.ui.ddmanager&&!H.dropBehaviour){A.ui.ddmanager.prepareOffsets(this,F)}this.helper.addClass("ui-draggable-dragging");this.mouseDrag(F);return true},convertPositionTo:function(C,D){if(!D){D=this.position}var B=C=="absolute"?1:-1;return{top:(D.top+this.offset.relative.top*B+this.offset.parent.top*B-(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollTop)*B+(this.cssPosition=="fixed"?A(document).scrollTop():0)*B+this.margins.top*B),left:(D.left+this.offset.relative.left*B+this.offset.parent.left*B-(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollLeft)*B+(this.cssPosition=="fixed"?A(document).scrollLeft():0)*B+this.margins.left*B)}},generatePosition:function(E){var F=this.options;var B={top:(E.pageY-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollTop)-(this.cssPosition=="fixed"?A(document).scrollTop():0)),left:(E.pageX-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollLeft)-(this.cssPosition=="fixed"?A(document).scrollLeft():0))};if(!this.originalPosition){return B}if(this.containment){if(B.left<this.containment[0]){B.left=this.containment[0]}if(B.top<this.containment[1]){B.top=this.containment[1]}if(B.left>this.containment[2]){B.left=this.containment[2]}if(B.top>this.containment[3]){B.top=this.containment[3]}}if(F.grid){var D=this.originalPosition.top+Math.round((B.top-this.originalPosition.top)/F.grid[1])*F.grid[1];B.top=this.containment?(!(D<this.containment[1]||D>this.containment[3])?D:(!(D<this.containment[1])?D-F.grid[1]:D+F.grid[1])):D;var C=this.originalPosition.left+Math.round((B.left-this.originalPosition.left)/F.grid[0])*F.grid[0];B.left=this.containment?(!(C<this.containment[0]||C>this.containment[2])?C:(!(C<this.containment[0])?C-F.grid[0]:C+F.grid[0])):C}return B},mouseDrag:function(B){this.position=this.generatePosition(B);this.positionAbs=this.convertPositionTo("absolute");this.position=this.propagate("drag",B)||this.position;if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}if(A.ui.ddmanager){A.ui.ddmanager.drag(this,B)}return false},mouseStop:function(C){var D=false;if(A.ui.ddmanager&&!this.options.dropBehaviour){var D=A.ui.ddmanager.drop(this,C)}if((this.options.revert=="invalid"&&!D)||(this.options.revert=="valid"&&D)||this.options.revert===true){var B=this;A(this.helper).animate(this.originalPosition,parseInt(this.options.revert,10)||500,function(){B.propagate("stop",C);B.clear()})}else{this.propagate("stop",C);this.clear()}return false},clear:function(){this.helper.removeClass("ui-draggable-dragging");if(this.options.helper!="original"&&!this.cancelHelperRemoval){this.helper.remove()}this.helper=null;this.cancelHelperRemoval=false},plugins:{},uiHash:function(B){return{helper:this.helper,position:this.position,absolutePosition:this.positionAbs,options:this.options}},propagate:function(C,B){A.ui.plugin.call(this,C,[B,this.uiHash()]);if(C=="drag"){this.positionAbs=this.convertPositionTo("absolute")}return this.element.triggerHandler(C=="drag"?C:"drag"+C,[B,this.uiHash()],this.options[C])},destroy:function(){if(!this.element.data("draggable")){return }this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable");this.mouseDestroy()}}));A.extend(A.ui.draggable,{defaults:{appendTo:"parent",axis:false,cancel:":input",delay:0,distance:1,helper:"original"}});A.ui.plugin.add("draggable","cursor",{start:function(D,C){var B=A("body");if(B.css("cursor")){C.options._cursor=B.css("cursor")}B.css("cursor",C.options.cursor)},stop:function(C,B){if(B.options._cursor){A("body").css("cursor",B.options._cursor)}}});A.ui.plugin.add("draggable","zIndex",{start:function(D,C){var B=A(C.helper);if(B.css("zIndex")){C.options._zIndex=B.css("zIndex")}B.css("zIndex",C.options.zIndex)},stop:function(C,B){if(B.options._zIndex){A(B.helper).css("zIndex",B.options._zIndex)}}});A.ui.plugin.add("draggable","opacity",{start:function(D,C){var B=A(C.helper);if(B.css("opacity")){C.options._opacity=B.css("opacity")}B.css("opacity",C.options.opacity)},stop:function(C,B){if(B.options._opacity){A(B.helper).css("opacity",B.options._opacity)}}});A.ui.plugin.add("draggable","iframeFix",{start:function(C,B){A(B.options.iframeFix===true?"iframe":B.options.iframeFix).each(function(){A('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1000}).css(A(this).offset()).appendTo("body")})},stop:function(C,B){A("div.DragDropIframeFix").each(function(){this.parentNode.removeChild(this)})}});A.ui.plugin.add("draggable","scroll",{start:function(D,C){var E=C.options;var B=A(this).data("draggable");E.scrollSensitivity=E.scrollSensitivity||20;E.scrollSpeed=E.scrollSpeed||20;B.overflowY=function(F){do{if(/auto|scroll/.test(F.css("overflow"))||(/auto|scroll/).test(F.css("overflow-y"))){return F}F=F.parent()}while(F[0].parentNode);return A(document)}(this);B.overflowX=function(F){do{if(/auto|scroll/.test(F.css("overflow"))||(/auto|scroll/).test(F.css("overflow-x"))){return F}F=F.parent()}while(F[0].parentNode);return A(document)}(this);if(B.overflowY[0]!=document&&B.overflowY[0].tagName!="HTML"){B.overflowYOffset=B.overflowY.offset()}if(B.overflowX[0]!=document&&B.overflowX[0].tagName!="HTML"){B.overflowXOffset=B.overflowX.offset()}},drag:function(D,C){var E=C.options;var B=A(this).data("draggable");if(B.overflowY[0]!=document&&B.overflowY[0].tagName!="HTML"){if((B.overflowYOffset.top+B.overflowY[0].offsetHeight)-D.pageY<E.scrollSensitivity){B.overflowY[0].scrollTop=B.overflowY[0].scrollTop+E.scrollSpeed}if(D.pageY-B.overflowYOffset.top<E.scrollSensitivity){B.overflowY[0].scrollTop=B.overflowY[0].scrollTop-E.scrollSpeed}}else{if(D.pageY-A(document).scrollTop()<E.scrollSensitivity){A(document).scrollTop(A(document).scrollTop()-E.scrollSpeed)}if(A(window).height()-(D.pageY-A(document).scrollTop())<E.scrollSensitivity){A(document).scrollTop(A(document).scrollTop()+E.scrollSpeed)}}if(B.overflowX[0]!=document&&B.overflowX[0].tagName!="HTML"){if((B.overflowXOffset.left+B.overflowX[0].offsetWidth)-D.pageX<E.scrollSensitivity){B.overflowX[0].scrollLeft=B.overflowX[0].scrollLeft+E.scrollSpeed}if(D.pageX-B.overflowXOffset.left<E.scrollSensitivity){B.overflowX[0].scrollLeft=B.overflowX[0].scrollLeft-E.scrollSpeed}}else{if(D.pageX-A(document).scrollLeft()<E.scrollSensitivity){A(document).scrollLeft(A(document).scrollLeft()-E.scrollSpeed)}if(A(window).width()-(D.pageX-A(document).scrollLeft())<E.scrollSensitivity){A(document).scrollLeft(A(document).scrollLeft()+E.scrollSpeed)}}}});A.ui.plugin.add("draggable","snap",{start:function(D,C){var B=A(this).data("draggable");B.snapElements=[];A(C.options.snap===true?".ui-draggable":C.options.snap).each(function(){var F=A(this);var E=F.offset();if(this!=B.element[0]){B.snapElements.push({item:this,width:F.outerWidth(),height:F.outerHeight(),top:E.top,left:E.left})}})},drag:function(J,N){var I=A(this).data("draggable");var L=N.options.snapTolerance||20;var D=N.absolutePosition.left,C=D+I.helperProportions.width,P=N.absolutePosition.top,O=P+I.helperProportions.height;for(var H=I.snapElements.length-1;H>=0;H--){var E=I.snapElements[H].left,B=E+I.snapElements[H].width,R=I.snapElements[H].top,M=R+I.snapElements[H].height;if(!((E-L<D&&D<B+L&&R-L<P&&P<M+L)||(E-L<D&&D<B+L&&R-L<O&&O<M+L)||(E-L<C&&C<B+L&&R-L<P&&P<M+L)||(E-L<C&&C<B+L&&R-L<O&&O<M+L))){continue}if(N.options.snapMode!="inner"){var K=Math.abs(R-O)<=20;var Q=Math.abs(M-P)<=20;var G=Math.abs(E-C)<=20;var F=Math.abs(B-D)<=20;if(K){N.position.top=I.convertPositionTo("relative",{top:R-I.helperProportions.height,left:0}).top}if(Q){N.position.top=I.convertPositionTo("relative",{top:M,left:0}).top}if(G){N.position.left=I.convertPositionTo("relative",{top:0,left:E-I.helperProportions.width}).left}if(F){N.position.left=I.convertPositionTo("relative",{top:0,left:B}).left}}if(N.options.snapMode!="outer"){var K=Math.abs(R-P)<=20;var Q=Math.abs(M-O)<=20;var G=Math.abs(E-D)<=20;var F=Math.abs(B-C)<=20;if(K){N.position.top=I.convertPositionTo("relative",{top:R,left:0}).top}if(Q){N.position.top=I.convertPositionTo("relative",{top:M-I.helperProportions.height,left:0}).top}if(G){N.position.left=I.convertPositionTo("relative",{top:0,left:E}).left}if(F){N.position.left=I.convertPositionTo("relative",{top:0,left:B-I.helperProportions.width}).left}}}}});A.ui.plugin.add("draggable","connectToSortable",{start:function(D,C){var B=A(this).data("draggable");B.sortables=[];A(C.options.connectToSortable).each(function(){if(A.data(this,"sortable")){var E=A.data(this,"sortable");B.sortables.push({instance:E,shouldRevert:E.options.revert});E.refreshItems();E.propagate("activate",D,B)}})},stop:function(D,C){var B=A(this).data("draggable");A.each(B.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;B.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert){this.instance.options.revert=true}this.instance.mouseStop(D);this.instance.element.triggerHandler("sortreceive",[D,A.extend(this.instance.ui(),{sender:B.element})],this.instance.options["receive"]);this.instance.options.helper=this.instance.options._helper}else{this.instance.propagate("deactivate",D,B)}})},drag:function(F,E){var D=A(this).data("draggable"),B=this;var C=function(K){var H=K.left,J=H+K.width,I=K.top,G=I+K.height;return(H<(this.positionAbs.left+this.offset.click.left)&&(this.positionAbs.left+this.offset.click.left)<J&&I<(this.positionAbs.top+this.offset.click.top)&&(this.positionAbs.top+this.offset.click.top)<G)};A.each(D.sortables,function(G){if(C.call(D,this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=A(B).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return E.helper[0]};F.target=this.instance.currentItem[0];this.instance.mouseCapture(F,true);this.instance.mouseStart(F,true,true);this.instance.offset.click.top=D.offset.click.top;this.instance.offset.click.left=D.offset.click.left;this.instance.offset.parent.left-=D.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=D.offset.parent.top-this.instance.offset.parent.top;D.propagate("toSortable",F)}if(this.instance.currentItem){this.instance.mouseDrag(F)}}else{if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance.mouseStop(F,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();if(this.instance.placeholder){this.instance.placeholder.remove()}D.propagate("fromSortable",F)}}})}});A.ui.plugin.add("draggable","stack",{start:function(D,B){var C=A.makeArray(A(B.options.stack.group)).sort(function(F,E){return(parseInt(A(F).css("zIndex"),10)||B.options.stack.min)-(parseInt(A(E).css("zIndex"),10)||B.options.stack.min)});A(C).each(function(E){this.style.zIndex=B.options.stack.min+E});this[0].style.zIndex=B.options.stack.min+C.length}})})(jQuery)
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/jquery/ui.resizable.js b/mp-wp/wp-includes/js/jquery/ui.resizable.js
--- a/mp-wp/wp-includes/js/jquery/ui.resizable.js 48c0298a8620d0a1099a3366f416e947e7f1dcdd2f017e6848ecbebb182ad312d5aae8c7b064bbe2a580251e60317493a1d7b3ce3fb13b1d1b0105893d9b4141
+++ b/mp-wp/wp-includes/js/jquery/ui.resizable.js false
@@ -1 +0,0 @@
-(function(A){A.widget("ui.resizable",A.extend({},A.ui.mouse,{init:function(){var M=this,N=this.options;var Q=this.element.css("position");this.originalElement=this.element;this.element.addClass("ui-resizable").css({position:/static/.test(Q)?"relative":Q});A.extend(N,{_aspectRatio:!!(N.aspectRatio),helper:N.helper||N.ghost||N.animate?N.helper||"proxy":null,knobHandles:N.knobHandles===true?"ui-resizable-knob-handle":N.knobHandles});var H="1px solid #DEDEDE";N.defaultTheme={"ui-resizable":{display:"block"},"ui-resizable-handle":{position:"absolute",background:"#F2F2F2",fontSize:"0.1px"},"ui-resizable-n":{cursor:"n-resize",height:"4px",left:"0px",right:"0px",borderTop:H},"ui-resizable-s":{cursor:"s-resize",height:"4px",left:"0px",right:"0px",borderBottom:H},"ui-resizable-e":{cursor:"e-resize",width:"4px",top:"0px",bottom:"0px",borderRight:H},"ui-resizable-w":{cursor:"w-resize",width:"4px",top:"0px",bottom:"0px",borderLeft:H},"ui-resizable-se":{cursor:"se-resize",width:"4px",height:"4px",borderRight:H,borderBottom:H},"ui-resizable-sw":{cursor:"sw-resize",width:"4px",height:"4px",borderBottom:H,borderLeft:H},"ui-resizable-ne":{cursor:"ne-resize",width:"4px",height:"4px",borderRight:H,borderTop:H},"ui-resizable-nw":{cursor:"nw-resize",width:"4px",height:"4px",borderLeft:H,borderTop:H}};N.knobTheme={"ui-resizable-handle":{background:"#F2F2F2",border:"1px solid #808080",height:"8px",width:"8px"},"ui-resizable-n":{cursor:"n-resize",top:"0px",left:"45%"},"ui-resizable-s":{cursor:"s-resize",bottom:"0px",left:"45%"},"ui-resizable-e":{cursor:"e-resize",right:"0px",top:"45%"},"ui-resizable-w":{cursor:"w-resize",left:"0px",top:"45%"},"ui-resizable-se":{cursor:"se-resize",right:"0px",bottom:"0px"},"ui-resizable-sw":{cursor:"sw-resize",left:"0px",bottom:"0px"},"ui-resizable-nw":{cursor:"nw-resize",left:"0px",top:"0px"},"ui-resizable-ne":{cursor:"ne-resize",right:"0px",top:"0px"}};N._nodeName=this.element[0].nodeName;if(N._nodeName.match(/canvas|textarea|input|select|button|img/i)){var B=this.element;if(/relative/.test(B.css("position"))&&A.browser.opera){B.css({position:"relative",top:"auto",left:"auto"})}B.wrap(A('<div class="ui-wrapper"	style="overflow: hidden;"></div>').css({position:B.css("position"),width:B.outerWidth(),height:B.outerHeight(),top:B.css("top"),left:B.css("left")}));var J=this.element;this.element=this.element.parent();this.element.data("resizable",this);this.element.css({marginLeft:J.css("marginLeft"),marginTop:J.css("marginTop"),marginRight:J.css("marginRight"),marginBottom:J.css("marginBottom")});J.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});if(A.browser.safari&&N.preventDefault){J.css("resize","none")}N.proportionallyResize=J.css({position:"static",zoom:1,display:"block"});this.element.css({margin:J.css("margin")});this._proportionallyResize()}if(!N.handles){N.handles=!A(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}}if(N.handles.constructor==String){N.zIndex=N.zIndex||1000;if(N.handles=="all"){N.handles="n,e,s,w,se,sw,ne,nw"}var O=N.handles.split(",");N.handles={};var G={handle:"position: absolute; display: none; overflow:hidden;",n:"top: 0pt; width:100%;",e:"right: 0pt; height:100%;",s:"bottom: 0pt; width:100%;",w:"left: 0pt; height:100%;",se:"bottom: 0pt; right: 0px;",sw:"bottom: 0pt; left: 0px;",ne:"top: 0pt; right: 0px;",nw:"top: 0pt; left: 0px;"};for(var R=0;R<O.length;R++){var S=A.trim(O[R]),L=N.defaultTheme,F="ui-resizable-"+S,C=!A.ui.css(F)&&!N.knobHandles,P=A.ui.css("ui-resizable-knob-handle"),T=A.extend(L[F],L["ui-resizable-handle"]),D=A.extend(N.knobTheme[F],!P?N.knobTheme["ui-resizable-handle"]:{});var K=/sw|se|ne|nw/.test(S)?{zIndex:++N.zIndex}:{};var I=(C?G[S]:""),E=A(['<div class="ui-resizable-handle ',F,'" style="',I,G.handle,'"></div>'].join("")).css(K);N.handles[S]=".ui-resizable-"+S;this.element.append(E.css(C?T:{}).css(N.knobHandles?D:{}).addClass(N.knobHandles?"ui-resizable-knob-handle":"").addClass(N.knobHandles))}if(N.knobHandles){this.element.addClass("ui-resizable-knob").css(!A.ui.css("ui-resizable-knob")?{}:{})}}this._renderAxis=function(Y){Y=Y||this.element;for(var V in N.handles){if(N.handles[V].constructor==String){N.handles[V]=A(N.handles[V],this.element).show()}if(N.transparent){N.handles[V].css({opacity:0})}if(this.element.is(".ui-wrapper")&&N._nodeName.match(/textarea|input|select|button/i)){var W=A(N.handles[V],this.element),X=0;X=/sw|ne|nw|se|n|s/.test(V)?W.outerHeight():W.outerWidth();var U=["padding",/ne|nw|n/.test(V)?"Top":/se|sw|s/.test(V)?"Bottom":/^e$/.test(V)?"Right":"Left"].join("");if(!N.transparent){Y.css(U,X)}this._proportionallyResize()}if(!A(N.handles[V]).length){continue}}};this._renderAxis(this.element);N._handles=A(".ui-resizable-handle",M.element);if(N.disableSelection){N._handles.each(function(U,V){A.ui.disableSelection(V)})}N._handles.mouseover(function(){if(!N.resizing){if(this.className){var U=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}M.axis=N.axis=U&&U[1]?U[1]:"se"}});if(N.autoHide){N._handles.hide();A(M.element).addClass("ui-resizable-autohide").hover(function(){A(this).removeClass("ui-resizable-autohide");N._handles.show()},function(){if(!N.resizing){A(this).addClass("ui-resizable-autohide");N._handles.hide()}})}this.mouseInit()},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,options:this.options,originalSize:this.originalSize,originalPosition:this.originalPosition}},propagate:function(C,B){A.ui.plugin.call(this,C,[B,this.ui()]);if(C!="resize"){this.element.triggerHandler(["resize",C].join(""),[B,this.ui()],this.options[C])}},destroy:function(){var D=this.element,C=D.children(".ui-resizable").get(0);this.mouseDestroy();var B=function(E){A(E).removeClass("ui-resizable ui-resizable-disabled").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};B(D);if(D.is(".ui-wrapper")&&C){D.parent().append(A(C).css({position:D.css("position"),width:D.outerWidth(),height:D.outerHeight(),top:D.css("top"),left:D.css("left")})).end().remove();B(C)}},mouseStart:function(K){if(this.options.disabled){return false}var J=false;for(var H in this.options.handles){if(A(this.options.handles[H])[0]==K.target){J=true}}if(!J){return false}var C=this.options,B=this.element.position(),D=this.element,I=function(O){return parseInt(O,10)||0},G=A.browser.msie&&A.browser.version<7;C.resizing=true;C.documentScroll={top:A(document).scrollTop(),left:A(document).scrollLeft()};if(D.is(".ui-draggable")||(/absolute/).test(D.css("position"))){var M=A.browser.msie&&!C.containment&&(/absolute/).test(D.css("position"))&&!(/relative/).test(D.parent().css("position"));var L=M?C.documentScroll.top:0,F=M?C.documentScroll.left:0;D.css({position:"absolute",top:(B.top+L),left:(B.left+F)})}if(A.browser.opera&&/relative/.test(D.css("position"))){D.css({position:"relative",top:"auto",left:"auto"})}this._renderProxy();var N=I(this.helper.css("left")),E=I(this.helper.css("top"));if(C.containment){N+=A(C.containment).scrollLeft()||0;E+=A(C.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:N,top:E};this.size=C.helper||G?{width:D.outerWidth(),height:D.outerHeight()}:{width:D.width(),height:D.height()};this.originalSize=C.helper||G?{width:D.outerWidth(),height:D.outerHeight()}:{width:D.width(),height:D.height()};this.originalPosition={left:N,top:E};this.sizeDiff={width:D.outerWidth()-D.width(),height:D.outerHeight()-D.height()};this.originalMousePosition={left:K.pageX,top:K.pageY};C.aspectRatio=(typeof C.aspectRatio=="number")?C.aspectRatio:((this.originalSize.height/this.originalSize.width)||1);if(C.preserveCursor){A("body").css("cursor",this.axis+"-resize")}this.propagate("start",K);return true},mouseDrag:function(I){var D=this.helper,C=this.options,J={},M=this,F=this.originalMousePosition,K=this.axis;var N=(I.pageX-F.left)||0,L=(I.pageY-F.top)||0;var E=this._change[K];if(!E){return false}var H=E.apply(this,[I,N,L]),G=A.browser.msie&&A.browser.version<7,B=this.sizeDiff;if(C._aspectRatio||I.shiftKey){H=this._updateRatio(H,I)}H=this._respectSize(H,I);this.propagate("resize",I);D.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!C.helper&&C.proportionallyResize){this._proportionallyResize()}this._updateCache(H);this.element.triggerHandler("resize",[I,this.ui()],this.options["resize"]);return false},mouseStop:function(I){this.options.resizing=false;var E=this.options,H=function(M){return parseInt(M,10)||0},K=this;if(E.helper){var D=E.proportionallyResize,B=D&&(/textarea/i).test(D.get(0).nodeName),C=B&&A.ui.hasScroll(D.get(0),"left")?0:K.sizeDiff.height,G=B?0:K.sizeDiff.width;var L={width:(K.size.width-G),height:(K.size.height-C)},F=(parseInt(K.element.css("left"),10)+(K.position.left-K.originalPosition.left))||null,J=(parseInt(K.element.css("top"),10)+(K.position.top-K.originalPosition.top))||null;if(!E.animate){this.element.css(A.extend(L,{top:J,left:F}))}if(E.helper&&!E.animate){this._proportionallyResize()}}if(E.preserveCursor){A("body").css("cursor","auto")}this.propagate("stop",I);if(E.helper){this.helper.remove()}return false},_updateCache:function(B){var C=this.options;this.offset=this.helper.offset();if(B.left){this.position.left=B.left}if(B.top){this.position.top=B.top}if(B.height){this.size.height=B.height}if(B.width){this.size.width=B.width}},_updateRatio:function(D,E){var F=this.options,G=this.position,C=this.size,B=this.axis;if(D.height){D.width=(C.height/F.aspectRatio)}else{if(D.width){D.height=(C.width*F.aspectRatio)}}if(B=="sw"){D.left=G.left+(C.width-D.width);D.top=null}if(B=="nw"){D.top=G.top+(C.height-D.height);D.left=G.left+(C.width-D.width)}return D},_respectSize:function(H,I){var F=this.helper,E=this.options,N=E._aspectRatio||I.shiftKey,M=this.axis,P=H.width&&E.maxWidth&&E.maxWidth<H.width,J=H.height&&E.maxHeight&&E.maxHeight<H.height,D=H.width&&E.minWidth&&E.minWidth>H.width,O=H.height&&E.minHeight&&E.minHeight>H.height;if(D){H.width=E.minWidth}if(O){H.height=E.minHeight}if(P){H.width=E.maxWidth}if(J){H.height=E.maxHeight}var C=this.originalPosition.left+this.originalSize.width,L=this.position.top+this.size.height;var G=/sw|nw|w/.test(M),B=/nw|ne|n/.test(M);if(D&&G){H.left=C-E.minWidth}if(P&&G){H.left=C-E.maxWidth}if(O&&B){H.top=L-E.minHeight}if(J&&B){H.top=L-E.maxHeight}var K=!H.width&&!H.height;if(K&&!H.left&&H.top){H.top=null}else{if(K&&!H.top&&H.left){H.left=null}}return H},_proportionallyResize:function(){var F=this.options;if(!F.proportionallyResize){return }var D=F.proportionallyResize,C=this.helper||this.element;if(!F.borderDif){var B=[D.css("borderTopWidth"),D.css("borderRightWidth"),D.css("borderBottomWidth"),D.css("borderLeftWidth")],E=[D.css("paddingTop"),D.css("paddingRight"),D.css("paddingBottom"),D.css("paddingLeft")];F.borderDif=A.map(B,function(G,I){var H=parseInt(G,10)||0,J=parseInt(E[I],10)||0;return H+J})}D.css({height:(C.height()-F.borderDif[0]-F.borderDif[2])+"px",width:(C.width()-F.borderDif[1]-F.borderDif[3])+"px"})},_renderProxy:function(){var C=this.element,F=this.options;this.elementOffset=C.offset();if(F.helper){this.helper=this.helper||A('<div style="overflow:hidden;"></div>');var B=A.browser.msie&&A.browser.version<7,D=(B?1:0),E=(B?2:-1);this.helper.addClass(F.helper).css({width:C.outerWidth()+E,height:C.outerHeight()+E,position:"absolute",left:this.elementOffset.left-D+"px",top:this.elementOffset.top-D+"px",zIndex:++F.zIndex});this.helper.appendTo("body");if(F.disableSelection){A.ui.disableSelection(this.helper.get(0))}}else{this.helper=C}},_change:{e:function(D,C,B){return{width:this.originalSize.width+C}},w:function(F,C,B){var G=this.options,D=this.originalSize,E=this.originalPosition;return{left:E.left+C,width:D.width-C}},n:function(F,C,B){var G=this.options,D=this.originalSize,E=this.originalPosition;return{top:E.top+B,height:D.height-B}},s:function(D,C,B){return{height:this.originalSize.height+B}},se:function(D,C,B){return A.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[D,C,B]))},sw:function(D,C,B){return A.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[D,C,B]))},ne:function(D,C,B){return A.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[D,C,B]))},nw:function(D,C,B){return A.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[D,C,B]))}}}));A.extend(A.ui.resizable,{defaults:{cancel:":input",distance:1,delay:0,preventDefault:true,transparent:false,minWidth:10,minHeight:10,aspectRatio:false,disableSelection:true,preserveCursor:true,autoHide:false,knobHandles:false}});A.ui.plugin.add("resizable","containment",{start:function(I,K){var E=K.options,M=A(this).data("resizable"),G=M.element;var C=E.containment,F=(C instanceof A)?C.get(0):(/parent/.test(C))?G.parent().get(0):C;if(!F){return }M.containerElement=A(F);if(/document/.test(C)||C==document){M.containerOffset={left:0,top:0};M.containerPosition={left:0,top:0};M.parentData={element:A(document),left:0,top:0,width:A(document).width(),height:A(document).height()||document.body.parentNode.scrollHeight}}else{M.containerOffset=A(F).offset();M.containerPosition=A(F).position();M.containerSize={height:A(F).innerHeight(),width:A(F).innerWidth()};var J=M.containerOffset,B=M.containerSize.height,H=M.containerSize.width,D=(A.ui.hasScroll(F,"left")?F.scrollWidth:H),L=(A.ui.hasScroll(F)?F.scrollHeight:B);M.parentData={element:F,left:J.left,top:J.top,width:D,height:L}}},resize:function(H,K){var E=K.options,N=A(this).data("resizable"),C=N.containerSize,J=N.containerOffset,G=N.size,I=N.position,L=E._aspectRatio||H.shiftKey,B={top:0,left:0},D=N.containerElement;if(D[0]!=document&&/static/.test(D.css("position"))){B=N.containerPosition}if(I.left<(E.helper?J.left:B.left)){N.size.width=N.size.width+(E.helper?(N.position.left-J.left):(N.position.left-B.left));if(L){N.size.height=N.size.width*E.aspectRatio}N.position.left=E.helper?J.left:B.left}if(I.top<(E.helper?J.top:0)){N.size.height=N.size.height+(E.helper?(N.position.top-J.top):N.position.top);if(L){N.size.width=N.size.height/E.aspectRatio}N.position.top=E.helper?J.top:0}var F=(E.helper?N.offset.left-J.left:(N.position.left-B.left))+N.sizeDiff.width,M=(E.helper?N.offset.top-J.top:N.position.top)+N.sizeDiff.height;if(F+N.size.width>=N.parentData.width){N.size.width=N.parentData.width-F;if(L){N.size.height=N.size.width*E.aspectRatio}}if(M+N.size.height>=N.parentData.height){N.size.height=N.parentData.height-M;if(L){N.size.width=N.size.height/E.aspectRatio}}},stop:function(G,J){var C=J.options,L=A(this).data("resizable"),H=L.position,I=L.containerOffset,B=L.containerPosition,D=L.containerElement;var E=A(L.helper),M=E.offset(),K=E.innerWidth(),F=E.innerHeight();if(C.helper&&!C.animate&&/relative/.test(D.css("position"))){A(this).css({left:(M.left-I.left),top:(M.top-I.top),width:K,height:F})}if(C.helper&&!C.animate&&/static/.test(D.css("position"))){A(this).css({left:B.left+(M.left-I.left),top:B.top+(M.top-I.top),width:K,height:F})}}});A.ui.plugin.add("resizable","grid",{resize:function(H,J){var D=J.options,L=A(this).data("resizable"),G=L.size,E=L.originalSize,F=L.originalPosition,K=L.axis,I=D._aspectRatio||H.shiftKey;D.grid=typeof D.grid=="number"?[D.grid,D.grid]:D.grid;var C=Math.round((G.width-E.width)/(D.grid[0]||1))*(D.grid[0]||1),B=Math.round((G.height-E.height)/(D.grid[1]||1))*(D.grid[1]||1);if(/^(se|s|e)$/.test(K)){L.size.width=E.width+C;L.size.height=E.height+B}else{if(/^(ne)$/.test(K)){L.size.width=E.width+C;L.size.height=E.height+B;L.position.top=F.top-B}else{if(/^(sw)$/.test(K)){L.size.width=E.width+C;L.size.height=E.height+B;L.position.left=F.left-C}else{L.size.width=E.width+C;L.size.height=E.height+B;L.position.top=F.top-B;L.position.left=F.left-C}}}}});A.ui.plugin.add("resizable","animate",{stop:function(I,K){var F=K.options,L=A(this).data("resizable");var E=F.proportionallyResize,B=E&&(/textarea/i).test(E.get(0).nodeName),C=B&&A.ui.hasScroll(E.get(0),"left")?0:L.sizeDiff.height,H=B?0:L.sizeDiff.width;var D={width:(L.size.width-H),height:(L.size.height-C)},G=(parseInt(L.element.css("left"),10)+(L.position.left-L.originalPosition.left))||null,J=(parseInt(L.element.css("top"),10)+(L.position.top-L.originalPosition.top))||null;L.element.animate(A.extend(D,J&&G?{top:J,left:G}:{}),{duration:F.animateDuration||"slow",easing:F.animateEasing||"swing",step:function(){var M={width:parseInt(L.element.css("width"),10),height:parseInt(L.element.css("height"),10),top:parseInt(L.element.css("top"),10),left:parseInt(L.element.css("left"),10)};if(E){E.css({width:M.width,height:M.height})}L._updateCache(M);L.propagate("animate",I)}})}});A.ui.plugin.add("resizable","ghost",{start:function(E,D){var F=D.options,B=A(this).data("resizable"),G=F.proportionallyResize,C=B.size;if(!G){B.ghost=B.element.clone()}else{B.ghost=G.clone()}B.ghost.css({opacity:0.25,display:"block",position:"relative",height:C.height,width:C.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof F.ghost=="string"?F.ghost:"");B.ghost.appendTo(B.helper)},resize:function(D,C){var E=C.options,B=A(this).data("resizable"),F=E.proportionallyResize;if(B.ghost){B.ghost.css({position:"relative",height:B.size.height,width:B.size.width})}},stop:function(D,C){var E=C.options,B=A(this).data("resizable"),F=E.proportionallyResize;if(B.ghost&&B.helper){B.helper.get(0).removeChild(B.ghost.get(0))}}});A.ui.plugin.add("resizable","alsoResize",{start:function(E,C){var F=C.options,B=A(this).data("resizable"),D=function(G){A(G).each(function(){A(this).data("resizable-alsoresize",{width:parseInt(A(this).width(),10),height:parseInt(A(this).height(),10),left:parseInt(A(this).css("left"),10),top:parseInt(A(this).css("top"),10)})})};if(typeof (F.alsoResize)=="object"){if(F.alsoResize.length){F.alsoResize=F.alsoResize[0];D(F.alsoResize)}else{A.each(F.alsoResize,function(G,H){D(G)})}}else{D(F.alsoResize)}},resize:function(F,E){var G=E.options,C=A(this).data("resizable"),D=C.originalSize,I=C.originalPosition;var H={height:(C.size.height-D.height)||0,width:(C.size.width-D.width)||0,top:(C.position.top-I.top)||0,left:(C.position.left-I.left)||0},B=function(J,K){A(J).each(function(){var N=A(this).data("resizable-alsoresize"),M={},L=K&&K.length?K:["width","height","top","left"];A.each(L||["width","height","top","left"],function(O,Q){var P=(N[Q]||0)+(H[Q]||0);if(P&&P>=0){M[Q]=P||null}});A(this).css(M)})};if(typeof (G.alsoResize)=="object"){A.each(G.alsoResize,function(J,K){B(J,K)})}else{B(G.alsoResize)}},stop:function(C,B){A(this).removeData("resizable-alsoresize-start")}})})(jQuery)
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/jquery/ui.sortable.js b/mp-wp/wp-includes/js/jquery/ui.sortable.js
--- a/mp-wp/wp-includes/js/jquery/ui.sortable.js c86d04ccb8c25a80afc5ca7f70724346e940dcb3e86238c03ea68a2485816963cdc92081dcc3cd6b107e5839cfafcac03431229ccfd4e0dba0adcd4734dadd14
+++ b/mp-wp/wp-includes/js/jquery/ui.sortable.js false
@@ -1 +0,0 @@
-(function(B){function A(E,D){var C=B.browser.safari&&B.browser.version<522;if(E.contains&&!C){return E.contains(D)}if(E.compareDocumentPosition){return !!(E.compareDocumentPosition(D)&16)}while(D=D.parentNode){if(D==E){return true}}return false}B.widget("ui.sortable",B.extend({},B.ui.mouse,{init:function(){var C=this.options;this.containerCache={};this.element.addClass("ui-sortable");this.refresh();this.floating=this.items.length?(/left|right/).test(this.items[0].item.css("float")):false;if(!(/(relative|absolute|fixed)/).test(this.element.css("position"))){this.element.css("position","relative")}this.offset=this.element.offset();this.mouseInit()},plugins:{},ui:function(C){return{helper:(C||this)["helper"],placeholder:(C||this)["placeholder"]||B([]),position:(C||this)["position"],absolutePosition:(C||this)["positionAbs"],options:this.options,element:this.element,item:(C||this)["currentItem"],sender:C?C.element:null}},propagate:function(F,E,C,D){B.ui.plugin.call(this,F,[E,this.ui(C)]);if(!D){this.element.triggerHandler(F=="sort"?F:"sort"+F,[E,this.ui(C)],this.options[F])}},serialize:function(E){var C=(B.isFunction(this.options.items)?this.options.items.call(this.element):B(this.options.items,this.element)).not(".ui-sortable-helper");var D=[];E=E||{};C.each(function(){var F=(B(this).attr(E.attribute||"id")||"").match(E.expression||(/(.+)[-=_](.+)/));if(F){D.push((E.key||F[1])+"[]="+(E.key&&E.expression?F[1]:F[2]))}});return D.join("&")},toArray:function(C){var D=(B.isFunction(this.options.items)?this.options.items.call(this.element):B(this.options.items,this.element)).not(".ui-sortable-helper");var E=[];D.each(function(){E.push(B(this).attr(C||"id"))});return E},intersectsWith:function(J){var E=this.positionAbs.left,D=E+this.helperProportions.width,I=this.positionAbs.top,H=I+this.helperProportions.height;var F=J.left,C=F+J.width,K=J.top,G=K+J.height;if(this.options.tolerance=="pointer"||this.options.forcePointerForContainers||(this.options.tolerance=="guess"&&this.helperProportions[this.floating?"width":"height"]>J[this.floating?"width":"height"])){return(I+this.offset.click.top>K&&I+this.offset.click.top<G&&E+this.offset.click.left>F&&E+this.offset.click.left<C)}else{return(F<E+(this.helperProportions.width/2)&&D-(this.helperProportions.width/2)<C&&K<I+(this.helperProportions.height/2)&&H-(this.helperProportions.height/2)<G)}},intersectsWithEdge:function(J){var E=this.positionAbs.left,D=E+this.helperProportions.width,I=this.positionAbs.top,H=I+this.helperProportions.height;var F=J.left,C=F+J.width,K=J.top,G=K+J.height;if(this.options.toleranceMove=="pointer"||(this.options.toleranceMove=="guess"&&this.helperProportions[this.floating?"width":"height"]>J[this.floating?"width":"height"])){if(!(I+this.offset.click.top>K&&I+this.offset.click.top<G&&E+this.offset.click.left>F&&E+this.offset.click.left<C)){return false}if(this.floating){if(E+this.offset.click.left>F&&E+this.offset.click.left<F+J.width/2){return 2}if(E+this.offset.click.left>F+J.width/2&&E+this.offset.click.left<C){return 1}}else{if(I+this.offset.click.top>K&&I+this.offset.click.top<K+J.height/2){return 2}if(I+this.offset.click.top>K+J.height/2&&I+this.offset.click.top<G){return 1}}}else{if(!(F<E+(this.helperProportions.width/2)&&D-(this.helperProportions.width/2)<C&&K<I+(this.helperProportions.height/2)&&H-(this.helperProportions.height/2)<G)){return false}if(this.floating){if(D>F&&E<F){return 2}if(E<C&&D>C){return 1}}else{if(H>K&&I<K){return 1}if(I<G&&H>G){return 2}}}return false},refresh:function(){this.refreshItems();this.refreshPositions()},refreshItems:function(){this.items=[];this.containers=[this];var D=this.items;var C=this;var F=[[B.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):B(this.options.items,this.element),this]];if(this.options.connectWith){for(var G=this.options.connectWith.length-1;G>=0;G--){var I=B(this.options.connectWith[G]);for(var E=I.length-1;E>=0;E--){var H=B.data(I[E],"sortable");if(H&&!H.options.disabled){F.push([B.isFunction(H.options.items)?H.options.items.call(H.element):B(H.options.items,H.element),H]);this.containers.push(H)}}}}for(var G=F.length-1;G>=0;G--){F[G][0].each(function(){B.data(this,"sortable-item",F[G][1]);D.push({item:B(this),instance:F[G][1],width:0,height:0,left:0,top:0})})}},refreshPositions:function(D){if(this.offsetParent){var C=this.offsetParent.offset();this.offset.parent={top:C.top+this.offsetParentBorders.top,left:C.left+this.offsetParentBorders.left}}for(var F=this.items.length-1;F>=0;F--){if(this.items[F].instance!=this.currentContainer&&this.currentContainer&&this.items[F].item[0]!=this.currentItem[0]){continue}var E=this.options.toleranceElement?B(this.options.toleranceElement,this.items[F].item):this.items[F].item;if(!D){this.items[F].width=E[0].offsetWidth;this.items[F].height=E[0].offsetHeight}var G=E.offset();this.items[F].left=G.left;this.items[F].top=G.top}if(this.options.custom&&this.options.custom.refreshContainers){this.options.custom.refreshContainers.call(this)}else{for(var F=this.containers.length-1;F>=0;F--){var G=this.containers[F].element.offset();this.containers[F].containerCache.left=G.left;this.containers[F].containerCache.top=G.top;this.containers[F].containerCache.width=this.containers[F].element.outerWidth();this.containers[F].containerCache.height=this.containers[F].element.outerHeight()}}},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this.mouseDestroy();for(var C=this.items.length-1;C>=0;C--){this.items[C].item.removeData("sortable-item")}},createPlaceholder:function(E){var C=E||this,F=C.options;if(F.placeholder.constructor==String){var D=F.placeholder;F.placeholder={element:function(){return B("<div></div>").addClass(D)[0]},update:function(G,H){H.css(G.offset()).css({width:G.outerWidth(),height:G.outerHeight()})}}}C.placeholder=B(F.placeholder.element.call(C.element,C.currentItem)).appendTo("body").css({position:"absolute"});F.placeholder.update.call(C.element,C.currentItem,C.placeholder)},contactContainers:function(F){for(var D=this.containers.length-1;D>=0;D--){if(this.intersectsWith(this.containers[D].containerCache)){if(!this.containers[D].containerCache.over){if(this.currentContainer!=this.containers[D]){var I=10000;var H=null;var E=this.positionAbs[this.containers[D].floating?"left":"top"];for(var C=this.items.length-1;C>=0;C--){if(!A(this.containers[D].element[0],this.items[C].item[0])){continue}var G=this.items[C][this.containers[D].floating?"left":"top"];if(Math.abs(G-E)<I){I=Math.abs(G-E);H=this.items[C]}}if(!H&&!this.options.dropOnEmpty){continue}if(this.placeholder){this.placeholder.remove()}if(this.containers[D].options.placeholder){this.containers[D].createPlaceholder(this)}else{this.placeholder=null}this.currentContainer=this.containers[D];H?this.rearrange(F,H,null,true):this.rearrange(F,null,this.containers[D].element,true);this.propagate("change",F);this.containers[D].propagate("change",F,this)}this.containers[D].propagate("over",F,this);this.containers[D].containerCache.over=1}}else{if(this.containers[D].containerCache.over){this.containers[D].propagate("out",F,this);this.containers[D].containerCache.over=0}}}},mouseCapture:function(G,F){if(this.options.disabled||this.options.type=="static"){return false}this.refreshItems();var E=null,D=this,C=B(G.target).parents().each(function(){if(B.data(this,"sortable-item")==D){E=B(this);return false}});if(B.data(G.target,"sortable-item")==D){E=B(G.target)}if(!E){return false}if(this.options.handle&&!F){var H=false;B(this.options.handle,E).find("*").andSelf().each(function(){if(this==G.target){H=true}});if(!H){return false}}this.currentItem=E;return true},mouseStart:function(H,F,C){var J=this.options;this.currentContainer=this;this.refreshPositions();this.helper=typeof J.helper=="function"?B(J.helper.apply(this.element[0],[H,this.currentItem])):this.currentItem.clone();if(!this.helper.parents("body").length){B(J.appendTo!="parent"?J.appendTo:this.currentItem[0].parentNode)[0].appendChild(this.helper[0])}this.helper.css({position:"absolute",clear:"both"}).addClass("ui-sortable-helper");this.margins={left:(parseInt(this.currentItem.css("marginLeft"),10)||0),top:(parseInt(this.currentItem.css("marginTop"),10)||0)};this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.offset.click={left:H.pageX-this.offset.left,top:H.pageY-this.offset.top};this.offsetParent=this.helper.offsetParent();var D=this.offsetParent.offset();this.offsetParentBorders={top:(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)};this.offset.parent={top:D.top+this.offsetParentBorders.top,left:D.left+this.offsetParentBorders.left};this.originalPosition=this.generatePosition(H);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(J.placeholder){this.createPlaceholder()}this.propagate("start",H);this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(J.cursorAt){if(J.cursorAt.left!=undefined){this.offset.click.left=J.cursorAt.left}if(J.cursorAt.right!=undefined){this.offset.click.left=this.helperProportions.width-J.cursorAt.right}if(J.cursorAt.top!=undefined){this.offset.click.top=J.cursorAt.top}if(J.cursorAt.bottom!=undefined){this.offset.click.top=this.helperProportions.height-J.cursorAt.bottom}}if(J.containment){if(J.containment=="parent"){J.containment=this.helper[0].parentNode}if(J.containment=="document"||J.containment=="window"){this.containment=[0-this.offset.parent.left,0-this.offset.parent.top,B(J.containment=="document"?document:window).width()-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.element.css("marginRight"),10)||0),(B(J.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.element.css("marginBottom"),10)||0)]}if(!(/^(document|window|parent)$/).test(J.containment)){var G=B(J.containment)[0];var I=B(J.containment).offset();this.containment=[I.left+(parseInt(B(G).css("borderLeftWidth"),10)||0)-this.offset.parent.left,I.top+(parseInt(B(G).css("borderTopWidth"),10)||0)-this.offset.parent.top,I.left+Math.max(G.scrollWidth,G.offsetWidth)-(parseInt(B(G).css("borderLeftWidth"),10)||0)-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.currentItem.css("marginRight"),10)||0),I.top+Math.max(G.scrollHeight,G.offsetHeight)-(parseInt(B(G).css("borderTopWidth"),10)||0)-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.currentItem.css("marginBottom"),10)||0)]}}if(this.options.placeholder!="clone"){this.currentItem.css("visibility","hidden")}if(!C){for(var E=this.containers.length-1;E>=0;E--){this.containers[E].propagate("activate",H,this)}}if(B.ui.ddmanager){B.ui.ddmanager.current=this}if(B.ui.ddmanager&&!J.dropBehaviour){B.ui.ddmanager.prepareOffsets(this,H)}this.dragging=true;this.mouseDrag(H);return true},convertPositionTo:function(D,E){if(!E){E=this.position}var C=D=="absolute"?1:-1;return{top:(E.top+this.offset.parent.top*C-(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)*C+this.margins.top*C),left:(E.left+this.offset.parent.left*C-(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft)*C+this.margins.left*C)}},generatePosition:function(F){var G=this.options;var C={top:(F.pageY-this.offset.click.top-this.offset.parent.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)),left:(F.pageX-this.offset.click.left-this.offset.parent.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft))};if(!this.originalPosition){return C}if(this.containment){if(C.left<this.containment[0]){C.left=this.containment[0]}if(C.top<this.containment[1]){C.top=this.containment[1]}if(C.left>this.containment[2]){C.left=this.containment[2]}if(C.top>this.containment[3]){C.top=this.containment[3]}}if(G.grid){var E=this.originalPosition.top+Math.round((C.top-this.originalPosition.top)/G.grid[1])*G.grid[1];C.top=this.containment?(!(E<this.containment[1]||E>this.containment[3])?E:(!(E<this.containment[1])?E-G.grid[1]:E+G.grid[1])):E;var D=this.originalPosition.left+Math.round((C.left-this.originalPosition.left)/G.grid[0])*G.grid[0];C.left=this.containment?(!(D<this.containment[0]||D>this.containment[2])?D:(!(D<this.containment[0])?D-G.grid[0]:D+G.grid[0])):D}return C},mouseDrag:function(D){this.position=this.generatePosition(D);this.positionAbs=this.convertPositionTo("absolute");B.ui.plugin.call(this,"sort",[D,this.ui()]);this.positionAbs=this.convertPositionTo("absolute");this.helper[0].style.left=this.position.left+"px";this.helper[0].style.top=this.position.top+"px";for(var C=this.items.length-1;C>=0;C--){var E=this.intersectsWithEdge(this.items[C]);if(!E){continue}if(this.items[C].item[0]!=this.currentItem[0]&&this.currentItem[E==1?"next":"prev"]()[0]!=this.items[C].item[0]&&!A(this.currentItem[0],this.items[C].item[0])&&(this.options.type=="semi-dynamic"?!A(this.element[0],this.items[C].item[0]):true)){this.direction=E==1?"down":"up";this.rearrange(D,this.items[C]);this.propagate("change",D);break}}this.contactContainers(D);if(B.ui.ddmanager){B.ui.ddmanager.drag(this,D)}this.element.triggerHandler("sort",[D,this.ui()],this.options["sort"]);return false},rearrange:function(H,G,D,F){D?D[0].appendChild(this.currentItem[0]):G.item[0].parentNode.insertBefore(this.currentItem[0],(this.direction=="down"?G.item[0]:G.item[0].nextSibling));this.counter=this.counter?++this.counter:1;var E=this,C=this.counter;window.setTimeout(function(){if(C==E.counter){E.refreshPositions(!F)}},0);if(this.options.placeholder){this.options.placeholder.update.call(this.element,this.currentItem,this.placeholder)}},mouseStop:function(E,D){if(B.ui.ddmanager&&!this.options.dropBehaviour){B.ui.ddmanager.drop(this,E)}if(this.options.revert){var C=this;var F=C.currentItem.offset();if(C.placeholder){C.placeholder.animate({opacity:"hide"},(parseInt(this.options.revert,10)||500)-50)}B(this.helper).animate({left:F.left-this.offset.parent.left-C.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:F.top-this.offset.parent.top-C.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){C.clear(E)})}else{this.clear(E,D)}return false},clear:function(E,D){if(this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0]){this.propagate("update",E,null,D)}if(!A(this.element[0],this.currentItem[0])){this.propagate("remove",E,null,D);for(var C=this.containers.length-1;C>=0;C--){if(A(this.containers[C].element[0],this.currentItem[0])){this.containers[C].propagate("update",E,this,D);this.containers[C].propagate("receive",E,this,D)}}}for(var C=this.containers.length-1;C>=0;C--){this.containers[C].propagate("deactivate",E,this,D);if(this.containers[C].containerCache.over){this.containers[C].propagate("out",E,this);this.containers[C].containerCache.over=0}}this.dragging=false;if(this.cancelHelperRemoval){this.propagate("stop",E,null,D);return false}B(this.currentItem).css("visibility","");if(this.placeholder){this.placeholder.remove()}this.helper.remove();this.helper=null;this.propagate("stop",E,null,D);return true}}));B.extend(B.ui.sortable,{getter:"serialize toArray",defaults:{helper:"clone",tolerance:"guess",toleranceMove:"guess",distance:1,delay:0,scroll:true,scrollSensitivity:20,scrollSpeed:20,cancel:":input",items:"> *",zIndex:1000,dropOnEmpty:true,appendTo:"parent"}});B.ui.plugin.add("sortable","cursor",{start:function(E,D){var C=B("body");if(C.css("cursor")){D.options._cursor=C.css("cursor")}C.css("cursor",D.options.cursor)},stop:function(D,C){if(C.options._cursor){B("body").css("cursor",C.options._cursor)}}});B.ui.plugin.add("sortable","zIndex",{start:function(E,D){var C=D.helper;if(C.css("zIndex")){D.options._zIndex=C.css("zIndex")}C.css("zIndex",D.options.zIndex)},stop:function(D,C){if(C.options._zIndex){B(C.helper).css("zIndex",C.options._zIndex)}}});B.ui.plugin.add("sortable","opacity",{start:function(E,D){var C=D.helper;if(C.css("opacity")){D.options._opacity=C.css("opacity")}C.css("opacity",D.options.opacity)},stop:function(D,C){if(C.options._opacity){B(C.helper).css("opacity",C.options._opacity)}}});B.ui.plugin.add("sortable","scroll",{start:function(E,D){var F=D.options;var C=B(this).data("sortable");C.overflowY=function(G){do{if(/auto|scroll/.test(G.css("overflow"))||(/auto|scroll/).test(G.css("overflow-y"))){return G}G=G.parent()}while(G[0].parentNode);return B(document)}(C.currentItem);C.overflowX=function(G){do{if(/auto|scroll/.test(G.css("overflow"))||(/auto|scroll/).test(G.css("overflow-x"))){return G}G=G.parent()}while(G[0].parentNode);return B(document)}(C.currentItem);if(C.overflowY[0]!=document&&C.overflowY[0].tagName!="HTML"){C.overflowYOffset=C.overflowY.offset()}if(C.overflowX[0]!=document&&C.overflowX[0].tagName!="HTML"){C.overflowXOffset=C.overflowX.offset()}},sort:function(E,D){var F=D.options;var C=B(this).data("sortable");if(C.overflowY[0]!=document&&C.overflowY[0].tagName!="HTML"){if((C.overflowYOffset.top+C.overflowY[0].offsetHeight)-E.pageY<F.scrollSensitivity){C.overflowY[0].scrollTop=C.overflowY[0].scrollTop+F.scrollSpeed}if(E.pageY-C.overflowYOffset.top<F.scrollSensitivity){C.overflowY[0].scrollTop=C.overflowY[0].scrollTop-F.scrollSpeed}}else{if(E.pageY-B(document).scrollTop()<F.scrollSensitivity){B(document).scrollTop(B(document).scrollTop()-F.scrollSpeed)}if(B(window).height()-(E.pageY-B(document).scrollTop())<F.scrollSensitivity){B(document).scrollTop(B(document).scrollTop()+F.scrollSpeed)}}if(C.overflowX[0]!=document&&C.overflowX[0].tagName!="HTML"){if((C.overflowXOffset.left+C.overflowX[0].offsetWidth)-E.pageX<F.scrollSensitivity){C.overflowX[0].scrollLeft=C.overflowX[0].scrollLeft+F.scrollSpeed}if(E.pageX-C.overflowXOffset.left<F.scrollSensitivity){C.overflowX[0].scrollLeft=C.overflowX[0].scrollLeft-F.scrollSpeed}}else{if(E.pageX-B(document).scrollLeft()<F.scrollSensitivity){B(document).scrollLeft(B(document).scrollLeft()-F.scrollSpeed)}if(B(window).width()-(E.pageX-B(document).scrollLeft())<F.scrollSensitivity){B(document).scrollLeft(B(document).scrollLeft()+F.scrollSpeed)}}}});B.ui.plugin.add("sortable","axis",{sort:function(E,D){var C=B(this).data("sortable");if(D.options.axis=="y"){C.position.left=C.originalPosition.left}if(D.options.axis=="x"){C.position.top=C.originalPosition.top}}})})(jQuery)
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/jquery/ui.tabs.js b/mp-wp/wp-includes/js/jquery/ui.tabs.js
--- a/mp-wp/wp-includes/js/jquery/ui.tabs.js f70fb770687937839ae8db3dcc388b7e4ba5797f59aecfcf43df0907a8ff96a2edb88b6dcdd84c650c3731976715474967107f90d6eb0ef662ffbf4f5eab48c5
+++ b/mp-wp/wp-includes/js/jquery/ui.tabs.js false
@@ -1,2 +0,0 @@
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(4(A){A.3g("8.3",{3f:4(){2.c.t+=".3";2.1f(1d)},3e:4(B,C){5((/^7/).26(B)){2.17(C)}m{2.c[B]=C;2.1f()}},j:4(){d 2.$3.j},1G:4(B){d B.2b&&B.2b.14(/\\s/g,"2a").14(/[^A-3d-3c-9\\-2a:\\.]/g,"")||2.c.1S+A.f(B)},8:4(C,B){d{c:2.c,3b:C,1O:B,V:2.$3.V(C)}},1f:4(O){2.$i=A("1j:3a(a[n])",2.h);2.$3=2.$i.1t(4(){d A("a",2)[0]});2.$b=A([]);6 P=2,D=2.c;2.$3.X(4(R,Q){5(Q.v&&Q.v.14("#","")){P.$b=P.$b.1c(Q.v)}m{5(A(Q).13("n")!="#"){A.f(Q,"n.3",Q.n);A.f(Q,"p.3",Q.n);6 T=P.1G(Q);Q.n="#"+T;6 S=A("#"+T);5(!S.j){S=A(D.1z).13("1g",T).l(D.19).39(P.$b[R-1]||P.h);S.f("1b.3",1d)}P.$b=P.$b.1c(S)}m{D.e.1Y(R+1)}}});5(O){2.h.l(D.1y);2.$b.X(4(){6 Q=A(2);Q.l(D.19)});5(D.7===1q){5(1L.v){2.$3.X(4(S,Q){5(Q.v==1L.v){D.7=S;5(A.Y.1h||A.Y.38){6 R=A(1L.v),T=R.13("1g");R.13("1g","");1B(4(){R.13("1g",T)},37)}36(0,0);d o}})}m{5(D.11){6 J=35(A.11("8-3"+A.f(P.h)),10);5(J&&P.$3[J]){D.7=J}}m{5(P.$i.U("."+D.k).j){D.7=P.$i.V(P.$i.U("."+D.k)[0])}}}}D.7=D.7===w||D.7!==1q?D.7:0;D.e=A.34(D.e.33(A.1t(2.$i.U("."+D.W),4(R,Q){d P.$i.V(R)}))).1X();5(A.1s(D.7,D.e)!=-1){D.e.32(A.1s(D.7,D.e),1)}2.$b.l(D.x);2.$i.q(D.k);5(D.7!==w){2.$b.r(D.7).1I().q(D.x);2.$i.r(D.7).l(D.k);6 K=4(){A(P.h).z("1v",[P.u("1v"),P.8(P.$3[D.7],P.$b[D.7])],D.1I)};5(A.f(2.$3[D.7],"p.3")){2.p(D.7,K)}m{K()}}A(31).16("30",4(){P.$3.15(".3");P.$i=P.$3=P.$b=w})}2Z(6 G=0,N;N=2.$i[G];G++){A(N)[A.1s(G,D.e)!=-1&&!A(N).12(D.k)?"l":"q"](D.W)}5(D.y===o){2.$3.1n("y.3")}6 C,I,B={"2Y-2X":0,1K:1},E="2W";5(D.Z&&D.Z.2V==2U){C=D.Z[0]||B,I=D.Z[1]||B}m{C=I=D.Z||B}6 H={1r:"",2T:"",2S:""};5(!A.Y.1h){H.1J=""}4 M(R,Q,S){Q.29(C,C.1K||E,4(){Q.l(D.x).1e(H);5(A.Y.1h&&C.1J){Q[0].28.U=""}5(S){L(R,S,Q)}})}4 L(R,S,Q){5(I===B){S.1e("1r","1F")}S.29(I,I.1K||E,4(){S.q(D.x).1e(H);5(A.Y.1h&&I.1J){S[0].28.U=""}A(P.h).z("1v",[P.u("1v"),P.8(R,S[0])],D.1I)})}4 F(R,T,Q,S){T.l(D.k).2R().q(D.k);M(R,Q,S)}2.$3.15(".3").16(D.t,4(){6 T=A(2).2Q("1j:r(0)"),Q=P.$b.U(":2P"),S=A(2.v);5((T.12(D.k)&&!D.1i)||T.12(D.W)||A(2).12(D.18)||A(P.h).z("27",[P.u("27"),P.8(2,S[0])],D.17)===o){2.1u();d o}P.c.7=P.$3.V(2);5(D.1i){5(T.12(D.k)){P.c.7=w;T.q(D.k);P.$b.1H();M(2,Q);2.1u();d o}m{5(!Q.j){P.$b.1H();6 R=2;P.p(P.$3.V(2),4(){T.l(D.k).l(D.1x);L(R,S)});2.1u();d o}}}5(D.11){A.11("8-3"+A.f(P.h),P.c.7,D.11)}P.$b.1H();5(S.j){6 R=2;P.p(P.$3.V(2),Q.j?4(){F(R,T,Q,S)}:4(){T.l(D.k);L(R,S)})}m{2O"1M 2N 2M: 2L 2K 2J."}5(A.Y.1h){2.1u()}d o});5(!(/^1A/).26(D.t)){2.$3.16("1A.3",4(){d o})}},1c:4(E,D,C){5(C==1q){C=2.$3.j}6 G=2.c;6 I=A(G.1R.14(/#\\{n\\}/g,E).14(/#\\{1k\\}/g,D));I.f("1b.3",1d);6 H=E.2I("#")==0?E.14("#",""):2.1G(A("a:2H-2G",I)[0]);6 F=A("#"+H);5(!F.j){F=A(G.1z).13("1g",H).l(G.x).f("1b.3",1d)}F.l(G.19);5(C>=2.$i.j){I.25(2.h);F.25(2.h[0].2F)}m{I.24(2.$i[C]);F.24(2.$b[C])}G.e=A.1t(G.e,4(K,J){d K>=C?++K:K});2.1f();5(2.$3.j==1){I.l(G.k);F.q(G.x);6 B=A.f(2.$3[0],"p.3");5(B){2.p(C,B)}}2.h.z("23",[2.u("23"),2.8(2.$3[C],2.$b[C])],G.1c)},1a:4(B){6 D=2.c,E=2.$i.r(B).1a(),C=2.$b.r(B).1a();5(E.12(D.k)&&2.$3.j>1){2.17(B+(B+1<2.$3.j?1:-1))}D.e=A.1t(A.21(D.e,4(G,F){d G!=B}),4(G,F){d G>=B?--G:G});2.1f();2.h.z("22",[2.u("22"),2.8(E.1E("a")[0],C[0])],D.1a)},1Z:4(B){6 C=2.c;5(A.1s(B,C.e)==-1){d}6 D=2.$i.r(B).q(C.W);5(A.Y.2E){D.1e("1r","2D-1F");1B(4(){D.1e("1r","1F")},0)}C.e=A.21(C.e,4(F,E){d F!=B});2.h.z("20",[2.u("20"),2.8(2.$3[B],2.$b[B])],C.1Z)},1V:4(C){6 B=2,D=2.c;5(C!=D.7){2.$i.r(C).l(D.W);D.e.1Y(C);D.e.1X();2.h.z("1W",[2.u("1W"),2.8(2.$3[C],2.$b[C])],D.1V)}},17:4(B){5(2C B=="2B"){B=2.$3.V(2.$3.U("[n$="+B+"]")[0])}2.$3.r(B).2A(2.c.t)},p:4(G,K){6 L=2,D=2.c,E=2.$3.r(G),J=E[0],H=K==1q||K===o,B=E.f("p.3");K=K||4(){};5(!B||!H&&A.f(J,"y.3")){K();d}6 M=4(N){6 O=A(N),P=O.1E("*:2z");d P.j&&P.2y(":2x(2w)")&&P||O};6 C=4(){L.$3.U("."+D.18).q(D.18).X(4(){5(D.1m){M(2).2v().1p(M(2).f("1k.3"))}});L.1o=w};5(D.1m){6 I=M(J).1p();M(J).2u("<1D></1D>").1E("1D").f("1k.3",I).1p(D.1m)}6 F=A.1N({},D.1l,{1T:B,1C:4(O,N){A(J.v).1p(O);C();5(D.y){A.f(J,"y.3",1d)}A(L.h).z("1U",[L.u("1U"),L.8(L.$3[G],L.$b[G])],D.p);D.1l.1C&&D.1l.1C(O,N);K()}});5(2.1o){2.1o.2t();C()}E.l(D.18);1B(4(){L.1o=A.2s(F)},0)},1T:4(C,B){2.$3.r(C).1n("y.3").f("p.3",B)},1b:4(){6 B=2.c;2.h.15(".3").q(B.1y).1n("3");2.$3.X(4(){6 C=A.f(2,"n.3");5(C){2.n=C}6 D=A(2).15(".3");A.X(["n","p","y"],4(E,F){D.1n(F+".3")})});2.$i.1c(2.$b).X(4(){5(A.f(2,"1b.3")){A(2).1a()}m{A(2).q([B.k,B.1x,B.W,B.19,B.x].2r(" "))}})},u:4(B){d A.t.2q({2p:B,2o:2.h[0]})}});A.8.3.2n={1i:o,t:"1A",e:[],11:w,1m:"2m&#2l;",y:o,1S:"8-3-",1l:{},Z:w,1R:\'<1j><a n="#{n}"><1Q>#{1k}</1Q></a></1j>\',1z:"<1P></1P>",1y:"8-3-2k",k:"8-3-7",1x:"8-3-1i",W:"8-3-e",19:"8-3-1O",x:"8-3-2j",18:"8-3-2i"};A.8.3.2h="j";A.1N(A.8.3.2g,{1w:w,2f:4(C,F){F=F||o;6 B=2,E=2.c.7;4 G(){B.1w=2e(4(){E=++E<B.$3.j?E:0;B.17(E)},C)}4 D(H){5(!H||H.2d){2c(B.1w)}}5(C){G();5(!F){2.$3.16(2.c.t,D)}m{2.$3.16(2.c.t,4(){D();E=B.c.7;G()})}}m{D();2.$3.15(2.c.t,D)}}})})(1M)',62,203,'||this|tabs|function|if|var|selected|ui|||panels|options|return|disabled|data||element|lis|length|selectedClass|addClass|else|href|false|load|removeClass|eq||event|fakeEvent|hash|null|hideClass|cache|triggerHandler|||||||||||||||||||||filter|index|disabledClass|each|browser|fx||cookie|hasClass|attr|replace|unbind|bind|select|loadingClass|panelClass|remove|destroy|add|true|css|tabify|id|msie|unselect|li|label|ajaxOptions|spinner|removeData|xhr|html|undefined|display|inArray|map|blur|tabsshow|rotation|unselectClass|navClass|panelTemplate|click|setTimeout|success|em|find|block|tabId|stop|show|opacity|duration|location|jQuery|extend|panel|div|span|tabTemplate|idPrefix|url|tabsload|disable|tabsdisable|sort|push|enable|tabsenable|grep|tabsremove|tabsadd|insertBefore|appendTo|test|tabsselect|style|animate|_|title|clearInterval|clientX|setInterval|rotate|prototype|getter|loading|hide|nav|8230|Loading|defaults|target|type|fix|join|ajax|abort|wrapInner|parent|img|not|is|last|trigger|string|typeof|inline|safari|parentNode|child|first|indexOf|identifier|fragment|Mismatching|Tabs|UI|throw|visible|parents|siblings|height|overflow|Array|constructor|normal|width|min|for|unload|window|splice|concat|unique|parseInt|scrollTo|500|opera|insertAfter|has|tab|z0|Za|setData|init|widget'.split('|'),0,{}))
-
diff -uNr a/mp-wp/wp-includes/js/prototype.js b/mp-wp/wp-includes/js/prototype.js
--- a/mp-wp/wp-includes/js/prototype.js 066cb61e50765a665d7a67d70150fdd04668dab0d87c5b98eb13fdccbab0c79e1dd904c870c73c8871ddd2a2ea20f0975f10cc0d7643fb00d12b9d414a4d6e29
+++ b/mp-wp/wp-includes/js/prototype.js false
@@ -1,4184 +0,0 @@
-/*  Prototype JavaScript framework, version 1.6.0
- *  (c) 2005-2007 Sam Stephenson
- *
- *  Prototype is freely distributable under the terms of an MIT-style license.
- *  For details, see the Prototype web site: http://www.prototypejs.org/
- *
- *--------------------------------------------------------------------------*/
-
-var Prototype = {
-  Version: '1.6.0',
-
-  Browser: {
-    IE:     !!(window.attachEvent && !window.opera),
-    Opera:  !!window.opera,
-    WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
-    Gecko:  navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1,
-    MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
-  },
-
-  BrowserFeatures: {
-    XPath: !!document.evaluate,
-    ElementExtensions: !!window.HTMLElement,
-    SpecificElementExtensions:
-      document.createElement('div').__proto__ &&
-      document.createElement('div').__proto__ !==
-        document.createElement('form').__proto__
-  },
-
-  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
-  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
-
-  emptyFunction: function() { },
-  K: function(x) { return x }
-};
-
-if (Prototype.Browser.MobileSafari)
-  Prototype.BrowserFeatures.SpecificElementExtensions = false;
-
-if (Prototype.Browser.WebKit)
-  Prototype.BrowserFeatures.XPath = false;
-
-/* Based on Alex Arnell's inheritance implementation. */
-var Class = {
-  create: function() {
-    var parent = null, properties = $A(arguments);
-    if (Object.isFunction(properties[0]))
-      parent = properties.shift();
-
-    function klass() {
-      this.initialize.apply(this, arguments);
-    }
-
-    Object.extend(klass, Class.Methods);
-    klass.superclass = parent;
-    klass.subclasses = [];
-
-    if (parent) {
-      var subclass = function() { };
-      subclass.prototype = parent.prototype;
-      klass.prototype = new subclass;
-      parent.subclasses.push(klass);
-    }
-
-    for (var i = 0; i < properties.length; i++)
-      klass.addMethods(properties[i]);
-
-    if (!klass.prototype.initialize)
-      klass.prototype.initialize = Prototype.emptyFunction;
-
-    klass.prototype.constructor = klass;
-
-    return klass;
-  }
-};
-
-Class.Methods = {
-  addMethods: function(source) {
-    var ancestor   = this.superclass && this.superclass.prototype;
-    var properties = Object.keys(source);
-
-    if (!Object.keys({ toString: true }).length)
-      properties.push("toString", "valueOf");
-
-    for (var i = 0, length = properties.length; i < length; i++) {
-      var property = properties[i], value = source[property];
-      if (ancestor && Object.isFunction(value) &&
-          value.argumentNames().first() == "$super") {
-        var method = value, value = Object.extend((function(m) {
-          return function() { return ancestor[m].apply(this, arguments) };
-        })(property).wrap(method), {
-          valueOf:  function() { return method },
-          toString: function() { return method.toString() }
-        });
-      }
-      this.prototype[property] = value;
-    }
-
-    return this;
-  }
-};
-
-var Abstract = { };
-
-Object.extend = function(destination, source) {
-  for (var property in source)
-    destination[property] = source[property];
-  return destination;
-};
-
-Object.extend(Object, {
-  inspect: function(object) {
-    try {
-      if (object === undefined) return 'undefined';
-      if (object === null) return 'null';
-      return object.inspect ? object.inspect() : object.toString();
-    } catch (e) {
-      if (e instanceof RangeError) return '...';
-      throw e;
-    }
-  },
-
-  toJSON: function(object) {
-    var type = typeof object;
-    switch (type) {
-      case 'undefined':
-      case 'function':
-      case 'unknown': return;
-      case 'boolean': return object.toString();
-    }
-
-    if (object === null) return 'null';
-    if (object.toJSON) return object.toJSON();
-    if (Object.isElement(object)) return;
-
-    var results = [];
-    for (var property in object) {
-      var value = Object.toJSON(object[property]);
-      if (value !== undefined)
-        results.push(property.toJSON() + ': ' + value);
-    }
-
-    return '{' + results.join(', ') + '}';
-  },
-
-  toQueryString: function(object) {
-    return $H(object).toQueryString();
-  },
-
-  toHTML: function(object) {
-    return object && object.toHTML ? object.toHTML() : String.interpret(object);
-  },
-
-  keys: function(object) {
-    var keys = [];
-    for (var property in object)
-      keys.push(property);
-    return keys;
-  },
-
-  values: function(object) {
-    var values = [];
-    for (var property in object)
-      values.push(object[property]);
-    return values;
-  },
-
-  clone: function(object) {
-    return Object.extend({ }, object);
-  },
-
-  isElement: function(object) {
-    return object && object.nodeType == 1;
-  },
-
-  isArray: function(object) {
-    return object && object.constructor === Array;
-  },
-
-  isHash: function(object) {
-    return object instanceof Hash;
-  },
-
-  isFunction: function(object) {
-    return typeof object == "function";
-  },
-
-  isString: function(object) {
-    return typeof object == "string";
-  },
-
-  isNumber: function(object) {
-    return typeof object == "number";
-  },
-
-  isUndefined: function(object) {
-    return typeof object == "undefined";
-  }
-});
-
-Object.extend(Function.prototype, {
-  argumentNames: function() {
-    var names = this.toString().match(/^[\s\(]*function[^(]*\((.*?)\)/)[1].split(",").invoke("strip");
-    return names.length == 1 && !names[0] ? [] : names;
-  },
-
-  bind: function() {
-    if (arguments.length < 2 && arguments[0] === undefined) return this;
-    var __method = this, args = $A(arguments), object = args.shift();
-    return function() {
-      return __method.apply(object, args.concat($A(arguments)));
-    }
-  },
-
-  bindAsEventListener: function() {
-    var __method = this, args = $A(arguments), object = args.shift();
-    return function(event) {
-      return __method.apply(object, [event || window.event].concat(args));
-    }
-  },
-
-  curry: function() {
-    if (!arguments.length) return this;
-    var __method = this, args = $A(arguments);
-    return function() {
-      return __method.apply(this, args.concat($A(arguments)));
-    }
-  },
-
-  delay: function() {
-    var __method = this, args = $A(arguments), timeout = args.shift() * 1000;
-    return window.setTimeout(function() {
-      return __method.apply(__method, args);
-    }, timeout);
-  },
-
-  wrap: function(wrapper) {
-    var __method = this;
-    return function() {
-      return wrapper.apply(this, [__method.bind(this)].concat($A(arguments)));
-    }
-  },
-
-  methodize: function() {
-    if (this._methodized) return this._methodized;
-    var __method = this;
-    return this._methodized = function() {
-      return __method.apply(null, [this].concat($A(arguments)));
-    };
-  }
-});
-
-Function.prototype.defer = Function.prototype.delay.curry(0.01);
-
-Date.prototype.toJSON = function() {
-  return '"' + this.getUTCFullYear() + '-' +
-    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
-    this.getUTCDate().toPaddedString(2) + 'T' +
-    this.getUTCHours().toPaddedString(2) + ':' +
-    this.getUTCMinutes().toPaddedString(2) + ':' +
-    this.getUTCSeconds().toPaddedString(2) + 'Z"';
-};
-
-var Try = {
-  these: function() {
-    var returnValue;
-
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      var lambda = arguments[i];
-      try {
-        returnValue = lambda();
-        break;
-      } catch (e) { }
-    }
-
-    return returnValue;
-  }
-};
-
-RegExp.prototype.match = RegExp.prototype.test;
-
-RegExp.escape = function(str) {
-  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
-};
-
-/*--------------------------------------------------------------------------*/
-
-var PeriodicalExecuter = Class.create({
-  initialize: function(callback, frequency) {
-    this.callback = callback;
-    this.frequency = frequency;
-    this.currentlyExecuting = false;
-
-    this.registerCallback();
-  },
-
-  registerCallback: function() {
-    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
-  },
-
-  execute: function() {
-    this.callback(this);
-  },
-
-  stop: function() {
-    if (!this.timer) return;
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-
-  onTimerEvent: function() {
-    if (!this.currentlyExecuting) {
-      try {
-        this.currentlyExecuting = true;
-        this.execute();
-      } finally {
-        this.currentlyExecuting = false;
-      }
-    }
-  }
-});
-Object.extend(String, {
-  interpret: function(value) {
-    return value == null ? '' : String(value);
-  },
-  specialChar: {
-    '\b': '\\b',
-    '\t': '\\t',
-    '\n': '\\n',
-    '\f': '\\f',
-    '\r': '\\r',
-    '\\': '\\\\'
-  }
-});
-
-Object.extend(String.prototype, {
-  gsub: function(pattern, replacement) {
-    var result = '', source = this, match;
-    replacement = arguments.callee.prepareReplacement(replacement);
-
-    while (source.length > 0) {
-      if (match = source.match(pattern)) {
-        result += source.slice(0, match.index);
-        result += String.interpret(replacement(match));
-        source  = source.slice(match.index + match[0].length);
-      } else {
-        result += source, source = '';
-      }
-    }
-    return result;
-  },
-
-  sub: function(pattern, replacement, count) {
-    replacement = this.gsub.prepareReplacement(replacement);
-    count = count === undefined ? 1 : count;
-
-    return this.gsub(pattern, function(match) {
-      if (--count < 0) return match[0];
-      return replacement(match);
-    });
-  },
-
-  scan: function(pattern, iterator) {
-    this.gsub(pattern, iterator);
-    return String(this);
-  },
-
-  truncate: function(length, truncation) {
-    length = length || 30;
-    truncation = truncation === undefined ? '...' : truncation;
-    return this.length > length ?
-      this.slice(0, length - truncation.length) + truncation : String(this);
-  },
-
-  strip: function() {
-    return this.replace(/^\s+/, '').replace(/\s+$/, '');
-  },
-
-  stripTags: function() {
-    return this.replace(/<\/?[^>]+>/gi, '');
-  },
-
-  stripScripts: function() {
-    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
-  },
-
-  extractScripts: function() {
-    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
-    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
-    return (this.match(matchAll) || []).map(function(scriptTag) {
-      return (scriptTag.match(matchOne) || ['', ''])[1];
-    });
-  },
-
-  evalScripts: function() {
-    return this.extractScripts().map(function(script) { return eval(script) });
-  },
-
-  escapeHTML: function() {
-    var self = arguments.callee;
-    self.text.data = this;
-    return self.div.innerHTML;
-  },
-
-  unescapeHTML: function() {
-    var div = new Element('div');
-    div.innerHTML = this.stripTags();
-    return div.childNodes[0] ? (div.childNodes.length > 1 ?
-      $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
-      div.childNodes[0].nodeValue) : '';
-  },
-
-  toQueryParams: function(separator) {
-    var match = this.strip().match(/([^?#]*)(#.*)?$/);
-    if (!match) return { };
-
-    return match[1].split(separator || '&').inject({ }, function(hash, pair) {
-      if ((pair = pair.split('='))[0]) {
-        var key = decodeURIComponent(pair.shift());
-        var value = pair.length > 1 ? pair.join('=') : pair[0];
-        if (value != undefined) value = decodeURIComponent(value);
-
-        if (key in hash) {
-          if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
-          hash[key].push(value);
-        }
-        else hash[key] = value;
-      }
-      return hash;
-    });
-  },
-
-  toArray: function() {
-    return this.split('');
-  },
-
-  succ: function() {
-    return this.slice(0, this.length - 1) +
-      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
-  },
-
-  times: function(count) {
-    return count < 1 ? '' : new Array(count + 1).join(this);
-  },
-
-  camelize: function() {
-    var parts = this.split('-'), len = parts.length;
-    if (len == 1) return parts[0];
-
-    var camelized = this.charAt(0) == '-'
-      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
-      : parts[0];
-
-    for (var i = 1; i < len; i++)
-      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
-
-    return camelized;
-  },
-
-  capitalize: function() {
-    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
-  },
-
-  underscore: function() {
-    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
-  },
-
-  dasherize: function() {
-    return this.gsub(/_/,'-');
-  },
-
-  inspect: function(useDoubleQuotes) {
-    var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
-      var character = String.specialChar[match[0]];
-      return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
-    });
-    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
-    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
-  },
-
-  toJSON: function() {
-    return this.inspect(true);
-  },
-
-  unfilterJSON: function(filter) {
-    return this.sub(filter || Prototype.JSONFilter, '#{1}');
-  },
-
-  isJSON: function() {
-    var str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
-    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
-  },
-
-  evalJSON: function(sanitize) {
-    var json = this.unfilterJSON();
-    try {
-      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
-    } catch (e) { }
-    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
-  },
-
-  include: function(pattern) {
-    return this.indexOf(pattern) > -1;
-  },
-
-  startsWith: function(pattern) {
-    return this.indexOf(pattern) === 0;
-  },
-
-  endsWith: function(pattern) {
-    var d = this.length - pattern.length;
-    return d >= 0 && this.lastIndexOf(pattern) === d;
-  },
-
-  empty: function() {
-    return this == '';
-  },
-
-  blank: function() {
-    return /^\s*$/.test(this);
-  },
-
-  interpolate: function(object, pattern) {
-    return new Template(this, pattern).evaluate(object);
-  }
-});
-
-if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
-  escapeHTML: function() {
-    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-  },
-  unescapeHTML: function() {
-    return this.replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
-  }
-});
-
-String.prototype.gsub.prepareReplacement = function(replacement) {
-  if (Object.isFunction(replacement)) return replacement;
-  var template = new Template(replacement);
-  return function(match) { return template.evaluate(match) };
-};
-
-String.prototype.parseQuery = String.prototype.toQueryParams;
-
-Object.extend(String.prototype.escapeHTML, {
-  div:  document.createElement('div'),
-  text: document.createTextNode('')
-});
-
-with (String.prototype.escapeHTML) div.appendChild(text);
-
-var Template = Class.create({
-  initialize: function(template, pattern) {
-    this.template = template.toString();
-    this.pattern = pattern || Template.Pattern;
-  },
-
-  evaluate: function(object) {
-    if (Object.isFunction(object.toTemplateReplacements))
-      object = object.toTemplateReplacements();
-
-    return this.template.gsub(this.pattern, function(match) {
-      if (object == null) return '';
-
-      var before = match[1] || '';
-      if (before == '\\') return match[2];
-
-      var ctx = object, expr = match[3];
-      var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/, match = pattern.exec(expr);
-      if (match == null) return before;
-
-      while (match != null) {
-        var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
-        ctx = ctx[comp];
-        if (null == ctx || '' == match[3]) break;
-        expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
-        match = pattern.exec(expr);
-      }
-
-      return before + String.interpret(ctx);
-    }.bind(this));
-  }
-});
-Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
-
-var $break = { };
-
-var Enumerable = {
-  each: function(iterator, context) {
-    var index = 0;
-    iterator = iterator.bind(context);
-    try {
-      this._each(function(value) {
-        iterator(value, index++);
-      });
-    } catch (e) {
-      if (e != $break) throw e;
-    }
-    return this;
-  },
-
-  eachSlice: function(number, iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var index = -number, slices = [], array = this.toArray();
-    while ((index += number) < array.length)
-      slices.push(array.slice(index, index+number));
-    return slices.collect(iterator, context);
-  },
-
-  all: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var result = true;
-    this.each(function(value, index) {
-      result = result && !!iterator(value, index);
-      if (!result) throw $break;
-    });
-    return result;
-  },
-
-  any: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var result = false;
-    this.each(function(value, index) {
-      if (result = !!iterator(value, index))
-        throw $break;
-    });
-    return result;
-  },
-
-  collect: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var results = [];
-    this.each(function(value, index) {
-      results.push(iterator(value, index));
-    });
-    return results;
-  },
-
-  detect: function(iterator, context) {
-    iterator = iterator.bind(context);
-    var result;
-    this.each(function(value, index) {
-      if (iterator(value, index)) {
-        result = value;
-        throw $break;
-      }
-    });
-    return result;
-  },
-
-  findAll: function(iterator, context) {
-    iterator = iterator.bind(context);
-    var results = [];
-    this.each(function(value, index) {
-      if (iterator(value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  grep: function(filter, iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var results = [];
-
-    if (Object.isString(filter))
-      filter = new RegExp(filter);
-
-    this.each(function(value, index) {
-      if (filter.match(value))
-        results.push(iterator(value, index));
-    });
-    return results;
-  },
-
-  include: function(object) {
-    if (Object.isFunction(this.indexOf))
-      if (this.indexOf(object) != -1) return true;
-
-    var found = false;
-    this.each(function(value) {
-      if (value == object) {
-        found = true;
-        throw $break;
-      }
-    });
-    return found;
-  },
-
-  inGroupsOf: function(number, fillWith) {
-    fillWith = fillWith === undefined ? null : fillWith;
-    return this.eachSlice(number, function(slice) {
-      while(slice.length < number) slice.push(fillWith);
-      return slice;
-    });
-  },
-
-  inject: function(memo, iterator, context) {
-    iterator = iterator.bind(context);
-    this.each(function(value, index) {
-      memo = iterator(memo, value, index);
-    });
-    return memo;
-  },
-
-  invoke: function(method) {
-    var args = $A(arguments).slice(1);
-    return this.map(function(value) {
-      return value[method].apply(value, args);
-    });
-  },
-
-  max: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var result;
-    this.each(function(value, index) {
-      value = iterator(value, index);
-      if (result == undefined || value >= result)
-        result = value;
-    });
-    return result;
-  },
-
-  min: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var result;
-    this.each(function(value, index) {
-      value = iterator(value, index);
-      if (result == undefined || value < result)
-        result = value;
-    });
-    return result;
-  },
-
-  partition: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var trues = [], falses = [];
-    this.each(function(value, index) {
-      (iterator(value, index) ?
-        trues : falses).push(value);
-    });
-    return [trues, falses];
-  },
-
-  pluck: function(property) {
-    var results = [];
-    this.each(function(value) {
-      results.push(value[property]);
-    });
-    return results;
-  },
-
-  reject: function(iterator, context) {
-    iterator = iterator.bind(context);
-    var results = [];
-    this.each(function(value, index) {
-      if (!iterator(value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  sortBy: function(iterator, context) {
-    iterator = iterator.bind(context);
-    return this.map(function(value, index) {
-      return {value: value, criteria: iterator(value, index)};
-    }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }).pluck('value');
-  },
-
-  toArray: function() {
-    return this.map();
-  },
-
-  zip: function() {
-    var iterator = Prototype.K, args = $A(arguments);
-    if (Object.isFunction(args.last()))
-      iterator = args.pop();
-
-    var collections = [this].concat(args).map($A);
-    return this.map(function(value, index) {
-      return iterator(collections.pluck(index));
-    });
-  },
-
-  size: function() {
-    return this.toArray().length;
-  },
-
-  inspect: function() {
-    return '#<Enumerable:' + this.toArray().inspect() + '>';
-  }
-};
-
-Object.extend(Enumerable, {
-  map:     Enumerable.collect,
-  find:    Enumerable.detect,
-  select:  Enumerable.findAll,
-  filter:  Enumerable.findAll,
-  member:  Enumerable.include,
-  entries: Enumerable.toArray,
-  every:   Enumerable.all,
-  some:    Enumerable.any
-});
-function $A(iterable) {
-  if (!iterable) return [];
-  if (iterable.toArray) return iterable.toArray();
-  var length = iterable.length, results = new Array(length);
-  while (length--) results[length] = iterable[length];
-  return results;
-}
-
-if (Prototype.Browser.WebKit) {
-  function $A(iterable) {
-    if (!iterable) return [];
-    if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') &&
-        iterable.toArray) return iterable.toArray();
-    var length = iterable.length, results = new Array(length);
-    while (length--) results[length] = iterable[length];
-    return results;
-  }
-}
-
-Array.from = $A;
-
-Object.extend(Array.prototype, Enumerable);
-
-if (!Array.prototype._reverse) Array.prototype._reverse = Array.prototype.reverse;
-
-Object.extend(Array.prototype, {
-  _each: function(iterator) {
-    for (var i = 0, length = this.length; i < length; i++)
-      iterator(this[i]);
-  },
-
-  clear: function() {
-    this.length = 0;
-    return this;
-  },
-
-  first: function() {
-    return this[0];
-  },
-
-  last: function() {
-    return this[this.length - 1];
-  },
-
-  compact: function() {
-    return this.select(function(value) {
-      return value != null;
-    });
-  },
-
-  flatten: function() {
-    return this.inject([], function(array, value) {
-      return array.concat(Object.isArray(value) ?
-        value.flatten() : [value]);
-    });
-  },
-
-  without: function() {
-    var values = $A(arguments);
-    return this.select(function(value) {
-      return !values.include(value);
-    });
-  },
-
-  reverse: function(inline) {
-    return (inline !== false ? this : this.toArray())._reverse();
-  },
-
-  reduce: function() {
-    return this.length > 1 ? this : this[0];
-  },
-
-  uniq: function(sorted) {
-    return this.inject([], function(array, value, index) {
-      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
-        array.push(value);
-      return array;
-    });
-  },
-
-  intersect: function(array) {
-    return this.uniq().findAll(function(item) {
-      return array.detect(function(value) { return item === value });
-    });
-  },
-
-  clone: function() {
-    return [].concat(this);
-  },
-
-  size: function() {
-    return this.length;
-  },
-
-  inspect: function() {
-    return '[' + this.map(Object.inspect).join(', ') + ']';
-  },
-
-  toJSON: function() {
-    var results = [];
-    this.each(function(object) {
-      var value = Object.toJSON(object);
-      if (value !== undefined) results.push(value);
-    });
-    return '[' + results.join(', ') + ']';
-  }
-});
-
-// use native browser JS 1.6 implementation if available
-if (Object.isFunction(Array.prototype.forEach))
-  Array.prototype._each = Array.prototype.forEach;
-
-if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
-  i || (i = 0);
-  var length = this.length;
-  if (i < 0) i = length + i;
-  for (; i < length; i++)
-    if (this[i] === item) return i;
-  return -1;
-};
-
-if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
-  i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
-  var n = this.slice(0, i).reverse().indexOf(item);
-  return (n < 0) ? n : i - n - 1;
-};
-
-Array.prototype.toArray = Array.prototype.clone;
-
-function $w(string) {
-  if (!Object.isString(string)) return [];
-  string = string.strip();
-  return string ? string.split(/\s+/) : [];
-}
-
-if (Prototype.Browser.Opera){
-  Array.prototype.concat = function() {
-    var array = [];
-    for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      if (Object.isArray(arguments[i])) {
-        for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
-          array.push(arguments[i][j]);
-      } else {
-        array.push(arguments[i]);
-      }
-    }
-    return array;
-  };
-}
-Object.extend(Number.prototype, {
-  toColorPart: function() {
-    return this.toPaddedString(2, 16);
-  },
-
-  succ: function() {
-    return this + 1;
-  },
-
-  times: function(iterator) {
-    $R(0, this, true).each(iterator);
-    return this;
-  },
-
-  toPaddedString: function(length, radix) {
-    var string = this.toString(radix || 10);
-    return '0'.times(length - string.length) + string;
-  },
-
-  toJSON: function() {
-    return isFinite(this) ? this.toString() : 'null';
-  }
-});
-
-$w('abs round ceil floor').each(function(method){
-  Number.prototype[method] = Math[method].methodize();
-});
-function $H(object) {
-  return new Hash(object);
-};
-
-var Hash = Class.create(Enumerable, (function() {
-  if (function() {
-    var i = 0, Test = function(value) { this.key = value };
-    Test.prototype.key = 'foo';
-    for (var property in new Test('bar')) i++;
-    return i > 1;
-  }()) {
-    function each(iterator) {
-      var cache = [];
-      for (var key in this._object) {
-        var value = this._object[key];
-        if (cache.include(key)) continue;
-        cache.push(key);
-        var pair = [key, value];
-        pair.key = key;
-        pair.value = value;
-        iterator(pair);
-      }
-    }
-  } else {
-    function each(iterator) {
-      for (var key in this._object) {
-        var value = this._object[key], pair = [key, value];
-        pair.key = key;
-        pair.value = value;
-        iterator(pair);
-      }
-    }
-  }
-
-  function toQueryPair(key, value) {
-    if (Object.isUndefined(value)) return key;
-    return key + '=' + encodeURIComponent(String.interpret(value));
-  }
-
-  return {
-    initialize: function(object) {
-      this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
-    },
-
-    _each: each,
-
-    set: function(key, value) {
-      return this._object[key] = value;
-    },
-
-    get: function(key) {
-      return this._object[key];
-    },
-
-    unset: function(key) {
-      var value = this._object[key];
-      delete this._object[key];
-      return value;
-    },
-
-    toObject: function() {
-      return Object.clone(this._object);
-    },
-
-    keys: function() {
-      return this.pluck('key');
-    },
-
-    values: function() {
-      return this.pluck('value');
-    },
-
-    index: function(value) {
-      var match = this.detect(function(pair) {
-        return pair.value === value;
-      });
-      return match && match.key;
-    },
-
-    merge: function(object) {
-      return this.clone().update(object);
-    },
-
-    update: function(object) {
-      return new Hash(object).inject(this, function(result, pair) {
-        result.set(pair.key, pair.value);
-        return result;
-      });
-    },
-
-    toQueryString: function() {
-      return this.map(function(pair) {
-        var key = encodeURIComponent(pair.key), values = pair.value;
-
-        if (values && typeof values == 'object') {
-          if (Object.isArray(values))
-            return values.map(toQueryPair.curry(key)).join('&');
-        }
-        return toQueryPair(key, values);
-      }).join('&');
-    },
-
-    inspect: function() {
-      return '#<Hash:{' + this.map(function(pair) {
-        return pair.map(Object.inspect).join(': ');
-      }).join(', ') + '}>';
-    },
-
-    toJSON: function() {
-      return Object.toJSON(this.toObject());
-    },
-
-    clone: function() {
-      return new Hash(this);
-    }
-  }
-})());
-
-Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
-Hash.from = $H;
-var ObjectRange = Class.create(Enumerable, {
-  initialize: function(start, end, exclusive) {
-    this.start = start;
-    this.end = end;
-    this.exclusive = exclusive;
-  },
-
-  _each: function(iterator) {
-    var value = this.start;
-    while (this.include(value)) {
-      iterator(value);
-      value = value.succ();
-    }
-  },
-
-  include: function(value) {
-    if (value < this.start)
-      return false;
-    if (this.exclusive)
-      return value < this.end;
-    return value <= this.end;
-  }
-});
-
-var $R = function(start, end, exclusive) {
-  return new ObjectRange(start, end, exclusive);
-};
-
-var Ajax = {
-  getTransport: function() {
-    return Try.these(
-      function() {return new XMLHttpRequest()},
-      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
-      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
-    ) || false;
-  },
-
-  activeRequestCount: 0
-};
-
-Ajax.Responders = {
-  responders: [],
-
-  _each: function(iterator) {
-    this.responders._each(iterator);
-  },
-
-  register: function(responder) {
-    if (!this.include(responder))
-      this.responders.push(responder);
-  },
-
-  unregister: function(responder) {
-    this.responders = this.responders.without(responder);
-  },
-
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-      if (Object.isFunction(responder[callback])) {
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
-        } catch (e) { }
-      }
-    });
-  }
-};
-
-Object.extend(Ajax.Responders, Enumerable);
-
-Ajax.Responders.register({
-  onCreate:   function() { Ajax.activeRequestCount++ },
-  onComplete: function() { Ajax.activeRequestCount-- }
-});
-
-Ajax.Base = Class.create({
-  initialize: function(options) {
-    this.options = {
-      method:       'post',
-      asynchronous: true,
-      contentType:  'application/x-www-form-urlencoded',
-      encoding:     'UTF-8',
-      parameters:   '',
-      evalJSON:     true,
-      evalJS:       true
-    };
-    Object.extend(this.options, options || { });
-
-    this.options.method = this.options.method.toLowerCase();
-    if (Object.isString(this.options.parameters))
-      this.options.parameters = this.options.parameters.toQueryParams();
-  }
-});
-
-Ajax.Request = Class.create(Ajax.Base, {
-  _complete: false,
-
-  initialize: function($super, url, options) {
-    $super(options);
-    this.transport = Ajax.getTransport();
-    this.request(url);
-  },
-
-  request: function(url) {
-    this.url = url;
-    this.method = this.options.method;
-    var params = Object.clone(this.options.parameters);
-
-    if (!['get', 'post'].include(this.method)) {
-      // simulate other verbs over post
-      params['_method'] = this.method;
-      this.method = 'post';
-    }
-
-    this.parameters = params;
-
-    if (params = Object.toQueryString(params)) {
-      // when GET, append parameters to URL
-      if (this.method == 'get')
-        this.url += (this.url.include('?') ? '&' : '?') + params;
-      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
-        params += '&_=';
-    }
-
-    try {
-      var response = new Ajax.Response(this);
-      if (this.options.onCreate) this.options.onCreate(response);
-      Ajax.Responders.dispatch('onCreate', this, response);
-
-      this.transport.open(this.method.toUpperCase(), this.url,
-        this.options.asynchronous);
-
-      if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
-
-      this.transport.onreadystatechange = this.onStateChange.bind(this);
-      this.setRequestHeaders();
-
-      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
-      this.transport.send(this.body);
-
-      /* Force Firefox to handle ready state 4 for synchronous requests */
-      if (!this.options.asynchronous && this.transport.overrideMimeType)
-        this.onStateChange();
-
-    }
-    catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  onStateChange: function() {
-    var readyState = this.transport.readyState;
-    if (readyState > 1 && !((readyState == 4) && this._complete))
-      this.respondToReadyState(this.transport.readyState);
-  },
-
-  setRequestHeaders: function() {
-    var headers = {
-      'X-Requested-With': 'XMLHttpRequest',
-      'X-Prototype-Version': Prototype.Version,
-      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
-    };
-
-    if (this.method == 'post') {
-      headers['Content-type'] = this.options.contentType +
-        (this.options.encoding ? '; charset=' + this.options.encoding : '');
-
-      /* Force "Connection: close" for older Mozilla browsers to work
-       * around a bug where XMLHttpRequest sends an incorrect
-       * Content-length header. See Mozilla Bugzilla #246651.
-       */
-      if (this.transport.overrideMimeType &&
-          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
-            headers['Connection'] = 'close';
-    }
-
-    // user-defined headers
-    if (typeof this.options.requestHeaders == 'object') {
-      var extras = this.options.requestHeaders;
-
-      if (Object.isFunction(extras.push))
-        for (var i = 0, length = extras.length; i < length; i += 2)
-          headers[extras[i]] = extras[i+1];
-      else
-        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
-    }
-
-    for (var name in headers)
-      this.transport.setRequestHeader(name, headers[name]);
-  },
-
-  success: function() {
-    var status = this.getStatus();
-    return !status || (status >= 200 && status < 300);
-  },
-
-  getStatus: function() {
-    try {
-      return this.transport.status || 0;
-    } catch (e) { return 0 }
-  },
-
-  respondToReadyState: function(readyState) {
-    var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
-
-    if (state == 'Complete') {
-      try {
-        this._complete = true;
-        (this.options['on' + response.status]
-         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(response, response.headerJSON);
-      } catch (e) {
-        this.dispatchException(e);
-      }
-
-      var contentType = response.getHeader('Content-type');
-      if (this.options.evalJS == 'force'
-          || (this.options.evalJS && contentType
-          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
-        this.evalResponse();
-    }
-
-    try {
-      (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
-      Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
-    } catch (e) {
-      this.dispatchException(e);
-    }
-
-    if (state == 'Complete') {
-      // avoid memory leak in MSIE: clean up
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-    }
-  },
-
-  getHeader: function(name) {
-    try {
-      return this.transport.getResponseHeader(name);
-    } catch (e) { return null }
-  },
-
-  evalResponse: function() {
-    try {
-      return eval((this.transport.responseText || '').unfilterJSON());
-    } catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  dispatchException: function(exception) {
-    (this.options.onException || Prototype.emptyFunction)(this, exception);
-    Ajax.Responders.dispatch('onException', this, exception);
-  }
-});
-
-Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
-
-Ajax.Response = Class.create({
-  initialize: function(request){
-    this.request = request;
-    var transport  = this.transport  = request.transport,
-        readyState = this.readyState = transport.readyState;
-
-    if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
-      this.status       = this.getStatus();
-      this.statusText   = this.getStatusText();
-      this.responseText = String.interpret(transport.responseText);
-      this.headerJSON   = this._getHeaderJSON();
-    }
-
-    if(readyState == 4) {
-      var xml = transport.responseXML;
-      this.responseXML  = xml === undefined ? null : xml;
-      this.responseJSON = this._getResponseJSON();
-    }
-  },
-
-  status:      0,
-  statusText: '',
-
-  getStatus: Ajax.Request.prototype.getStatus,
-
-  getStatusText: function() {
-    try {
-      return this.transport.statusText || '';
-    } catch (e) { return '' }
-  },
-
-  getHeader: Ajax.Request.prototype.getHeader,
-
-  getAllHeaders: function() {
-    try {
-      return this.getAllResponseHeaders();
-    } catch (e) { return null }
-  },
-
-  getResponseHeader: function(name) {
-    return this.transport.getResponseHeader(name);
-  },
-
-  getAllResponseHeaders: function() {
-    return this.transport.getAllResponseHeaders();
-  },
-
-  _getHeaderJSON: function() {
-    var json = this.getHeader('X-JSON');
-    if (!json) return null;
-    json = decodeURIComponent(escape(json));
-    try {
-      return json.evalJSON(this.request.options.sanitizeJSON);
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  },
-
-  _getResponseJSON: function() {
-    var options = this.request.options;
-    if (!options.evalJSON || (options.evalJSON != 'force' &&
-      !(this.getHeader('Content-type') || '').include('application/json')))
-        return null;
-    try {
-      return this.transport.responseText.evalJSON(options.sanitizeJSON);
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  }
-});
-
-Ajax.Updater = Class.create(Ajax.Request, {
-  initialize: function($super, container, url, options) {
-    this.container = {
-      success: (container.success || container),
-      failure: (container.failure || (container.success ? null : container))
-    };
-
-    options = options || { };
-    var onComplete = options.onComplete;
-    options.onComplete = (function(response, param) {
-      this.updateContent(response.responseText);
-      if (Object.isFunction(onComplete)) onComplete(response, param);
-    }).bind(this);
-
-    $super(url, options);
-  },
-
-  updateContent: function(responseText) {
-    var receiver = this.container[this.success() ? 'success' : 'failure'],
-        options = this.options;
-
-    if (!options.evalScripts) responseText = responseText.stripScripts();
-
-    if (receiver = $(receiver)) {
-      if (options.insertion) {
-        if (Object.isString(options.insertion)) {
-          var insertion = { }; insertion[options.insertion] = responseText;
-          receiver.insert(insertion);
-        }
-        else options.insertion(receiver, responseText);
-      }
-      else receiver.update(responseText);
-    }
-
-    if (this.success()) {
-      if (this.onComplete) this.onComplete.bind(this).defer();
-    }
-  }
-});
-
-Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
-  initialize: function($super, container, url, options) {
-    $super(options);
-    this.onComplete = this.options.onComplete;
-
-    this.frequency = (this.options.frequency || 2);
-    this.decay = (this.options.decay || 1);
-
-    this.updater = { };
-    this.container = container;
-    this.url = url;
-
-    this.start();
-  },
-
-  start: function() {
-    this.options.onComplete = this.updateComplete.bind(this);
-    this.onTimerEvent();
-  },
-
-  stop: function() {
-    this.updater.options.onComplete = undefined;
-    clearTimeout(this.timer);
-    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
-  },
-
-  updateComplete: function(response) {
-    if (this.options.decay) {
-      this.decay = (response.responseText == this.lastText ?
-        this.decay * this.options.decay : 1);
-
-      this.lastText = response.responseText;
-    }
-    this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
-  },
-
-  onTimerEvent: function() {
-    this.updater = new Ajax.Updater(this.container, this.url, this.options);
-  }
-});
-function $(element) {
-  if (arguments.length > 1) {
-    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
-      elements.push($(arguments[i]));
-    return elements;
-  }
-  if (Object.isString(element))
-    element = document.getElementById(element);
-  return Element.extend(element);
-}
-
-if (Prototype.BrowserFeatures.XPath) {
-  document._getElementsByXPath = function(expression, parentElement) {
-    var results = [];
-    var query = document.evaluate(expression, $(parentElement) || document,
-      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    for (var i = 0, length = query.snapshotLength; i < length; i++)
-      results.push(Element.extend(query.snapshotItem(i)));
-    return results;
-  };
-}
-
-/*--------------------------------------------------------------------------*/
-
-if (!window.Node) var Node = { };
-
-if (!Node.ELEMENT_NODE) {
-  // DOM level 2 ECMAScript Language Binding
-  Object.extend(Node, {
-    ELEMENT_NODE: 1,
-    ATTRIBUTE_NODE: 2,
-    TEXT_NODE: 3,
-    CDATA_SECTION_NODE: 4,
-    ENTITY_REFERENCE_NODE: 5,
-    ENTITY_NODE: 6,
-    PROCESSING_INSTRUCTION_NODE: 7,
-    COMMENT_NODE: 8,
-    DOCUMENT_NODE: 9,
-    DOCUMENT_TYPE_NODE: 10,
-    DOCUMENT_FRAGMENT_NODE: 11,
-    NOTATION_NODE: 12
-  });
-}
-
-(function() {
-  var element = this.Element;
-  this.Element = function(tagName, attributes) {
-    attributes = attributes || { };
-    tagName = tagName.toLowerCase();
-    var cache = Element.cache;
-    if (Prototype.Browser.IE && attributes.name) {
-      tagName = '<' + tagName + ' name="' + attributes.name + '">';
-      delete attributes.name;
-      return Element.writeAttribute(document.createElement(tagName), attributes);
-    }
-    if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
-    return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
-  };
-  Object.extend(this.Element, element || { });
-}).call(window);
-
-Element.cache = { };
-
-Element.Methods = {
-  visible: function(element) {
-    return $(element).style.display != 'none';
-  },
-
-  toggle: function(element) {
-    element = $(element);
-    Element[Element.visible(element) ? 'hide' : 'show'](element);
-    return element;
-  },
-
-  hide: function(element) {
-    $(element).style.display = 'none';
-    return element;
-  },
-
-  show: function(element) {
-    $(element).style.display = '';
-    return element;
-  },
-
-  remove: function(element) {
-    element = $(element);
-    element.parentNode.removeChild(element);
-    return element;
-  },
-
-  update: function(element, content) {
-    element = $(element);
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) return element.update().insert(content);
-    content = Object.toHTML(content);
-    element.innerHTML = content.stripScripts();
-    content.evalScripts.bind(content).defer();
-    return element;
-  },
-
-  replace: function(element, content) {
-    element = $(element);
-    if (content && content.toElement) content = content.toElement();
-    else if (!Object.isElement(content)) {
-      content = Object.toHTML(content);
-      var range = element.ownerDocument.createRange();
-      range.selectNode(element);
-      content.evalScripts.bind(content).defer();
-      content = range.createContextualFragment(content.stripScripts());
-    }
-    element.parentNode.replaceChild(content, element);
-    return element;
-  },
-
-  insert: function(element, insertions) {
-    element = $(element);
-
-    if (Object.isString(insertions) || Object.isNumber(insertions) ||
-        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
-          insertions = {bottom:insertions};
-
-    var content, t, range;
-
-    for (position in insertions) {
-      content  = insertions[position];
-      position = position.toLowerCase();
-      t = Element._insertionTranslations[position];
-
-      if (content && content.toElement) content = content.toElement();
-      if (Object.isElement(content)) {
-        t.insert(element, content);
-        continue;
-      }
-
-      content = Object.toHTML(content);
-
-      range = element.ownerDocument.createRange();
-      t.initializeRange(element, range);
-      t.insert(element, range.createContextualFragment(content.stripScripts()));
-
-      content.evalScripts.bind(content).defer();
-    }
-
-    return element;
-  },
-
-  wrap: function(element, wrapper, attributes) {
-    element = $(element);
-    if (Object.isElement(wrapper))
-      $(wrapper).writeAttribute(attributes || { });
-    else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
-    else wrapper = new Element('div', wrapper);
-    if (element.parentNode)
-      element.parentNode.replaceChild(wrapper, element);
-    wrapper.appendChild(element);
-    return wrapper;
-  },
-
-  inspect: function(element) {
-    element = $(element);
-    var result = '<' + element.tagName.toLowerCase();
-    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
-      var property = pair.first(), attribute = pair.last();
-      var value = (element[property] || '').toString();
-      if (value) result += ' ' + attribute + '=' + value.inspect(true);
-    });
-    return result + '>';
-  },
-
-  recursivelyCollect: function(element, property) {
-    element = $(element);
-    var elements = [];
-    while (element = element[property])
-      if (element.nodeType == 1)
-        elements.push(Element.extend(element));
-    return elements;
-  },
-
-  ancestors: function(element) {
-    return $(element).recursivelyCollect('parentNode');
-  },
-
-  descendants: function(element) {
-    return $A($(element).getElementsByTagName('*')).each(Element.extend);
-  },
-
-  firstDescendant: function(element) {
-    element = $(element).firstChild;
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    return $(element);
-  },
-
-  immediateDescendants: function(element) {
-    if (!(element = $(element).firstChild)) return [];
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    if (element) return [element].concat($(element).nextSiblings());
-    return [];
-  },
-
-  previousSiblings: function(element) {
-    return $(element).recursivelyCollect('previousSibling');
-  },
-
-  nextSiblings: function(element) {
-    return $(element).recursivelyCollect('nextSibling');
-  },
-
-  siblings: function(element) {
-    element = $(element);
-    return element.previousSiblings().reverse().concat(element.nextSiblings());
-  },
-
-  match: function(element, selector) {
-    if (Object.isString(selector))
-      selector = new Selector(selector);
-    return selector.match($(element));
-  },
-
-  up: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(element.parentNode);
-    var ancestors = element.ancestors();
-    return expression ? Selector.findElement(ancestors, expression, index) :
-      ancestors[index || 0];
-  },
-
-  down: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return element.firstDescendant();
-    var descendants = element.descendants();
-    return expression ? Selector.findElement(descendants, expression, index) :
-      descendants[index || 0];
-  },
-
-  previous: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
-    var previousSiblings = element.previousSiblings();
-    return expression ? Selector.findElement(previousSiblings, expression, index) :
-      previousSiblings[index || 0];
-  },
-
-  next: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
-    var nextSiblings = element.nextSiblings();
-    return expression ? Selector.findElement(nextSiblings, expression, index) :
-      nextSiblings[index || 0];
-  },
-
-  select: function() {
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element, args);
-  },
-
-  adjacent: function() {
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element.parentNode, args).without(element);
-  },
-
-  identify: function(element) {
-    element = $(element);
-    var id = element.readAttribute('id'), self = arguments.callee;
-    if (id) return id;
-    do { id = 'anonymous_element_' + self.counter++ } while ($(id));
-    element.writeAttribute('id', id);
-    return id;
-  },
-
-  readAttribute: function(element, name) {
-    element = $(element);
-    if (Prototype.Browser.IE) {
-      var t = Element._attributeTranslations.read;
-      if (t.values[name]) return t.values[name](element, name);
-      if (t.names[name]) name = t.names[name];
-      if (name.include(':')) {
-        return (!element.attributes || !element.attributes[name]) ? null :
-         element.attributes[name].value;
-      }
-    }
-    return element.getAttribute(name);
-  },
-
-  writeAttribute: function(element, name, value) {
-    element = $(element);
-    var attributes = { }, t = Element._attributeTranslations.write;
-
-    if (typeof name == 'object') attributes = name;
-    else attributes[name] = value === undefined ? true : value;
-
-    for (var attr in attributes) {
-      var name = t.names[attr] || attr, value = attributes[attr];
-      if (t.values[attr]) name = t.values[attr](element, value);
-      if (value === false || value === null)
-        element.removeAttribute(name);
-      else if (value === true)
-        element.setAttribute(name, name);
-      else element.setAttribute(name, value);
-    }
-    return element;
-  },
-
-  getHeight: function(element) {
-    return $(element).getDimensions().height;
-  },
-
-  getWidth: function(element) {
-    return $(element).getDimensions().width;
-  },
-
-  classNames: function(element) {
-    return new Element.ClassNames(element);
-  },
-
-  hasClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    var elementClassName = element.className;
-    return (elementClassName.length > 0 && (elementClassName == className ||
-      new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
-  },
-
-  addClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    if (!element.hasClassName(className))
-      element.className += (element.className ? ' ' : '') + className;
-    return element;
-  },
-
-  removeClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    element.className = element.className.replace(
-      new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
-    return element;
-  },
-
-  toggleClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    return element[element.hasClassName(className) ?
-      'removeClassName' : 'addClassName'](className);
-  },
-
-  // removes whitespace-only text node children
-  cleanWhitespace: function(element) {
-    element = $(element);
-    var node = element.firstChild;
-    while (node) {
-      var nextNode = node.nextSibling;
-      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
-        element.removeChild(node);
-      node = nextNode;
-    }
-    return element;
-  },
-
-  empty: function(element) {
-    return $(element).innerHTML.blank();
-  },
-
-  descendantOf: function(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
-
-    if (element.compareDocumentPosition)
-      return (element.compareDocumentPosition(ancestor) & 8) === 8;
-
-    if (element.sourceIndex && !Prototype.Browser.Opera) {
-      var e = element.sourceIndex, a = ancestor.sourceIndex,
-       nextAncestor = ancestor.nextSibling;
-      if (!nextAncestor) {
-        do { ancestor = ancestor.parentNode; }
-        while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
-      }
-      if (nextAncestor) return (e > a && e < nextAncestor.sourceIndex);
-    }
-
-    while (element = element.parentNode)
-      if (element == ancestor) return true;
-    return false;
-  },
-
-  scrollTo: function(element) {
-    element = $(element);
-    var pos = element.cumulativeOffset();
-    window.scrollTo(pos[0], pos[1]);
-    return element;
-  },
-
-  getStyle: function(element, style) {
-    element = $(element);
-    style = style == 'float' ? 'cssFloat' : style.camelize();
-    var value = element.style[style];
-    if (!value) {
-      var css = document.defaultView.getComputedStyle(element, null);
-      value = css ? css[style] : null;
-    }
-    if (style == 'opacity') return value ? parseFloat(value) : 1.0;
-    return value == 'auto' ? null : value;
-  },
-
-  getOpacity: function(element) {
-    return $(element).getStyle('opacity');
-  },
-
-  setStyle: function(element, styles) {
-    element = $(element);
-    var elementStyle = element.style, match;
-    if (Object.isString(styles)) {
-      element.style.cssText += ';' + styles;
-      return styles.include('opacity') ?
-        element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
-    }
-    for (var property in styles)
-      if (property == 'opacity') element.setOpacity(styles[property]);
-      else
-        elementStyle[(property == 'float' || property == 'cssFloat') ?
-          (elementStyle.styleFloat === undefined ? 'cssFloat' : 'styleFloat') :
-            property] = styles[property];
-
-    return element;
-  },
-
-  setOpacity: function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1 || value === '') ? '' :
-      (value < 0.00001) ? 0 : value;
-    return element;
-  },
-
-  getDimensions: function(element) {
-    element = $(element);
-    var display = $(element).getStyle('display');
-    if (display != 'none' && display != null) // Safari bug
-      return {width: element.offsetWidth, height: element.offsetHeight};
-
-    // All *Width and *Height properties give 0 on elements with display none,
-    // so enable the element temporarily
-    var els = element.style;
-    var originalVisibility = els.visibility;
-    var originalPosition = els.position;
-    var originalDisplay = els.display;
-    els.visibility = 'hidden';
-    els.position = 'absolute';
-    els.display = 'block';
-    var originalWidth = element.clientWidth;
-    var originalHeight = element.clientHeight;
-    els.display = originalDisplay;
-    els.position = originalPosition;
-    els.visibility = originalVisibility;
-    return {width: originalWidth, height: originalHeight};
-  },
-
-  makePositioned: function(element) {
-    element = $(element);
-    var pos = Element.getStyle(element, 'position');
-    if (pos == 'static' || !pos) {
-      element._madePositioned = true;
-      element.style.position = 'relative';
-      // Opera returns the offset relative to the positioning context, when an
-      // element is position relative but top and left have not been defined
-      if (window.opera) {
-        element.style.top = 0;
-        element.style.left = 0;
-      }
-    }
-    return element;
-  },
-
-  undoPositioned: function(element) {
-    element = $(element);
-    if (element._madePositioned) {
-      element._madePositioned = undefined;
-      element.style.position =
-        element.style.top =
-        element.style.left =
-        element.style.bottom =
-        element.style.right = '';
-    }
-    return element;
-  },
-
-  makeClipping: function(element) {
-    element = $(element);
-    if (element._overflow) return element;
-    element._overflow = Element.getStyle(element, 'overflow') || 'auto';
-    if (element._overflow !== 'hidden')
-      element.style.overflow = 'hidden';
-    return element;
-  },
-
-  undoClipping: function(element) {
-    element = $(element);
-    if (!element._overflow) return element;
-    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
-    element._overflow = null;
-    return element;
-  },
-
-  cumulativeOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  positionedOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-      if (element) {
-        if (element.tagName == 'BODY') break;
-        var p = Element.getStyle(element, 'position');
-        if (p == 'relative' || p == 'absolute') break;
-      }
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  absolutize: function(element) {
-    element = $(element);
-    if (element.getStyle('position') == 'absolute') return;
-    // Position.prepare(); // To be done manually by Scripty when it needs it.
-
-    var offsets = element.positionedOffset();
-    var top     = offsets[1];
-    var left    = offsets[0];
-    var width   = element.clientWidth;
-    var height  = element.clientHeight;
-
-    element._originalLeft   = left - parseFloat(element.style.left  || 0);
-    element._originalTop    = top  - parseFloat(element.style.top || 0);
-    element._originalWidth  = element.style.width;
-    element._originalHeight = element.style.height;
-
-    element.style.position = 'absolute';
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.width  = width + 'px';
-    element.style.height = height + 'px';
-    return element;
-  },
-
-  relativize: function(element) {
-    element = $(element);
-    if (element.getStyle('position') == 'relative') return;
-    // Position.prepare(); // To be done manually by Scripty when it needs it.
-
-    element.style.position = 'relative';
-    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
-    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
-
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.height = element._originalHeight;
-    element.style.width  = element._originalWidth;
-    return element;
-  },
-
-  cumulativeScrollOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.scrollTop  || 0;
-      valueL += element.scrollLeft || 0;
-      element = element.parentNode;
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  getOffsetParent: function(element) {
-    if (element.offsetParent) return $(element.offsetParent);
-    if (element == document.body) return $(element);
-
-    while ((element = element.parentNode) && element != document.body)
-      if (Element.getStyle(element, 'position') != 'static')
-        return $(element);
-
-    return $(document.body);
-  },
-
-  viewportOffset: function(forElement) {
-    var valueT = 0, valueL = 0;
-
-    var element = forElement;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-
-      // Safari fix
-      if (element.offsetParent == document.body &&
-        Element.getStyle(element, 'position') == 'absolute') break;
-
-    } while (element = element.offsetParent);
-
-    element = forElement;
-    do {
-      if (!Prototype.Browser.Opera || element.tagName == 'BODY') {
-        valueT -= element.scrollTop  || 0;
-        valueL -= element.scrollLeft || 0;
-      }
-    } while (element = element.parentNode);
-
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  clonePosition: function(element, source) {
-    var options = Object.extend({
-      setLeft:    true,
-      setTop:     true,
-      setWidth:   true,
-      setHeight:  true,
-      offsetTop:  0,
-      offsetLeft: 0
-    }, arguments[2] || { });
-
-    // find page position of source
-    source = $(source);
-    var p = source.viewportOffset();
-
-    // find coordinate system to use
-    element = $(element);
-    var delta = [0, 0];
-    var parent = null;
-    // delta [0,0] will do fine with position: fixed elements,
-    // position:absolute needs offsetParent deltas
-    if (Element.getStyle(element, 'position') == 'absolute') {
-      parent = element.getOffsetParent();
-      delta = parent.viewportOffset();
-    }
-
-    // correct by body offsets (fixes Safari)
-    if (parent == document.body) {
-      delta[0] -= document.body.offsetLeft;
-      delta[1] -= document.body.offsetTop;
-    }
-
-    // set position
-    if (options.setLeft)   element.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
-    if (options.setTop)    element.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
-    if (options.setWidth)  element.style.width = source.offsetWidth + 'px';
-    if (options.setHeight) element.style.height = source.offsetHeight + 'px';
-    return element;
-  }
-};
-
-Element.Methods.identify.counter = 1;
-
-Object.extend(Element.Methods, {
-  getElementsBySelector: Element.Methods.select,
-  childElements: Element.Methods.immediateDescendants
-});
-
-Element._attributeTranslations = {
-  write: {
-    names: {
-      className: 'class',
-      htmlFor:   'for'
-    },
-    values: { }
-  }
-};
-
-
-if (!document.createRange || Prototype.Browser.Opera) {
-  Element.Methods.insert = function(element, insertions) {
-    element = $(element);
-
-    if (Object.isString(insertions) || Object.isNumber(insertions) ||
-        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
-          insertions = { bottom: insertions };
-
-    var t = Element._insertionTranslations, content, position, pos, tagName;
-
-    for (position in insertions) {
-      content  = insertions[position];
-      position = position.toLowerCase();
-      pos      = t[position];
-
-      if (content && content.toElement) content = content.toElement();
-      if (Object.isElement(content)) {
-        pos.insert(element, content);
-        continue;
-      }
-
-      content = Object.toHTML(content);
-      tagName = ((position == 'before' || position == 'after')
-        ? element.parentNode : element).tagName.toUpperCase();
-
-      if (t.tags[tagName]) {
-        var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-        if (position == 'top' || position == 'after') fragments.reverse();
-        fragments.each(pos.insert.curry(element));
-      }
-      else element.insertAdjacentHTML(pos.adjacency, content.stripScripts());
-
-      content.evalScripts.bind(content).defer();
-    }
-
-    return element;
-  };
-}
-
-if (Prototype.Browser.Opera) {
-  Element.Methods._getStyle = Element.Methods.getStyle;
-  Element.Methods.getStyle = function(element, style) {
-    switch(style) {
-      case 'left':
-      case 'top':
-      case 'right':
-      case 'bottom':
-        if (Element._getStyle(element, 'position') == 'static') return null;
-      default: return Element._getStyle(element, style);
-    }
-  };
-  Element.Methods._readAttribute = Element.Methods.readAttribute;
-  Element.Methods.readAttribute = function(element, attribute) {
-    if (attribute == 'title') return element.title;
-    return Element._readAttribute(element, attribute);
-  };
-}
-
-else if (Prototype.Browser.IE) {
-  $w('positionedOffset getOffsetParent viewportOffset').each(function(method) {
-    Element.Methods[method] = Element.Methods[method].wrap(
-      function(proceed, element) {
-        element = $(element);
-        var position = element.getStyle('position');
-        if (position != 'static') return proceed(element);
-        element.setStyle({ position: 'relative' });
-        var value = proceed(element);
-        element.setStyle({ position: position });
-        return value;
-      }
-    );
-  });
-
-  Element.Methods.getStyle = function(element, style) {
-    element = $(element);
-    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
-    var value = element.style[style];
-    if (!value && element.currentStyle) value = element.currentStyle[style];
-
-    if (style == 'opacity') {
-      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
-        if (value[1]) return parseFloat(value[1]) / 100;
-      return 1.0;
-    }
-
-    if (value == 'auto') {
-      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
-        return element['offset' + style.capitalize()] + 'px';
-      return null;
-    }
-    return value;
-  };
-
-  Element.Methods.setOpacity = function(element, value) {
-    function stripAlpha(filter){
-      return filter.replace(/alpha\([^\)]*\)/gi,'');
-    }
-    element = $(element);
-    var currentStyle = element.currentStyle;
-    if ((currentStyle && !currentStyle.hasLayout) ||
-      (!currentStyle && element.style.zoom == 'normal'))
-        element.style.zoom = 1;
-
-    var filter = element.getStyle('filter'), style = element.style;
-    if (value == 1 || value === '') {
-      (filter = stripAlpha(filter)) ?
-        style.filter = filter : style.removeAttribute('filter');
-      return element;
-    } else if (value < 0.00001) value = 0;
-    style.filter = stripAlpha(filter) +
-      'alpha(opacity=' + (value * 100) + ')';
-    return element;
-  };
-
-  Element._attributeTranslations = {
-    read: {
-      names: {
-        'class': 'className',
-        'for':   'htmlFor'
-      },
-      values: {
-        _getAttr: function(element, attribute) {
-          return element.getAttribute(attribute, 2);
-        },
-        _getAttrNode: function(element, attribute) {
-          var node = element.getAttributeNode(attribute);
-          return node ? node.value : "";
-        },
-        _getEv: function(element, attribute) {
-          var attribute = element.getAttribute(attribute);
-          return attribute ? attribute.toString().slice(23, -2) : null;
-        },
-        _flag: function(element, attribute) {
-          return $(element).hasAttribute(attribute) ? attribute : null;
-        },
-        style: function(element) {
-          return element.style.cssText.toLowerCase();
-        },
-        title: function(element) {
-          return element.title;
-        }
-      }
-    }
-  };
-
-  Element._attributeTranslations.write = {
-    names: Object.clone(Element._attributeTranslations.read.names),
-    values: {
-      checked: function(element, value) {
-        element.checked = !!value;
-      },
-
-      style: function(element, value) {
-        element.style.cssText = value ? value : '';
-      }
-    }
-  };
-
-  Element._attributeTranslations.has = {};
-
-  $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
-      'encType maxLength readOnly longDesc').each(function(attr) {
-    Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
-    Element._attributeTranslations.has[attr.toLowerCase()] = attr;
-  });
-
-  (function(v) {
-    Object.extend(v, {
-      href:        v._getAttr,
-      src:         v._getAttr,
-      type:        v._getAttr,
-      action:      v._getAttrNode,
-      disabled:    v._flag,
-      checked:     v._flag,
-      readonly:    v._flag,
-      multiple:    v._flag,
-      onload:      v._getEv,
-      onunload:    v._getEv,
-      onclick:     v._getEv,
-      ondblclick:  v._getEv,
-      onmousedown: v._getEv,
-      onmouseup:   v._getEv,
-      onmouseover: v._getEv,
-      onmousemove: v._getEv,
-      onmouseout:  v._getEv,
-      onfocus:     v._getEv,
-      onblur:      v._getEv,
-      onkeypress:  v._getEv,
-      onkeydown:   v._getEv,
-      onkeyup:     v._getEv,
-      onsubmit:    v._getEv,
-      onreset:     v._getEv,
-      onselect:    v._getEv,
-      onchange:    v._getEv
-    });
-  })(Element._attributeTranslations.read.values);
-}
-
-else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1) ? 0.999999 :
-      (value === '') ? '' : (value < 0.00001) ? 0 : value;
-    return element;
-  };
-}
-
-else if (Prototype.Browser.WebKit) {
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1 || value === '') ? '' :
-      (value < 0.00001) ? 0 : value;
-
-    if (value == 1)
-      if(element.tagName == 'IMG' && element.width) {
-        element.width++; element.width--;
-      } else try {
-        var n = document.createTextNode(' ');
-        element.appendChild(n);
-        element.removeChild(n);
-      } catch (e) { }
-
-    return element;
-  };
-
-  // Safari returns margins on body which is incorrect if the child is absolutely
-  // positioned.  For performance reasons, redefine Position.cumulativeOffset for
-  // KHTML/WebKit only.
-  Element.Methods.cumulativeOffset = function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      if (element.offsetParent == document.body)
-        if (Element.getStyle(element, 'position') == 'absolute') break;
-
-      element = element.offsetParent;
-    } while (element);
-
-    return Element._returnOffset(valueL, valueT);
-  };
-}
-
-if (Prototype.Browser.IE || Prototype.Browser.Opera) {
-  // IE and Opera are missing .innerHTML support for TABLE-related and SELECT elements
-  Element.Methods.update = function(element, content) {
-    element = $(element);
-
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) return element.update().insert(content);
-
-    content = Object.toHTML(content);
-    var tagName = element.tagName.toUpperCase();
-
-    if (tagName in Element._insertionTranslations.tags) {
-      $A(element.childNodes).each(function(node) { element.removeChild(node) });
-      Element._getContentFromAnonymousElement(tagName, content.stripScripts())
-        .each(function(node) { element.appendChild(node) });
-    }
-    else element.innerHTML = content.stripScripts();
-
-    content.evalScripts.bind(content).defer();
-    return element;
-  };
-}
-
-if (document.createElement('div').outerHTML) {
-  Element.Methods.replace = function(element, content) {
-    element = $(element);
-
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) {
-      element.parentNode.replaceChild(content, element);
-      return element;
-    }
-
-    content = Object.toHTML(content);
-    var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
-
-    if (Element._insertionTranslations.tags[tagName]) {
-      var nextSibling = element.next();
-      var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-      parent.removeChild(element);
-      if (nextSibling)
-        fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
-      else
-        fragments.each(function(node) { parent.appendChild(node) });
-    }
-    else element.outerHTML = content.stripScripts();
-
-    content.evalScripts.bind(content).defer();
-    return element;
-  };
-}
-
-Element._returnOffset = function(l, t) {
-  var result = [l, t];
-  result.left = l;
-  result.top = t;
-  return result;
-};
-
-Element._getContentFromAnonymousElement = function(tagName, html) {
-  var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
-  div.innerHTML = t[0] + html + t[1];
-  t[2].times(function() { div = div.firstChild });
-  return $A(div.childNodes);
-};
-
-Element._insertionTranslations = {
-  before: {
-    adjacency: 'beforeBegin',
-    insert: function(element, node) {
-      element.parentNode.insertBefore(node, element);
-    },
-    initializeRange: function(element, range) {
-      range.setStartBefore(element);
-    }
-  },
-  top: {
-    adjacency: 'afterBegin',
-    insert: function(element, node) {
-      element.insertBefore(node, element.firstChild);
-    },
-    initializeRange: function(element, range) {
-      range.selectNodeContents(element);
-      range.collapse(true);
-    }
-  },
-  bottom: {
-    adjacency: 'beforeEnd',
-    insert: function(element, node) {
-      element.appendChild(node);
-    }
-  },
-  after: {
-    adjacency: 'afterEnd',
-    insert: function(element, node) {
-      element.parentNode.insertBefore(node, element.nextSibling);
-    },
-    initializeRange: function(element, range) {
-      range.setStartAfter(element);
-    }
-  },
-  tags: {
-    TABLE:  ['<table>',                '</table>',                   1],
-    TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
-    TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
-    TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
-    SELECT: ['<select>',               '</select>',                  1]
-  }
-};
-
-(function() {
-  this.bottom.initializeRange = this.top.initializeRange;
-  Object.extend(this.tags, {
-    THEAD: this.tags.TBODY,
-    TFOOT: this.tags.TBODY,
-    TH:    this.tags.TD
-  });
-}).call(Element._insertionTranslations);
-
-Element.Methods.Simulated = {
-  hasAttribute: function(element, attribute) {
-    attribute = Element._attributeTranslations.has[attribute] || attribute;
-    var node = $(element).getAttributeNode(attribute);
-    return node && node.specified;
-  }
-};
-
-Element.Methods.ByTag = { };
-
-Object.extend(Element, Element.Methods);
-
-if (!Prototype.BrowserFeatures.ElementExtensions &&
-    document.createElement('div').__proto__) {
-  window.HTMLElement = { };
-  window.HTMLElement.prototype = document.createElement('div').__proto__;
-  Prototype.BrowserFeatures.ElementExtensions = true;
-}
-
-Element.extend = (function() {
-  if (Prototype.BrowserFeatures.SpecificElementExtensions)
-    return Prototype.K;
-
-  var Methods = { }, ByTag = Element.Methods.ByTag;
-
-  var extend = Object.extend(function(element) {
-    if (!element || element._extendedByPrototype ||
-        element.nodeType != 1 || element == window) return element;
-
-    var methods = Object.clone(Methods),
-      tagName = element.tagName, property, value;
-
-    // extend methods for specific tags
-    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
-
-    for (property in methods) {
-      value = methods[property];
-      if (Object.isFunction(value) && !(property in element))
-        element[property] = value.methodize();
-    }
-
-    element._extendedByPrototype = Prototype.emptyFunction;
-    return element;
-
-  }, {
-    refresh: function() {
-      // extend methods for all tags (Safari doesn't need this)
-      if (!Prototype.BrowserFeatures.ElementExtensions) {
-        Object.extend(Methods, Element.Methods);
-        Object.extend(Methods, Element.Methods.Simulated);
-      }
-    }
-  });
-
-  extend.refresh();
-  return extend;
-})();
-
-Element.hasAttribute = function(element, attribute) {
-  if (element.hasAttribute) return element.hasAttribute(attribute);
-  return Element.Methods.Simulated.hasAttribute(element, attribute);
-};
-
-Element.addMethods = function(methods) {
-  var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
-
-  if (!methods) {
-    Object.extend(Form, Form.Methods);
-    Object.extend(Form.Element, Form.Element.Methods);
-    Object.extend(Element.Methods.ByTag, {
-      "FORM":     Object.clone(Form.Methods),
-      "INPUT":    Object.clone(Form.Element.Methods),
-      "SELECT":   Object.clone(Form.Element.Methods),
-      "TEXTAREA": Object.clone(Form.Element.Methods)
-    });
-  }
-
-  if (arguments.length == 2) {
-    var tagName = methods;
-    methods = arguments[1];
-  }
-
-  if (!tagName) Object.extend(Element.Methods, methods || { });
-  else {
-    if (Object.isArray(tagName)) tagName.each(extend);
-    else extend(tagName);
-  }
-
-  function extend(tagName) {
-    tagName = tagName.toUpperCase();
-    if (!Element.Methods.ByTag[tagName])
-      Element.Methods.ByTag[tagName] = { };
-    Object.extend(Element.Methods.ByTag[tagName], methods);
-  }
-
-  function copy(methods, destination, onlyIfAbsent) {
-    onlyIfAbsent = onlyIfAbsent || false;
-    for (var property in methods) {
-      var value = methods[property];
-      if (!Object.isFunction(value)) continue;
-      if (!onlyIfAbsent || !(property in destination))
-        destination[property] = value.methodize();
-    }
-  }
-
-  function findDOMClass(tagName) {
-    var klass;
-    var trans = {
-      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
-      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
-      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
-      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
-      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
-      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
-      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
-      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
-      "FrameSet", "IFRAME": "IFrame"
-    };
-    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName.capitalize() + 'Element';
-    if (window[klass]) return window[klass];
-
-    window[klass] = { };
-    window[klass].prototype = document.createElement(tagName).__proto__;
-    return window[klass];
-  }
-
-  if (F.ElementExtensions) {
-    copy(Element.Methods, HTMLElement.prototype);
-    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
-  }
-
-  if (F.SpecificElementExtensions) {
-    for (var tag in Element.Methods.ByTag) {
-      var klass = findDOMClass(tag);
-      if (Object.isUndefined(klass)) continue;
-      copy(T[tag], klass.prototype);
-    }
-  }
-
-  Object.extend(Element, Element.Methods);
-  delete Element.ByTag;
-
-  if (Element.extend.refresh) Element.extend.refresh();
-  Element.cache = { };
-};
-
-document.viewport = {
-  getDimensions: function() {
-    var dimensions = { };
-    $w('width height').each(function(d) {
-      var D = d.capitalize();
-      dimensions[d] = self['inner' + D] ||
-       (document.documentElement['client' + D] || document.body['client' + D]);
-    });
-    return dimensions;
-  },
-
-  getWidth: function() {
-    return this.getDimensions().width;
-  },
-
-  getHeight: function() {
-    return this.getDimensions().height;
-  },
-
-  getScrollOffsets: function() {
-    return Element._returnOffset(
-      window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
-      window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
-  }
-};
-/* Portions of the Selector class are derived from Jack Slocum`s DomQuery,
- * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
- * license.  Please see http://www.yui-ext.com/ for more information. */
-
-var Selector = Class.create({
-  initialize: function(expression) {
-    this.expression = expression.strip();
-    this.compileMatcher();
-  },
-
-  compileMatcher: function() {
-    // Selectors with namespaced attributes can't use the XPath version
-    if (Prototype.BrowserFeatures.XPath && !(/(\[[\w-]*?:|:checked)/).test(this.expression))
-      return this.compileXPathMatcher();
-
-    var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
-        c = Selector.criteria, le, p, m;
-
-    if (Selector._cache[e]) {
-      this.matcher = Selector._cache[e];
-      return;
-    }
-
-    this.matcher = ["this.matcher = function(root) {",
-                    "var r = root, h = Selector.handlers, c = false, n;"];
-
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        p = ps[i];
-        if (m = e.match(p)) {
-          this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
-    	      new Template(c[i]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.matcher.push("return h.unique(n);\n}");
-    eval(this.matcher.join('\n'));
-    Selector._cache[this.expression] = this.matcher;
-  },
-
-  compileXPathMatcher: function() {
-    var e = this.expression, ps = Selector.patterns,
-        x = Selector.xpath, le, m;
-
-    if (Selector._cache[e]) {
-      this.xpath = Selector._cache[e]; return;
-    }
-
-    this.matcher = ['.//*'];
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        if (m = e.match(ps[i])) {
-          this.matcher.push(Object.isFunction(x[i]) ? x[i](m) :
-            new Template(x[i]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.xpath = this.matcher.join('');
-    Selector._cache[this.expression] = this.xpath;
-  },
-
-  findElements: function(root) {
-    root = root || document;
-    if (this.xpath) return document._getElementsByXPath(this.xpath, root);
-    return this.matcher(root);
-  },
-
-  match: function(element) {
-    this.tokens = [];
-
-    var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
-    var le, p, m;
-
-    while (e && le !== e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        p = ps[i];
-        if (m = e.match(p)) {
-          // use the Selector.assertions methods unless the selector
-          // is too complex.
-          if (as[i]) {
-            this.tokens.push([i, Object.clone(m)]);
-            e = e.replace(m[0], '');
-          } else {
-            // reluctantly do a document-wide search
-            // and look for a match in the array
-            return this.findElements(document).include(element);
-          }
-        }
-      }
-    }
-
-    var match = true, name, matches;
-    for (var i = 0, token; token = this.tokens[i]; i++) {
-      name = token[0], matches = token[1];
-      if (!Selector.assertions[name](element, matches)) {
-        match = false; break;
-      }
-    }
-
-    return match;
-  },
-
-  toString: function() {
-    return this.expression;
-  },
-
-  inspect: function() {
-    return "#<Selector:" + this.expression.inspect() + ">";
-  }
-});
-
-Object.extend(Selector, {
-  _cache: { },
-
-  xpath: {
-    descendant:   "//*",
-    child:        "/*",
-    adjacent:     "/following-sibling::*[1]",
-    laterSibling: '/following-sibling::*',
-    tagName:      function(m) {
-      if (m[1] == '*') return '';
-      return "[local-name()='" + m[1].toLowerCase() +
-             "' or local-name()='" + m[1].toUpperCase() + "']";
-    },
-    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
-    id:           "[@id='#{1}']",
-    attrPresence: "[@#{1}]",
-    attr: function(m) {
-      m[3] = m[5] || m[6];
-      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
-    },
-    pseudo: function(m) {
-      var h = Selector.xpath.pseudos[m[1]];
-      if (!h) return '';
-      if (Object.isFunction(h)) return h(m);
-      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
-    },
-    operators: {
-      '=':  "[@#{1}='#{3}']",
-      '!=': "[@#{1}!='#{3}']",
-      '^=': "[starts-with(@#{1}, '#{3}')]",
-      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
-      '*=': "[contains(@#{1}, '#{3}')]",
-      '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
-      '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
-    },
-    pseudos: {
-      'first-child': '[not(preceding-sibling::*)]',
-      'last-child':  '[not(following-sibling::*)]',
-      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
-      'empty':       "[count(*) = 0 and (count(text()) = 0 or translate(text(), ' \t\r\n', '') = '')]",
-      'checked':     "[@checked]",
-      'disabled':    "[@disabled]",
-      'enabled':     "[not(@disabled)]",
-      'not': function(m) {
-        var e = m[6], p = Selector.patterns,
-            x = Selector.xpath, le, m, v;
-
-        var exclusion = [];
-        while (e && le != e && (/\S/).test(e)) {
-          le = e;
-          for (var i in p) {
-            if (m = e.match(p[i])) {
-              v = Object.isFunction(x[i]) ? x[i](m) : new Template(x[i]).evaluate(m);
-              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
-              e = e.replace(m[0], '');
-              break;
-            }
-          }
-        }
-        return "[not(" + exclusion.join(" and ") + ")]";
-      },
-      'nth-child':      function(m) {
-        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
-      },
-      'nth-last-child': function(m) {
-        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
-      },
-      'nth-of-type':    function(m) {
-        return Selector.xpath.pseudos.nth("position() ", m);
-      },
-      'nth-last-of-type': function(m) {
-        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
-      },
-      'first-of-type':  function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
-      },
-      'last-of-type':   function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
-      },
-      'only-of-type':   function(m) {
-        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
-      },
-      nth: function(fragment, m) {
-        var mm, formula = m[6], predicate;
-        if (formula == 'even') formula = '2n+0';
-        if (formula == 'odd')  formula = '2n+1';
-        if (mm = formula.match(/^(\d+)$/)) // digit only
-          return '[' + fragment + "= " + mm[1] + ']';
-        if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-          if (mm[1] == "-") mm[1] = -1;
-          var a = mm[1] ? Number(mm[1]) : 1;
-          var b = mm[2] ? Number(mm[2]) : 0;
-          predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
-          "((#{fragment} - #{b}) div #{a} >= 0)]";
-          return new Template(predicate).evaluate({
-            fragment: fragment, a: a, b: b });
-        }
-      }
-    }
-  },
-
-  criteria: {
-    tagName:      'n = h.tagName(n, r, "#{1}", c);   c = false;',
-    className:    'n = h.className(n, r, "#{1}", c); c = false;',
-    id:           'n = h.id(n, r, "#{1}", c);        c = false;',
-    attrPresence: 'n = h.attrPresence(n, r, "#{1}"); c = false;',
-    attr: function(m) {
-      m[3] = (m[5] || m[6]);
-      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}"); c = false;').evaluate(m);
-    },
-    pseudo: function(m) {
-      if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
-      return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
-    },
-    descendant:   'c = "descendant";',
-    child:        'c = "child";',
-    adjacent:     'c = "adjacent";',
-    laterSibling: 'c = "laterSibling";'
-  },
-
-  patterns: {
-    // combinators must be listed first
-    // (and descendant needs to be last combinator)
-    laterSibling: /^\s*~\s*/,
-    child:        /^\s*>\s*/,
-    adjacent:     /^\s*\+\s*/,
-    descendant:   /^\s/,
-
-    // selectors follow
-    tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
-    id:           /^#([\w\-\*]+)(\b|$)/,
-    className:    /^\.([\w\-\*]+)(\b|$)/,
-    pseudo:       /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s)|(?=:))/,
-    attrPresence: /^\[([\w]+)\]/,
-    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
-  },
-
-  // for Selector.match and Element#match
-  assertions: {
-    tagName: function(element, matches) {
-      return matches[1].toUpperCase() == element.tagName.toUpperCase();
-    },
-
-    className: function(element, matches) {
-      return Element.hasClassName(element, matches[1]);
-    },
-
-    id: function(element, matches) {
-      return element.id === matches[1];
-    },
-
-    attrPresence: function(element, matches) {
-      return Element.hasAttribute(element, matches[1]);
-    },
-
-    attr: function(element, matches) {
-      var nodeValue = Element.readAttribute(element, matches[1]);
-      return Selector.operators[matches[2]](nodeValue, matches[3]);
-    }
-  },
-
-  handlers: {
-    // UTILITY FUNCTIONS
-    // joins two collections
-    concat: function(a, b) {
-      for (var i = 0, node; node = b[i]; i++)
-        a.push(node);
-      return a;
-    },
-
-    // marks an array of nodes for counting
-    mark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._counted = true;
-      return nodes;
-    },
-
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._counted = undefined;
-      return nodes;
-    },
-
-    // mark each child node with its position (for nth calls)
-    // "ofType" flag indicates whether we're indexing for nth-of-type
-    // rather than nth-child
-    index: function(parentNode, reverse, ofType) {
-      parentNode._counted = true;
-      if (reverse) {
-        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
-          var node = nodes[i];
-          if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
-        }
-      } else {
-        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
-          if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
-      }
-    },
-
-    // filters out duplicates and extends all nodes
-    unique: function(nodes) {
-      if (nodes.length == 0) return nodes;
-      var results = [], n;
-      for (var i = 0, l = nodes.length; i < l; i++)
-        if (!(n = nodes[i])._counted) {
-          n._counted = true;
-          results.push(Element.extend(n));
-        }
-      return Selector.handlers.unmark(results);
-    },
-
-    // COMBINATOR FUNCTIONS
-    descendant: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, node.getElementsByTagName('*'));
-      return results;
-    },
-
-    child: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        for (var j = 0, children = [], child; child = node.childNodes[j]; j++)
-          if (child.nodeType == 1 && child.tagName != '!') results.push(child);
-      }
-      return results;
-    },
-
-    adjacent: function(nodes) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        var next = this.nextElementSibling(node);
-        if (next) results.push(next);
-      }
-      return results;
-    },
-
-    laterSibling: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, Element.nextSiblings(node));
-      return results;
-    },
-
-    nextElementSibling: function(node) {
-      while (node = node.nextSibling)
-	      if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    previousElementSibling: function(node) {
-      while (node = node.previousSibling)
-        if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    // TOKEN FUNCTIONS
-    tagName: function(nodes, root, tagName, combinator) {
-      tagName = tagName.toUpperCase();
-      var results = [], h = Selector.handlers;
-      if (nodes) {
-        if (combinator) {
-          // fastlane for ordinary descendant combinators
-          if (combinator == "descendant") {
-            for (var i = 0, node; node = nodes[i]; i++)
-              h.concat(results, node.getElementsByTagName(tagName));
-            return results;
-          } else nodes = this[combinator](nodes);
-          if (tagName == "*") return nodes;
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.tagName.toUpperCase() == tagName) results.push(node);
-        return results;
-      } else return root.getElementsByTagName(tagName);
-    },
-
-    id: function(nodes, root, id, combinator) {
-      var targetNode = $(id), h = Selector.handlers;
-      if (!targetNode) return [];
-      if (!nodes && root == document) return [targetNode];
-      if (nodes) {
-        if (combinator) {
-          if (combinator == 'child') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (targetNode.parentNode == node) return [targetNode];
-          } else if (combinator == 'descendant') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Element.descendantOf(targetNode, node)) return [targetNode];
-          } else if (combinator == 'adjacent') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Selector.handlers.previousElementSibling(targetNode) == node)
-                return [targetNode];
-          } else nodes = h[combinator](nodes);
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node == targetNode) return [targetNode];
-        return [];
-      }
-      return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
-    },
-
-    className: function(nodes, root, className, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      return Selector.handlers.byClassName(nodes, root, className);
-    },
-
-    byClassName: function(nodes, root, className) {
-      if (!nodes) nodes = Selector.handlers.descendant([root]);
-      var needle = ' ' + className + ' ';
-      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
-        nodeClassName = node.className;
-        if (nodeClassName.length == 0) continue;
-        if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
-          results.push(node);
-      }
-      return results;
-    },
-
-    attrPresence: function(nodes, root, attr) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      var results = [];
-      for (var i = 0, node; node = nodes[i]; i++)
-        if (Element.hasAttribute(node, attr)) results.push(node);
-      return results;
-    },
-
-    attr: function(nodes, root, attr, value, operator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      var handler = Selector.operators[operator], results = [];
-      for (var i = 0, node; node = nodes[i]; i++) {
-        var nodeValue = Element.readAttribute(node, attr);
-        if (nodeValue === null) continue;
-        if (handler(nodeValue, value)) results.push(node);
-      }
-      return results;
-    },
-
-    pseudo: function(nodes, name, value, root, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      return Selector.pseudos[name](nodes, value, root);
-    }
-  },
-
-  pseudos: {
-    'first-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.previousElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'last-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.nextElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'only-child': function(nodes, value, root) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
-          results.push(node);
-      return results;
-    },
-    'nth-child':        function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root);
-    },
-    'nth-last-child':   function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true);
-    },
-    'nth-of-type':      function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, false, true);
-    },
-    'nth-last-of-type': function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true, true);
-    },
-    'first-of-type':    function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, false, true);
-    },
-    'last-of-type':     function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, true, true);
-    },
-    'only-of-type':     function(nodes, formula, root) {
-      var p = Selector.pseudos;
-      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
-    },
-
-    // handles the an+b logic
-    getIndices: function(a, b, total) {
-      if (a == 0) return b > 0 ? [b] : [];
-      return $R(1, total).inject([], function(memo, i) {
-        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
-        return memo;
-      });
-    },
-
-    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
-    nth: function(nodes, formula, root, reverse, ofType) {
-      if (nodes.length == 0) return [];
-      if (formula == 'even') formula = '2n+0';
-      if (formula == 'odd')  formula = '2n+1';
-      var h = Selector.handlers, results = [], indexed = [], m;
-      h.mark(nodes);
-      for (var i = 0, node; node = nodes[i]; i++) {
-        if (!node.parentNode._counted) {
-          h.index(node.parentNode, reverse, ofType);
-          indexed.push(node.parentNode);
-        }
-      }
-      if (formula.match(/^\d+$/)) { // just a number
-        formula = Number(formula);
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.nodeIndex == formula) results.push(node);
-      } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-        if (m[1] == "-") m[1] = -1;
-        var a = m[1] ? Number(m[1]) : 1;
-        var b = m[2] ? Number(m[2]) : 0;
-        var indices = Selector.pseudos.getIndices(a, b, nodes.length);
-        for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
-          for (var j = 0; j < l; j++)
-            if (node.nodeIndex == indices[j]) results.push(node);
-        }
-      }
-      h.unmark(nodes);
-      h.unmark(indexed);
-      return results;
-    },
-
-    'empty': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        // IE treats comments as element nodes
-        if (node.tagName == '!' || (node.firstChild && !node.innerHTML.match(/^\s*$/))) continue;
-        results.push(node);
-      }
-      return results;
-    },
-
-    'not': function(nodes, selector, root) {
-      var h = Selector.handlers, selectorType, m;
-      var exclusions = new Selector(selector).findElements(root);
-      h.mark(exclusions);
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node._counted) results.push(node);
-      h.unmark(exclusions);
-      return results;
-    },
-
-    'enabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node.disabled) results.push(node);
-      return results;
-    },
-
-    'disabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.disabled) results.push(node);
-      return results;
-    },
-
-    'checked': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.checked) results.push(node);
-      return results;
-    }
-  },
-
-  operators: {
-    '=':  function(nv, v) { return nv == v; },
-    '!=': function(nv, v) { return nv != v; },
-    '^=': function(nv, v) { return nv.startsWith(v); },
-    '$=': function(nv, v) { return nv.endsWith(v); },
-    '*=': function(nv, v) { return nv.include(v); },
-    '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
-    '|=': function(nv, v) { return ('-' + nv.toUpperCase() + '-').include('-' + v.toUpperCase() + '-'); }
-  },
-
-  matchElements: function(elements, expression) {
-    var matches = new Selector(expression).findElements(), h = Selector.handlers;
-    h.mark(matches);
-    for (var i = 0, results = [], element; element = elements[i]; i++)
-      if (element._counted) results.push(element);
-    h.unmark(matches);
-    return results;
-  },
-
-  findElement: function(elements, expression, index) {
-    if (Object.isNumber(expression)) {
-      index = expression; expression = false;
-    }
-    return Selector.matchElements(elements, expression || '*')[index || 0];
-  },
-
-  findChildElements: function(element, expressions) {
-    var exprs = expressions.join(','), expressions = [];
-    exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
-      expressions.push(m[1].strip());
-    });
-    var results = [], h = Selector.handlers;
-    for (var i = 0, l = expressions.length, selector; i < l; i++) {
-      selector = new Selector(expressions[i].strip());
-      h.concat(results, selector.findElements(element));
-    }
-    return (l > 1) ? h.unique(results) : results;
-  }
-});
-
-function $$() {
-  return Selector.findChildElements(document, $A(arguments));
-}
-var Form = {
-  reset: function(form) {
-    $(form).reset();
-    return form;
-  },
-
-  serializeElements: function(elements, options) {
-    if (typeof options != 'object') options = { hash: !!options };
-    else if (options.hash === undefined) options.hash = true;
-    var key, value, submitted = false, submit = options.submit;
-
-    var data = elements.inject({ }, function(result, element) {
-      if (!element.disabled && element.name) {
-        key = element.name; value = $(element).getValue();
-        if (value != null && (element.type != 'submit' || (!submitted &&
-            submit !== false && (!submit || key == submit) && (submitted = true)))) {
-          if (key in result) {
-            // a key is already present; construct an array of values
-            if (!Object.isArray(result[key])) result[key] = [result[key]];
-            result[key].push(value);
-          }
-          else result[key] = value;
-        }
-      }
-      return result;
-    });
-
-    return options.hash ? data : Object.toQueryString(data);
-  }
-};
-
-Form.Methods = {
-  serialize: function(form, options) {
-    return Form.serializeElements(Form.getElements(form), options);
-  },
-
-  getElements: function(form) {
-    return $A($(form).getElementsByTagName('*')).inject([],
-      function(elements, child) {
-        if (Form.Element.Serializers[child.tagName.toLowerCase()])
-          elements.push(Element.extend(child));
-        return elements;
-      }
-    );
-  },
-
-  getInputs: function(form, typeName, name) {
-    form = $(form);
-    var inputs = form.getElementsByTagName('input');
-
-    if (!typeName && !name) return $A(inputs).map(Element.extend);
-
-    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
-      var input = inputs[i];
-      if ((typeName && input.type != typeName) || (name && input.name != name))
-        continue;
-      matchingInputs.push(Element.extend(input));
-    }
-
-    return matchingInputs;
-  },
-
-  disable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('disable');
-    return form;
-  },
-
-  enable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('enable');
-    return form;
-  },
-
-  findFirstElement: function(form) {
-    var elements = $(form).getElements().findAll(function(element) {
-      return 'hidden' != element.type && !element.disabled;
-    });
-    var firstByIndex = elements.findAll(function(element) {
-      return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
-    }).sortBy(function(element) { return element.tabIndex }).first();
-
-    return firstByIndex ? firstByIndex : elements.find(function(element) {
-      return ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
-    });
-  },
-
-  focusFirstElement: function(form) {
-    form = $(form);
-    form.findFirstElement().activate();
-    return form;
-  },
-
-  request: function(form, options) {
-    form = $(form), options = Object.clone(options || { });
-
-    var params = options.parameters, action = form.readAttribute('action') || '';
-    if (action.blank()) action = window.location.href;
-    options.parameters = form.serialize(true);
-
-    if (params) {
-      if (Object.isString(params)) params = params.toQueryParams();
-      Object.extend(options.parameters, params);
-    }
-
-    if (form.hasAttribute('method') && !options.method)
-      options.method = form.method;
-
-    return new Ajax.Request(action, options);
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element = {
-  focus: function(element) {
-    $(element).focus();
-    return element;
-  },
-
-  select: function(element) {
-    $(element).select();
-    return element;
-  }
-};
-
-Form.Element.Methods = {
-  serialize: function(element) {
-    element = $(element);
-    if (!element.disabled && element.name) {
-      var value = element.getValue();
-      if (value != undefined) {
-        var pair = { };
-        pair[element.name] = value;
-        return Object.toQueryString(pair);
-      }
-    }
-    return '';
-  },
-
-  getValue: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    return Form.Element.Serializers[method](element);
-  },
-
-  setValue: function(element, value) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    Form.Element.Serializers[method](element, value);
-    return element;
-  },
-
-  clear: function(element) {
-    $(element).value = '';
-    return element;
-  },
-
-  present: function(element) {
-    return $(element).value != '';
-  },
-
-  activate: function(element) {
-    element = $(element);
-    try {
-      element.focus();
-      if (element.select && (element.tagName.toLowerCase() != 'input' ||
-          !['button', 'reset', 'submit'].include(element.type)))
-        element.select();
-    } catch (e) { }
-    return element;
-  },
-
-  disable: function(element) {
-    element = $(element);
-    element.blur();
-    element.disabled = true;
-    return element;
-  },
-
-  enable: function(element) {
-    element = $(element);
-    element.disabled = false;
-    return element;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-var Field = Form.Element;
-var $F = Form.Element.Methods.getValue;
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element.Serializers = {
-  input: function(element, value) {
-    switch (element.type.toLowerCase()) {
-      case 'checkbox':
-      case 'radio':
-        return Form.Element.Serializers.inputSelector(element, value);
-      default:
-        return Form.Element.Serializers.textarea(element, value);
-    }
-  },
-
-  inputSelector: function(element, value) {
-    if (value === undefined) return element.checked ? element.value : null;
-    else element.checked = !!value;
-  },
-
-  textarea: function(element, value) {
-    if (value === undefined) return element.value;
-    else element.value = value;
-  },
-
-  select: function(element, index) {
-    if (index === undefined)
-      return this[element.type == 'select-one' ?
-        'selectOne' : 'selectMany'](element);
-    else {
-      var opt, value, single = !Object.isArray(index);
-      for (var i = 0, length = element.length; i < length; i++) {
-        opt = element.options[i];
-        value = this.optionValue(opt);
-        if (single) {
-          if (value == index) {
-            opt.selected = true;
-            return;
-          }
-        }
-        else opt.selected = index.include(value);
-      }
-    }
-  },
-
-  selectOne: function(element) {
-    var index = element.selectedIndex;
-    return index >= 0 ? this.optionValue(element.options[index]) : null;
-  },
-
-  selectMany: function(element) {
-    var values, length = element.length;
-    if (!length) return null;
-
-    for (var i = 0, values = []; i < length; i++) {
-      var opt = element.options[i];
-      if (opt.selected) values.push(this.optionValue(opt));
-    }
-    return values;
-  },
-
-  optionValue: function(opt) {
-    // extend element because hasAttribute may not be native
-    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
-  initialize: function($super, element, frequency, callback) {
-    $super(callback, frequency);
-    this.element   = $(element);
-    this.lastValue = this.getValue();
-  },
-
-  execute: function() {
-    var value = this.getValue();
-    if (Object.isString(this.lastValue) && Object.isString(value) ?
-        this.lastValue != value : String(this.lastValue) != String(value)) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  }
-});
-
-Form.Element.Observer = Class.create(Abstract.TimedObserver, {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.Observer = Class.create(Abstract.TimedObserver, {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.EventObserver = Class.create({
-  initialize: function(element, callback) {
-    this.element  = $(element);
-    this.callback = callback;
-
-    this.lastValue = this.getValue();
-    if (this.element.tagName.toLowerCase() == 'form')
-      this.registerFormCallbacks();
-    else
-      this.registerCallback(this.element);
-  },
-
-  onElementEvent: function() {
-    var value = this.getValue();
-    if (this.lastValue != value) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  },
-
-  registerFormCallbacks: function() {
-    Form.getElements(this.element).each(this.registerCallback, this);
-  },
-
-  registerCallback: function(element) {
-    if (element.type) {
-      switch (element.type.toLowerCase()) {
-        case 'checkbox':
-        case 'radio':
-          Event.observe(element, 'click', this.onElementEvent.bind(this));
-          break;
-        default:
-          Event.observe(element, 'change', this.onElementEvent.bind(this));
-          break;
-      }
-    }
-  }
-});
-
-Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.EventObserver = Class.create(Abstract.EventObserver, {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-if (!window.Event) var Event = { };
-
-Object.extend(Event, {
-  KEY_BACKSPACE: 8,
-  KEY_TAB:       9,
-  KEY_RETURN:   13,
-  KEY_ESC:      27,
-  KEY_LEFT:     37,
-  KEY_UP:       38,
-  KEY_RIGHT:    39,
-  KEY_DOWN:     40,
-  KEY_DELETE:   46,
-  KEY_HOME:     36,
-  KEY_END:      35,
-  KEY_PAGEUP:   33,
-  KEY_PAGEDOWN: 34,
-  KEY_INSERT:   45,
-
-  cache: { },
-
-  relatedTarget: function(event) {
-    var element;
-    switch(event.type) {
-      case 'mouseover': element = event.fromElement; break;
-      case 'mouseout':  element = event.toElement;   break;
-      default: return null;
-    }
-    return Element.extend(element);
-  }
-});
-
-Event.Methods = (function() {
-  var isButton;
-
-  if (Prototype.Browser.IE) {
-    var buttonMap = { 0: 1, 1: 4, 2: 2 };
-    isButton = function(event, code) {
-      return event.button == buttonMap[code];
-    };
-
-  } else if (Prototype.Browser.WebKit) {
-    isButton = function(event, code) {
-      switch (code) {
-        case 0: return event.which == 1 && !event.metaKey;
-        case 1: return event.which == 1 && event.metaKey;
-        default: return false;
-      }
-    };
-
-  } else {
-    isButton = function(event, code) {
-      return event.which ? (event.which === code + 1) : (event.button === code);
-    };
-  }
-
-  return {
-    isLeftClick:   function(event) { return isButton(event, 0) },
-    isMiddleClick: function(event) { return isButton(event, 1) },
-    isRightClick:  function(event) { return isButton(event, 2) },
-
-    element: function(event) {
-      var node = Event.extend(event).target;
-      return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node);
-    },
-
-    findElement: function(event, expression) {
-      var element = Event.element(event);
-      return element.match(expression) ? element : element.up(expression);
-    },
-
-    pointer: function(event) {
-      return {
-        x: event.pageX || (event.clientX +
-          (document.documentElement.scrollLeft || document.body.scrollLeft)),
-        y: event.pageY || (event.clientY +
-          (document.documentElement.scrollTop || document.body.scrollTop))
-      };
-    },
-
-    pointerX: function(event) { return Event.pointer(event).x },
-    pointerY: function(event) { return Event.pointer(event).y },
-
-    stop: function(event) {
-      Event.extend(event);
-      event.preventDefault();
-      event.stopPropagation();
-      event.stopped = true;
-    }
-  };
-})();
-
-Event.extend = (function() {
-  var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
-    m[name] = Event.Methods[name].methodize();
-    return m;
-  });
-
-  if (Prototype.Browser.IE) {
-    Object.extend(methods, {
-      stopPropagation: function() { this.cancelBubble = true },
-      preventDefault:  function() { this.returnValue = false },
-      inspect: function() { return "[object Event]" }
-    });
-
-    return function(event) {
-      if (!event) return false;
-      if (event._extendedByPrototype) return event;
-
-      event._extendedByPrototype = Prototype.emptyFunction;
-      var pointer = Event.pointer(event);
-      Object.extend(event, {
-        target: event.srcElement,
-        relatedTarget: Event.relatedTarget(event),
-        pageX:  pointer.x,
-        pageY:  pointer.y
-      });
-      return Object.extend(event, methods);
-    };
-
-  } else {
-    Event.prototype = Event.prototype || document.createEvent("HTMLEvents").__proto__;
-    Object.extend(Event.prototype, methods);
-    return Prototype.K;
-  }
-})();
-
-Object.extend(Event, (function() {
-  var cache = Event.cache;
-
-  function getEventID(element) {
-    if (element._eventID) return element._eventID;
-    arguments.callee.id = arguments.callee.id || 1;
-    return element._eventID = ++arguments.callee.id;
-  }
-
-  function getDOMEventName(eventName) {
-    if (eventName && eventName.include(':')) return "dataavailable";
-    return eventName;
-  }
-
-  function getCacheForID(id) {
-    return cache[id] = cache[id] || { };
-  }
-
-  function getWrappersForEventName(id, eventName) {
-    var c = getCacheForID(id);
-    return c[eventName] = c[eventName] || [];
-  }
-
-  function createWrapper(element, eventName, handler) {
-    var id = getEventID(element);
-    var c = getWrappersForEventName(id, eventName);
-    if (c.pluck("handler").include(handler)) return false;
-
-    var wrapper = function(event) {
-      if (!Event || !Event.extend ||
-        (event.eventName && event.eventName != eventName))
-          return false;
-
-      Event.extend(event);
-      handler.call(element, event)
-    };
-
-    wrapper.handler = handler;
-    c.push(wrapper);
-    return wrapper;
-  }
-
-  function findWrapper(id, eventName, handler) {
-    var c = getWrappersForEventName(id, eventName);
-    return c.find(function(wrapper) { return wrapper.handler == handler });
-  }
-
-  function destroyWrapper(id, eventName, handler) {
-    var c = getCacheForID(id);
-    if (!c[eventName]) return false;
-    c[eventName] = c[eventName].without(findWrapper(id, eventName, handler));
-  }
-
-  function destroyCache() {
-    for (var id in cache)
-      for (var eventName in cache[id])
-        cache[id][eventName] = null;
-  }
-
-  if (window.attachEvent) {
-    window.attachEvent("onunload", destroyCache);
-  }
-
-  return {
-    observe: function(element, eventName, handler) {
-      element = $(element);
-      var name = getDOMEventName(eventName);
-
-      var wrapper = createWrapper(element, eventName, handler);
-      if (!wrapper) return element;
-
-      if (element.addEventListener) {
-        element.addEventListener(name, wrapper, false);
-      } else {
-        element.attachEvent("on" + name, wrapper);
-      }
-
-      return element;
-    },
-
-    stopObserving: function(element, eventName, handler) {
-      element = $(element);
-      var id = getEventID(element), name = getDOMEventName(eventName);
-
-      if (!handler && eventName) {
-        getWrappersForEventName(id, eventName).each(function(wrapper) {
-          element.stopObserving(eventName, wrapper.handler);
-        });
-        return element;
-
-      } else if (!eventName) {
-        Object.keys(getCacheForID(id)).each(function(eventName) {
-          element.stopObserving(eventName);
-        });
-        return element;
-      }
-
-      var wrapper = findWrapper(id, eventName, handler);
-      if (!wrapper) return element;
-
-      if (element.removeEventListener) {
-        element.removeEventListener(name, wrapper, false);
-      } else {
-        element.detachEvent("on" + name, wrapper);
-      }
-
-      destroyWrapper(id, eventName, handler);
-
-      return element;
-    },
-
-    fire: function(element, eventName, memo) {
-      element = $(element);
-      if (element == document && document.createEvent && !element.dispatchEvent)
-        element = document.documentElement;
-
-      if (document.createEvent) {
-        var event = document.createEvent("HTMLEvents");
-        event.initEvent("dataavailable", true, true);
-      } else {
-        var event = document.createEventObject();
-        event.eventType = "ondataavailable";
-      }
-
-      event.eventName = eventName;
-      event.memo = memo || { };
-
-      if (document.createEvent) {
-        element.dispatchEvent(event);
-      } else {
-        element.fireEvent(event.eventType, event);
-      }
-
-      return event;
-    }
-  };
-})());
-
-Object.extend(Event, Event.Methods);
-
-Element.addMethods({
-  fire:          Event.fire,
-  observe:       Event.observe,
-  stopObserving: Event.stopObserving
-});
-
-Object.extend(document, {
-  fire:          Element.Methods.fire.methodize(),
-  observe:       Element.Methods.observe.methodize(),
-  stopObserving: Element.Methods.stopObserving.methodize()
-});
-
-(function() {
-  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
-     Matthias Miller, Dean Edwards and John Resig. */
-
-  var timer, fired = false;
-
-  function fireContentLoadedEvent() {
-    if (fired) return;
-    if (timer) window.clearInterval(timer);
-    document.fire("dom:loaded");
-    fired = true;
-  }
-
-  if (document.addEventListener) {
-    if (Prototype.Browser.WebKit) {
-      timer = window.setInterval(function() {
-        if (/loaded|complete/.test(document.readyState))
-          fireContentLoadedEvent();
-      }, 0);
-
-      Event.observe(window, "load", fireContentLoadedEvent);
-
-    } else {
-      document.addEventListener("DOMContentLoaded",
-        fireContentLoadedEvent, false);
-    }
-
-  } else {
-    document.write("<script id=__onDOMContentLoaded defer src=//:><\/script>");
-    $("__onDOMContentLoaded").onreadystatechange = function() {
-      if (this.readyState == "complete") {
-        this.onreadystatechange = null;
-        fireContentLoadedEvent();
-      }
-    };
-  }
-})();
-/*------------------------------- DEPRECATED -------------------------------*/
-
-Hash.toQueryString = Object.toQueryString;
-
-var Toggle = { display: Element.toggle };
-
-Element.Methods.childOf = Element.Methods.descendantOf;
-
-var Insertion = {
-  Before: function(element, content) {
-    return Element.insert(element, {before:content});
-  },
-
-  Top: function(element, content) {
-    return Element.insert(element, {top:content});
-  },
-
-  Bottom: function(element, content) {
-    return Element.insert(element, {bottom:content});
-  },
-
-  After: function(element, content) {
-    return Element.insert(element, {after:content});
-  }
-};
-
-var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
-
-// This should be moved to script.aculo.us; notice the deprecated methods
-// further below, that map to the newer Element methods.
-var Position = {
-  // set to true if needed, warning: firefox performance problems
-  // NOT neeeded for page scrolling, only if draggable contained in
-  // scrollable elements
-  includeScrollOffsets: false,
-
-  // must be called before calling withinIncludingScrolloffset, every time the
-  // page is scrolled
-  prepare: function() {
-    this.deltaX =  window.pageXOffset
-                || document.documentElement.scrollLeft
-                || document.body.scrollLeft
-                || 0;
-    this.deltaY =  window.pageYOffset
-                || document.documentElement.scrollTop
-                || document.body.scrollTop
-                || 0;
-  },
-
-  // caches x/y coordinate pair to use with overlap
-  within: function(element, x, y) {
-    if (this.includeScrollOffsets)
-      return this.withinIncludingScrolloffsets(element, x, y);
-    this.xcomp = x;
-    this.ycomp = y;
-    this.offset = Element.cumulativeOffset(element);
-
-    return (y >= this.offset[1] &&
-            y <  this.offset[1] + element.offsetHeight &&
-            x >= this.offset[0] &&
-            x <  this.offset[0] + element.offsetWidth);
-  },
-
-  withinIncludingScrolloffsets: function(element, x, y) {
-    var offsetcache = Element.cumulativeScrollOffset(element);
-
-    this.xcomp = x + offsetcache[0] - this.deltaX;
-    this.ycomp = y + offsetcache[1] - this.deltaY;
-    this.offset = Element.cumulativeOffset(element);
-
-    return (this.ycomp >= this.offset[1] &&
-            this.ycomp <  this.offset[1] + element.offsetHeight &&
-            this.xcomp >= this.offset[0] &&
-            this.xcomp <  this.offset[0] + element.offsetWidth);
-  },
-
-  // within must be called directly before
-  overlap: function(mode, element) {
-    if (!mode) return 0;
-    if (mode == 'vertical')
-      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
-        element.offsetHeight;
-    if (mode == 'horizontal')
-      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
-        element.offsetWidth;
-  },
-
-  // Deprecation layer -- use newer Element methods now (1.5.2).
-
-  cumulativeOffset: Element.Methods.cumulativeOffset,
-
-  positionedOffset: Element.Methods.positionedOffset,
-
-  absolutize: function(element) {
-    Position.prepare();
-    return Element.absolutize(element);
-  },
-
-  relativize: function(element) {
-    Position.prepare();
-    return Element.relativize(element);
-  },
-
-  realOffset: Element.Methods.cumulativeScrollOffset,
-
-  offsetParent: Element.Methods.getOffsetParent,
-
-  page: Element.Methods.viewportOffset,
-
-  clone: function(source, target, options) {
-    options = options || { };
-    return Element.clonePosition(target, source, options);
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
-  function iter(name) {
-    return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
-  }
-
-  instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
-  function(element, className) {
-    className = className.toString().strip();
-    var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
-    return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
-  } : function(element, className) {
-    className = className.toString().strip();
-    var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
-    if (!classNames && !className) return elements;
-
-    var nodes = $(element).getElementsByTagName('*');
-    className = ' ' + className + ' ';
-
-    for (var i = 0, child, cn; child = nodes[i]; i++) {
-      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
-          (classNames && classNames.all(function(name) {
-            return !name.toString().blank() && cn.include(' ' + name + ' ');
-          }))))
-        elements.push(Element.extend(child));
-    }
-    return elements;
-  };
-
-  return function(className, parentElement) {
-    return $(parentElement || document.body).getElementsByClassName(className);
-  };
-}(Element.Methods);
-
-/*--------------------------------------------------------------------------*/
-
-Element.ClassNames = Class.create();
-Element.ClassNames.prototype = {
-  initialize: function(element) {
-    this.element = $(element);
-  },
-
-  _each: function(iterator) {
-    this.element.className.split(/\s+/).select(function(name) {
-      return name.length > 0;
-    })._each(iterator);
-  },
-
-  set: function(className) {
-    this.element.className = className;
-  },
-
-  add: function(classNameToAdd) {
-    if (this.include(classNameToAdd)) return;
-    this.set($A(this).concat(classNameToAdd).join(' '));
-  },
-
-  remove: function(classNameToRemove) {
-    if (!this.include(classNameToRemove)) return;
-    this.set($A(this).without(classNameToRemove).join(' '));
-  },
-
-  toString: function() {
-    return $A(this).join(' ');
-  }
-};
-
-Object.extend(Element.ClassNames.prototype, Enumerable);
-
-/*--------------------------------------------------------------------------*/
-
-Element.addMethods();
diff -uNr a/mp-wp/wp-includes/js/quicktags.js b/mp-wp/wp-includes/js/quicktags.js
--- a/mp-wp/wp-includes/js/quicktags.js 204611ec504ce5c141b6a13f38c0b646e0688b3e451db58d4840052b638bce3698cf4f2fa636c0f9c8fb12d80fad3b1f71c66b90b44cadc011025077b54c7280
+++ b/mp-wp/wp-includes/js/quicktags.js false
@@ -1,582 +0,0 @@
-// new edit toolbar used with permission
-// by Alex King
-// http://www.alexking.org/
-
-var edButtons = new Array();
-var edLinks = new Array();
-var edOpenTags = new Array();
-
-function edButton(id, display, tagStart, tagEnd, access, open) {
-	this.id = id;				// used to name the toolbar button
-	this.display = display;		// label on button
-	this.tagStart = tagStart; 	// open tag
-	this.tagEnd = tagEnd;		// close tag
-	this.access = access;		// access key
-	this.open = open;			// set to -1 if tag does not need to be closed
-}
-
-function zeroise(number, threshold) {
-	// FIXME: or we could use an implementation of printf in js here
-	var str = number.toString();
-	if (number < 0) { str = str.substr(1, str.length) }
-	while (str.length < threshold) { str = "0" + str }
-	if (number < 0) { str = '-' + str }
-	return str;
-}
-
-var now = new Date();
-var datetime = now.getUTCFullYear() + '-' +
-zeroise(now.getUTCMonth() + 1, 2) + '-' +
-zeroise(now.getUTCDate(), 2) + 'T' +
-zeroise(now.getUTCHours(), 2) + ':' +
-zeroise(now.getUTCMinutes(), 2) + ':' +
-zeroise(now.getUTCSeconds() ,2) +
-'+00:00';
-
-edButtons[edButtons.length] =
-new edButton('ed_strong'
-,'b'
-,'<strong>'
-,'</strong>'
-,'b'
-);
-
-edButtons[edButtons.length] =
-new edButton('ed_em'
-,'i'
-,'<em>'
-,'</em>'
-,'i'
-);
-
-edButtons[edButtons.length] =
-new edButton('ed_link'
-,'link'
-,''
-,'</a>'
-,'a'
-); // special case
-
-edButtons[edButtons.length] =
-new edButton('ed_block'
-,'b-quote'
-,'\n\n<blockquote>'
-,'</blockquote>\n\n'
-,'q'
-);
-
-
-edButtons[edButtons.length] =
-new edButton('ed_del'
-,'del'
-,'<del datetime="' + datetime + '">'
-,'</del>'
-,'d'
-);
-
-edButtons[edButtons.length] =
-new edButton('ed_ins'
-,'ins'
-,'<ins datetime="' + datetime + '">'
-,'</ins>'
-,'s'
-);
-
-edButtons[edButtons.length] =
-new edButton('ed_img'
-,'img'
-,''
-,''
-,'m'
-,-1
-); // special case
-
-edButtons[edButtons.length] =
-new edButton('ed_ul'
-,'ul'
-,'<ul>\n'
-,'</ul>\n\n'
-,'u'
-);
-
-edButtons[edButtons.length] =
-new edButton('ed_ol'
-,'ol'
-,'<ol>\n'
-,'</ol>\n\n'
-,'o'
-);
-
-edButtons[edButtons.length] =
-new edButton('ed_li'
-,'li'
-,'\t<li>'
-,'</li>\n'
-,'l'
-);
-
-edButtons[edButtons.length] =
-new edButton('ed_code'
-,'code'
-,'<code>'
-,'</code>'
-,'c'
-);
-
-edButtons[edButtons.length] =
-new edButton('ed_more'
-,'more'
-,'<!--more-->'
-,''
-,'t'
-,-1
-);
-/*
-edButtons[edButtons.length] =
-new edButton('ed_next'
-,'page'
-,'<!--nextpage-->'
-,''
-,'p'
-,-1
-);
-*/
-function edLink() {
-	this.display = '';
-	this.URL = '';
-	this.newWin = 0;
-}
-
-edLinks[edLinks.length] = new edLink('WordPress'
-                                    ,'http://wordpress.org/'
-                                    );
-
-edLinks[edLinks.length] = new edLink('alexking.org'
-                                    ,'http://www.alexking.org/'
-                                    );
-
-function edShowButton(button, i) {
-	if (button.id == 'ed_img') {
-		document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertImage(edCanvas);" value="' + button.display + '" />');
-	}
-	else if (button.id == 'ed_link') {
-		document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertLink(edCanvas, ' + i + ');" value="' + button.display + '" />');
-	}
-	else {
-		document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertTag(edCanvas, ' + i + ');" value="' + button.display + '"  />');
-	}
-}
-
-function edShowLinks() {
-	var tempStr = '<select onchange="edQuickLink(this.options[this.selectedIndex].value, this);"><option value="-1" selected>' + quicktagsL10n.quickLinks + '</option>';
-	for (i = 0; i < edLinks.length; i++) {
-		tempStr += '<option value="' + i + '">' + edLinks[i].display + '</option>';
-	}
-	tempStr += '</select>';
-	document.write(tempStr);
-}
-
-function edAddTag(button) {
-	if (edButtons[button].tagEnd != '') {
-		edOpenTags[edOpenTags.length] = button;
-		document.getElementById(edButtons[button].id).value = '/' + document.getElementById(edButtons[button].id).value;
-	}
-}
-
-function edRemoveTag(button) {
-	for (i = 0; i < edOpenTags.length; i++) {
-		if (edOpenTags[i] == button) {
-			edOpenTags.splice(i, 1);
-			document.getElementById(edButtons[button].id).value = 		document.getElementById(edButtons[button].id).value.replace('/', '');
-		}
-	}
-}
-
-function edCheckOpenTags(button) {
-	var tag = 0;
-	for (i = 0; i < edOpenTags.length; i++) {
-		if (edOpenTags[i] == button) {
-			tag++;
-		}
-	}
-	if (tag > 0) {
-		return true; // tag found
-	}
-	else {
-		return false; // tag not found
-	}
-}
-
-function edCloseAllTags() {
-	var count = edOpenTags.length;
-	for (o = 0; o < count; o++) {
-		edInsertTag(edCanvas, edOpenTags[edOpenTags.length - 1]);
-	}
-}
-
-function edQuickLink(i, thisSelect) {
-	if (i > -1) {
-		var newWin = '';
-		if (edLinks[i].newWin == 1) {
-			newWin = ' target="_blank"';
-		}
-		var tempStr = '<a href="' + edLinks[i].URL + '"' + newWin + '>'
-		            + edLinks[i].display
-		            + '</a>';
-		thisSelect.selectedIndex = 0;
-		edInsertContent(edCanvas, tempStr);
-	}
-	else {
-		thisSelect.selectedIndex = 0;
-	}
-}
-
-function edSpell(myField) {
-	var word = '';
-	if (document.selection) {
-		myField.focus();
-	    var sel = document.selection.createRange();
-		if (sel.text.length > 0) {
-			word = sel.text;
-		}
-	}
-	else if (myField.selectionStart || myField.selectionStart == '0') {
-		var startPos = myField.selectionStart;
-		var endPos = myField.selectionEnd;
-		if (startPos != endPos) {
-			word = myField.value.substring(startPos, endPos);
-		}
-	}
-	if (word == '') {
-		word = prompt(quicktagsL10n.wordLookup, '');
-	}
-	if (word !== null && /^\w[\w ]*$/.test(word)) {
-		window.open('http://www.answers.com/' + escape(word));
-	}
-}
-
-function edToolbar() {
-	document.write('<div id="ed_toolbar">');
-	for (i = 0; i < edButtons.length; i++) {
-		edShowButton(edButtons[i], i);
-	}
-	document.write('<input type="button" id="ed_spell" class="ed_button" onclick="edSpell(edCanvas);" title="' + quicktagsL10n.dictionaryLookup + '" value="' + quicktagsL10n.lookup + '" />');
-	document.write('<input type="button" id="ed_close" class="ed_button" onclick="edCloseAllTags();" title="' + quicktagsL10n.closeAllOpenTags + '" value="' + quicktagsL10n.closeTags + '" />');
-//	edShowLinks(); // disabled by default
-	document.write('</div>');
-}
-
-// insertion code
-
-function edInsertTag(myField, i) {
-	//IE support
-	if (document.selection) {
-		myField.focus();
-	    sel = document.selection.createRange();
-		if (sel.text.length > 0) {
-			sel.text = edButtons[i].tagStart + sel.text + edButtons[i].tagEnd;
-		}
-		else {
-			if (!edCheckOpenTags(i) || edButtons[i].tagEnd == '') {
-				sel.text = edButtons[i].tagStart;
-				edAddTag(i);
-			}
-			else {
-				sel.text = edButtons[i].tagEnd;
-				edRemoveTag(i);
-			}
-		}
-		myField.focus();
-	}
-	//MOZILLA/NETSCAPE support
-	else if (myField.selectionStart || myField.selectionStart == '0') {
-		var startPos = myField.selectionStart;
-		var endPos = myField.selectionEnd;
-		var cursorPos = endPos;
-		var scrollTop = myField.scrollTop;
-
-		if (startPos != endPos) {
-			myField.value = myField.value.substring(0, startPos)
-			              + edButtons[i].tagStart
-			              + myField.value.substring(startPos, endPos)
-			              + edButtons[i].tagEnd
-			              + myField.value.substring(endPos, myField.value.length);
-			cursorPos += edButtons[i].tagStart.length + edButtons[i].tagEnd.length;
-		}
-		else {
-			if (!edCheckOpenTags(i) || edButtons[i].tagEnd == '') {
-				myField.value = myField.value.substring(0, startPos)
-				              + edButtons[i].tagStart
-				              + myField.value.substring(endPos, myField.value.length);
-				edAddTag(i);
-				cursorPos = startPos + edButtons[i].tagStart.length;
-			}
-			else {
-				myField.value = myField.value.substring(0, startPos)
-				              + edButtons[i].tagEnd
-				              + myField.value.substring(endPos, myField.value.length);
-				edRemoveTag(i);
-				cursorPos = startPos + edButtons[i].tagEnd.length;
-			}
-		}
-		myField.focus();
-		myField.selectionStart = cursorPos;
-		myField.selectionEnd = cursorPos;
-		myField.scrollTop = scrollTop;
-	}
-	else {
-		if (!edCheckOpenTags(i) || edButtons[i].tagEnd == '') {
-			myField.value += edButtons[i].tagStart;
-			edAddTag(i);
-		}
-		else {
-			myField.value += edButtons[i].tagEnd;
-			edRemoveTag(i);
-		}
-		myField.focus();
-	}
-}
-
-function edInsertContent(myField, myValue) {
-	//IE support
-	if (document.selection) {
-		myField.focus();
-		sel = document.selection.createRange();
-		sel.text = myValue;
-		myField.focus();
-	}
-	//MOZILLA/NETSCAPE support
-	else if (myField.selectionStart || myField.selectionStart == '0') {
-		var startPos = myField.selectionStart;
-		var endPos = myField.selectionEnd;
-		myField.value = myField.value.substring(0, startPos)
-		              + myValue
-                      + myField.value.substring(endPos, myField.value.length);
-		myField.focus();
-		myField.selectionStart = startPos + myValue.length;
-		myField.selectionEnd = startPos + myValue.length;
-	} else {
-		myField.value += myValue;
-		myField.focus();
-	}
-}
-
-function edInsertLink(myField, i, defaultValue) {
-	if (!defaultValue) {
-		defaultValue = 'http://';
-	}
-	if (!edCheckOpenTags(i)) {
-		var URL = prompt(quicktagsL10n.enterURL, defaultValue);
-		if (URL) {
-			edButtons[i].tagStart = '<a href="' + URL + '">';
-			edInsertTag(myField, i);
-		}
-	}
-	else {
-		edInsertTag(myField, i);
-	}
-}
-
-function edInsertImage(myField) {
-	var myValue = prompt(quicktagsL10n.enterImageURL, 'http://');
-	if (myValue) {
-		myValue = '<img src="'
-				+ myValue
-				+ '" alt="' + prompt(quicktagsL10n.enterImageDescription, '')
-				+ '" />';
-		edInsertContent(myField, myValue);
-	}
-}
-
-
-// Allow multiple instances.
-// Name = unique value, id = textarea id, container = container div.
-// Can disable some buttons by passing comma delimited string as 4th param.
-var QTags = function(name, id, container, disabled) {
-	var t = this, cont = document.getElementById(container);
-
-	t.Buttons = [];
-	t.Links = [];
-	t.OpenTags = [];
-	t.Canvas = document.getElementById(id);
-
-	if ( ! t.Canvas || ! cont )
-		return;
-
-	disabled = ( typeof disabled != 'undefined' ) ? ','+disabled+',' : '';
-
-	t.edShowButton = function(button, i) {
-		if ( disabled && (disabled.indexOf(','+button.display+',') != -1) )
-			return '';
-		else if ( button.id == name+'_img' )
-			return '<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertImage('+name+'.Canvas);" value="' + button.display + '" />';
-		else if (button.id == name+'_link')
-			return '<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="'+name+'.edInsertLink('+i+');" value="'+button.display+'" />';
-		else
-			return '<input type="button" id="' + button.id + '" accesskey="'+button.access+'" class="ed_button" onclick="'+name+'.edInsertTag('+i+');" value="'+button.display+'" />';
-	};
-
-	t.edAddTag = function(button) {
-		if ( t.Buttons[button].tagEnd != '' ) {
-			t.OpenTags[t.OpenTags.length] = button;
-			document.getElementById(t.Buttons[button].id).value = '/' + document.getElementById(t.Buttons[button].id).value;
-		}
-	};
-
-	t.edRemoveTag = function(button) {
-		for ( var i = 0; i < t.OpenTags.length; i++ ) {
-			if ( t.OpenTags[i] == button ) {
-				t.OpenTags.splice(i, 1);
-				document.getElementById(t.Buttons[button].id).value = document.getElementById(t.Buttons[button].id).value.replace('/', '');
-			}
-		}
-	};
-
-	t.edCheckOpenTags = function(button) {
-		var tag = 0;
-		for ( var i = 0; i < t.OpenTags.length; i++ ) {
-			if ( t.OpenTags[i] == button )
-				tag++;
-		}
-		if ( tag > 0 ) return true; // tag found
-		else return false; // tag not found
-	};
-
-	this.edCloseAllTags = function() {
-		var count = t.OpenTags.length;
-		for ( var o = 0; o < count; o++ )
-			t.edInsertTag(t.OpenTags[t.OpenTags.length - 1]);
-	};
-
-	this.edQuickLink = function(i, thisSelect) {
-		if ( i > -1 ) {
-			var newWin = '';
-			if ( Links[i].newWin == 1 ) {
-				newWin = ' target="_blank"';
-			}
-			var tempStr = '<a href="' + Links[i].URL + '"' + newWin + '>'
-			            + Links[i].display
-			            + '</a>';
-			thisSelect.selectedIndex = 0;
-			edInsertContent(t.Canvas, tempStr);
-		} else {
-			thisSelect.selectedIndex = 0;
-		}
-	};
-
-	// insertion code
-	t.edInsertTag = function(i) {
-		//IE support
-		if ( document.selection ) {
-			t.Canvas.focus();
-		    sel = document.selection.createRange();
-			if ( sel.text.length > 0 ) {
-				sel.text = t.Buttons[i].tagStart + sel.text + t.Buttons[i].tagEnd;
-			} else {
-				if ( ! t.edCheckOpenTags(i) || t.Buttons[i].tagEnd == '' ) {
-					sel.text = t.Buttons[i].tagStart;
-					t.edAddTag(i);
-				} else {
-					sel.text = t.Buttons[i].tagEnd;
-					t.edRemoveTag(i);
-				}
-			}
-			t.Canvas.focus();
-		} else if ( t.Canvas.selectionStart || t.Canvas.selectionStart == '0' ) { //MOZILLA/NETSCAPE support
-			var startPos = t.Canvas.selectionStart;
-			var endPos = t.Canvas.selectionEnd;
-			var cursorPos = endPos;
-			var scrollTop = t.Canvas.scrollTop;
-
-			if ( startPos != endPos ) {
-				t.Canvas.value = t.Canvas.value.substring(0, startPos)
-				              + t.Buttons[i].tagStart
-				              + t.Canvas.value.substring(startPos, endPos)
-				              + t.Buttons[i].tagEnd
-				              + t.Canvas.value.substring(endPos, t.Canvas.value.length);
-				cursorPos += t.Buttons[i].tagStart.length + t.Buttons[i].tagEnd.length;
-			} else {
-				if ( !t.edCheckOpenTags(i) || t.Buttons[i].tagEnd == '' ) {
-					t.Canvas.value = t.Canvas.value.substring(0, startPos)
-					              + t.Buttons[i].tagStart
-					              + t.Canvas.value.substring(endPos, t.Canvas.value.length);
-					t.edAddTag(i);
-					cursorPos = startPos + t.Buttons[i].tagStart.length;
-				} else {
-					t.Canvas.value = t.Canvas.value.substring(0, startPos)
-					              + t.Buttons[i].tagEnd
-					              + t.Canvas.value.substring(endPos, t.Canvas.value.length);
-					t.edRemoveTag(i);
-					cursorPos = startPos + t.Buttons[i].tagEnd.length;
-				}
-			}
-			t.Canvas.focus();
-			t.Canvas.selectionStart = cursorPos;
-			t.Canvas.selectionEnd = cursorPos;
-			t.Canvas.scrollTop = scrollTop;
-		} else {
-			if ( ! t.edCheckOpenTags(i) || t.Buttons[i].tagEnd == '' ) {
-				t.Canvas.value += Buttons[i].tagStart;
-				t.edAddTag(i);
-			} else {
-				t.Canvas.value += Buttons[i].tagEnd;
-				t.edRemoveTag(i);
-			}
-			t.Canvas.focus();
-		}
-	};
-
-	this.edInsertLink = function(i, defaultValue) {
-		if ( ! defaultValue )
-			defaultValue = 'http://';
-
-		if ( ! t.edCheckOpenTags(i) ) {
-			var URL = prompt(quicktagsL10n.enterURL, defaultValue);
-			if ( URL ) {
-				t.Buttons[i].tagStart = '<a href="' + URL + '">';
-				t.edInsertTag(i);
-			}
-		} else {
-			t.edInsertTag(i);
-		}
-	};
-
-	this.edInsertImage = function() {
-		var myValue = prompt(quicktagsL10n.enterImageURL, 'http://');
-		if ( myValue ) {
-			myValue = '<img src="'
-					+ myValue
-					+ '" alt="' + prompt(quicktagsL10n.enterImageDescription, '')
-					+ '" />';
-			edInsertContent(t.Canvas, myValue);
-		}
-	};
-
-	t.Buttons[t.Buttons.length] = new edButton(name+'_strong','b','<strong>','</strong>','b');
-	t.Buttons[t.Buttons.length] = new edButton(name+'_em','i','<em>','</em>','i');
-	t.Buttons[t.Buttons.length] = new edButton(name+'_link','link','','</a>','a'); // special case
-	t.Buttons[t.Buttons.length] = new edButton(name+'_block','b-quote','\n\n<blockquote>','</blockquote>\n\n','q');
-	t.Buttons[t.Buttons.length] = new edButton(name+'_del','del','<del datetime="' + datetime + '">','</del>','d');
-	t.Buttons[t.Buttons.length] = new edButton(name+'_ins','ins','<ins datetime="' + datetime + '">','</ins>','s');
-	t.Buttons[t.Buttons.length] = new edButton(name+'_img','img','','','m',-1); // special case
-	t.Buttons[t.Buttons.length] = new edButton(name+'_ul','ul','<ul>\n','</ul>\n\n','u');
-	t.Buttons[t.Buttons.length] = new edButton(name+'_ol','ol','<ol>\n','</ol>\n\n','o');
-	t.Buttons[t.Buttons.length] = new edButton(name+'_li','li','\t<li>','</li>\n','l');
-	t.Buttons[t.Buttons.length] = new edButton(name+'_code','code','<code>','</code>','c');
-	t.Buttons[t.Buttons.length] = new edButton(name+'_more','more','<!--more-->','','t',-1);
-//	t.Buttons[t.Buttons.length] = new edButton(name+'_next','page','<!--nextpage-->','','p',-1);
-
-	var tb = document.createElement('div');
-	tb.id = name+'_qtags';
-
-	var html = '<div id="'+name+'_toolbar">';
-	for (var i = 0; i < t.Buttons.length; i++)
-		html += t.edShowButton(t.Buttons[i], i);
-
-	html += '<input type="button" id="'+name+'_ed_spell" class="ed_button" onclick="edSpell('+name+'.Canvas);" title="' + quicktagsL10n.dictionaryLookup + '" value="' + quicktagsL10n.lookup + '" />';
-	html += '<input type="button" id="'+name+'_ed_close" class="ed_button" onclick="'+name+'.edCloseAllTags();" title="' + quicktagsL10n.closeAllOpenTags + '" value="' + quicktagsL10n.closeTags + '" /></div>';
-
-	tb.innerHTML = html;
-	cont.parentNode.insertBefore(tb, cont);
-
-};
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/MIT-LICENSE b/mp-wp/wp-includes/js/scriptaculous/MIT-LICENSE
--- a/mp-wp/wp-includes/js/scriptaculous/MIT-LICENSE e199870aff129791a90808f628179ede3f3616fbaac18d750021c792e242b21f2c908c2aa6344b4eaf0d79805f9c0ea316777b47f0b12edf587fef073f5710b8
+++ b/mp-wp/wp-includes/js/scriptaculous/MIT-LICENSE false
@@ -1,20 +0,0 @@
-Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/builder.js b/mp-wp/wp-includes/js/scriptaculous/builder.js
--- a/mp-wp/wp-includes/js/scriptaculous/builder.js 7fc93034cc58ed0ddc89db40188ee4e8bafac7494555a36b3bf3bd352ecf98bbc156e6bb24897af05fa5e481c6b4981257764dde2a4ab49a1e1566a3293e7d82
+++ b/mp-wp/wp-includes/js/scriptaculous/builder.js false
@@ -1,136 +0,0 @@
-// script.aculo.us builder.js v1.8.0, Tue Nov 06 15:01:40 +0300 2007
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Builder = {
-  NODEMAP: {
-    AREA: 'map',
-    CAPTION: 'table',
-    COL: 'table',
-    COLGROUP: 'table',
-    LEGEND: 'fieldset',
-    OPTGROUP: 'select',
-    OPTION: 'select',
-    PARAM: 'object',
-    TBODY: 'table',
-    TD: 'table',
-    TFOOT: 'table',
-    TH: 'table',
-    THEAD: 'table',
-    TR: 'table'
-  },
-  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
-  //       due to a Firefox bug
-  node: function(elementName) {
-    elementName = elementName.toUpperCase();
-    
-    // try innerHTML approach
-    var parentTag = this.NODEMAP[elementName] || 'div';
-    var parentElement = document.createElement(parentTag);
-    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
-    } catch(e) {}
-    var element = parentElement.firstChild || null;
-      
-    // see if browser added wrapping tags
-    if(element && (element.tagName.toUpperCase() != elementName))
-      element = element.getElementsByTagName(elementName)[0];
-    
-    // fallback to createElement approach
-    if(!element) element = document.createElement(elementName);
-    
-    // abort if nothing could be created
-    if(!element) return;
-
-    // attributes (or text)
-    if(arguments[1])
-      if(this._isStringOrNumber(arguments[1]) ||
-        (arguments[1] instanceof Array) ||
-        arguments[1].tagName) {
-          this._children(element, arguments[1]);
-        } else {
-          var attrs = this._attributes(arguments[1]);
-          if(attrs.length) {
-            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-              parentElement.innerHTML = "<" +elementName + " " +
-                attrs + "></" + elementName + ">";
-            } catch(e) {}
-            element = parentElement.firstChild || null;
-            // workaround firefox 1.0.X bug
-            if(!element) {
-              element = document.createElement(elementName);
-              for(attr in arguments[1]) 
-                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
-            }
-            if(element.tagName.toUpperCase() != elementName)
-              element = parentElement.getElementsByTagName(elementName)[0];
-          }
-        } 
-
-    // text, or array of children
-    if(arguments[2])
-      this._children(element, arguments[2]);
-
-     return element;
-  },
-  _text: function(text) {
-     return document.createTextNode(text);
-  },
-
-  ATTR_MAP: {
-    'className': 'class',
-    'htmlFor': 'for'
-  },
-
-  _attributes: function(attributes) {
-    var attrs = [];
-    for(attribute in attributes)
-      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
-          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
-    return attrs.join(" ");
-  },
-  _children: function(element, children) {
-    if(children.tagName) {
-      element.appendChild(children);
-      return;
-    }
-    if(typeof children=='object') { // array can hold nodes and text
-      children.flatten().each( function(e) {
-        if(typeof e=='object')
-          element.appendChild(e)
-        else
-          if(Builder._isStringOrNumber(e))
-            element.appendChild(Builder._text(e));
-      });
-    } else
-      if(Builder._isStringOrNumber(children))
-        element.appendChild(Builder._text(children));
-  },
-  _isStringOrNumber: function(param) {
-    return(typeof param=='string' || typeof param=='number');
-  },
-  build: function(html) {
-    var element = this.node('div');
-    $(element).update(html.strip());
-    return element.down();
-  },
-  dump: function(scope) { 
-    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope 
-  
-    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
-      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
-      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
-      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
-      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
-      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
-  
-    tags.each( function(tag){ 
-      scope[tag] = function() { 
-        return Builder.node.apply(Builder, [tag].concat($A(arguments)));  
-      } 
-    });
-  }
-}
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/controls.js b/mp-wp/wp-includes/js/scriptaculous/controls.js
--- a/mp-wp/wp-includes/js/scriptaculous/controls.js 803da95194d0084856ee96c065d38af9bc8e1f3185245b87483849c9fd9fbd180349d9f128d750679d7be26c0f9f581b85dbebfb7f0842a22d83c0dd4467feee
+++ b/mp-wp/wp-includes/js/scriptaculous/controls.js false
@@ -1,965 +0,0 @@
-// script.aculo.us controls.js v1.8.0, Tue Nov 06 15:01:40 +0300 2007
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-//           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
-// Contributors:
-//  Richard Livsey
-//  Rahul Bhargava
-//  Rob Wills
-// 
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-// Autocompleter.Base handles all the autocompletion functionality 
-// that's independent of the data source for autocompletion. This
-// includes drawing the autocompletion menu, observing keyboard
-// and mouse events, and similar.
-//
-// Specific autocompleters need to provide, at the very least, 
-// a getUpdatedChoices function that will be invoked every time
-// the text inside the monitored textbox changes. This method 
-// should get the text for which to provide autocompletion by
-// invoking this.getToken(), NOT by directly accessing
-// this.element.value. This is to allow incremental tokenized
-// autocompletion. Specific auto-completion logic (AJAX, etc)
-// belongs in getUpdatedChoices.
-//
-// Tokenized incremental autocompletion is enabled automatically
-// when an autocompleter is instantiated with the 'tokens' option
-// in the options parameter, e.g.:
-// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
-// will incrementally autocomplete with a comma as the token.
-// Additionally, ',' in the above example can be replaced with
-// a token array, e.g. { tokens: [',', '\n'] } which
-// enables autocompletion on multiple tokens. This is most 
-// useful when one of the tokens is \n (a newline), as it 
-// allows smart autocompletion after linebreaks.
-
-if(typeof Effect == 'undefined')
-  throw("controls.js requires including script.aculo.us' effects.js library");
-
-var Autocompleter = { }
-Autocompleter.Base = Class.create({
-  baseInitialize: function(element, update, options) {
-    element          = $(element)
-    this.element     = element; 
-    this.update      = $(update);  
-    this.hasFocus    = false; 
-    this.changed     = false; 
-    this.active      = false; 
-    this.index       = 0;     
-    this.entryCount  = 0;
-    this.oldElementValue = this.element.value;
-
-    if(this.setOptions)
-      this.setOptions(options);
-    else
-      this.options = options || { };
-
-    this.options.paramName    = this.options.paramName || this.element.name;
-    this.options.tokens       = this.options.tokens || [];
-    this.options.frequency    = this.options.frequency || 0.4;
-    this.options.minChars     = this.options.minChars || 1;
-    this.options.onShow       = this.options.onShow || 
-      function(element, update){ 
-        if(!update.style.position || update.style.position=='absolute') {
-          update.style.position = 'absolute';
-          Position.clone(element, update, {
-            setHeight: false, 
-            offsetTop: element.offsetHeight
-          });
-        }
-        Effect.Appear(update,{duration:0.15});
-      };
-    this.options.onHide = this.options.onHide || 
-      function(element, update){ new Effect.Fade(update,{duration:0.15}) };
-
-    if(typeof(this.options.tokens) == 'string') 
-      this.options.tokens = new Array(this.options.tokens);
-    // Force carriage returns as token delimiters anyway
-    if (!this.options.tokens.include('\n'))
-      this.options.tokens.push('\n');
-
-    this.observer = null;
-    
-    this.element.setAttribute('autocomplete','off');
-
-    Element.hide(this.update);
-
-    Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
-    Event.observe(this.element, 'keypress', this.onKeyPress.bindAsEventListener(this));
-  },
-
-  show: function() {
-    if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
-    if(!this.iefix && 
-      (Prototype.Browser.IE) &&
-      (Element.getStyle(this.update, 'position')=='absolute')) {
-      new Insertion.After(this.update, 
-       '<iframe id="' + this.update.id + '_iefix" '+
-       'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
-       'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
-      this.iefix = $(this.update.id+'_iefix');
-    }
-    if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
-  },
-  
-  fixIEOverlapping: function() {
-    Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
-    this.iefix.style.zIndex = 1;
-    this.update.style.zIndex = 2;
-    Element.show(this.iefix);
-  },
-
-  hide: function() {
-    this.stopIndicator();
-    if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update);
-    if(this.iefix) Element.hide(this.iefix);
-  },
-
-  startIndicator: function() {
-    if(this.options.indicator) Element.show(this.options.indicator);
-  },
-
-  stopIndicator: function() {
-    if(this.options.indicator) Element.hide(this.options.indicator);
-  },
-
-  onKeyPress: function(event) {
-    if(this.active)
-      switch(event.keyCode) {
-       case Event.KEY_TAB:
-       case Event.KEY_RETURN:
-         this.selectEntry();
-         Event.stop(event);
-       case Event.KEY_ESC:
-         this.hide();
-         this.active = false;
-         Event.stop(event);
-         return;
-       case Event.KEY_LEFT:
-       case Event.KEY_RIGHT:
-         return;
-       case Event.KEY_UP:
-         this.markPrevious();
-         this.render();
-         if(Prototype.Browser.WebKit) Event.stop(event);
-         return;
-       case Event.KEY_DOWN:
-         this.markNext();
-         this.render();
-         if(Prototype.Browser.WebKit) Event.stop(event);
-         return;
-      }
-     else 
-       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || 
-         (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
-
-    this.changed = true;
-    this.hasFocus = true;
-
-    if(this.observer) clearTimeout(this.observer);
-      this.observer = 
-        setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
-  },
-
-  activate: function() {
-    this.changed = false;
-    this.hasFocus = true;
-    this.getUpdatedChoices();
-  },
-
-  onHover: function(event) {
-    var element = Event.findElement(event, 'LI');
-    if(this.index != element.autocompleteIndex) 
-    {
-        this.index = element.autocompleteIndex;
-        this.render();
-    }
-    Event.stop(event);
-  },
-  
-  onClick: function(event) {
-    var element = Event.findElement(event, 'LI');
-    this.index = element.autocompleteIndex;
-    this.selectEntry();
-    this.hide();
-  },
-  
-  onBlur: function(event) {
-    // needed to make click events working
-    setTimeout(this.hide.bind(this), 250);
-    this.hasFocus = false;
-    this.active = false;     
-  }, 
-  
-  render: function() {
-    if(this.entryCount > 0) {
-      for (var i = 0; i < this.entryCount; i++)
-        this.index==i ? 
-          Element.addClassName(this.getEntry(i),"selected") : 
-          Element.removeClassName(this.getEntry(i),"selected");
-      if(this.hasFocus) { 
-        this.show();
-        this.active = true;
-      }
-    } else {
-      this.active = false;
-      this.hide();
-    }
-  },
-  
-  markPrevious: function() {
-    if(this.index > 0) this.index--
-      else this.index = this.entryCount-1;
-    this.getEntry(this.index).scrollIntoView(true);
-  },
-  
-  markNext: function() {
-    if(this.index < this.entryCount-1) this.index++
-      else this.index = 0;
-    this.getEntry(this.index).scrollIntoView(false);
-  },
-  
-  getEntry: function(index) {
-    return this.update.firstChild.childNodes[index];
-  },
-  
-  getCurrentEntry: function() {
-    return this.getEntry(this.index);
-  },
-  
-  selectEntry: function() {
-    this.active = false;
-    this.updateElement(this.getCurrentEntry());
-  },
-
-  updateElement: function(selectedElement) {
-    if (this.options.updateElement) {
-      this.options.updateElement(selectedElement);
-      return;
-    }
-    var value = '';
-    if (this.options.select) {
-      var nodes = $(selectedElement).select('.' + this.options.select) || [];
-      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
-    } else
-      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
-    
-    var bounds = this.getTokenBounds();
-    if (bounds[0] != -1) {
-      var newValue = this.element.value.substr(0, bounds[0]);
-      var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
-      if (whitespace)
-        newValue += whitespace[0];
-      this.element.value = newValue + value + this.element.value.substr(bounds[1]);
-    } else {
-      this.element.value = value;
-    }
-    this.oldElementValue = this.element.value;
-    this.element.focus();
-    
-    if (this.options.afterUpdateElement)
-      this.options.afterUpdateElement(this.element, selectedElement);
-  },
-
-  updateChoices: function(choices) {
-    if(!this.changed && this.hasFocus) {
-      this.update.innerHTML = choices;
-      Element.cleanWhitespace(this.update);
-      Element.cleanWhitespace(this.update.down());
-
-      if(this.update.firstChild && this.update.down().childNodes) {
-        this.entryCount = 
-          this.update.down().childNodes.length;
-        for (var i = 0; i < this.entryCount; i++) {
-          var entry = this.getEntry(i);
-          entry.autocompleteIndex = i;
-          this.addObservers(entry);
-        }
-      } else { 
-        this.entryCount = 0;
-      }
-
-      this.stopIndicator();
-      this.index = 0;
-      
-      if(this.entryCount==1 && this.options.autoSelect) {
-        this.selectEntry();
-        this.hide();
-      } else {
-        this.render();
-      }
-    }
-  },
-
-  addObservers: function(element) {
-    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
-    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
-  },
-
-  onObserverEvent: function() {
-    this.changed = false;   
-    this.tokenBounds = null;
-    if(this.getToken().length>=this.options.minChars) {
-      this.getUpdatedChoices();
-    } else {
-      this.active = false;
-      this.hide();
-    }
-    this.oldElementValue = this.element.value;
-  },
-
-  getToken: function() {
-    var bounds = this.getTokenBounds();
-    return this.element.value.substring(bounds[0], bounds[1]).strip();
-  },
-
-  getTokenBounds: function() {
-    if (null != this.tokenBounds) return this.tokenBounds;
-    var value = this.element.value;
-    if (value.strip().empty()) return [-1, 0];
-    var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
-    var offset = (diff == this.oldElementValue.length ? 1 : 0);
-    var prevTokenPos = -1, nextTokenPos = value.length;
-    var tp;
-    for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
-      tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
-      if (tp > prevTokenPos) prevTokenPos = tp;
-      tp = value.indexOf(this.options.tokens[index], diff + offset);
-      if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
-    }
-    return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
-  }
-});
-
-Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
-  var boundary = Math.min(newS.length, oldS.length);
-  for (var index = 0; index < boundary; ++index)
-    if (newS[index] != oldS[index])
-      return index;
-  return boundary;
-};
-
-Ajax.Autocompleter = Class.create(Autocompleter.Base, {
-  initialize: function(element, update, url, options) {
-    this.baseInitialize(element, update, options);
-    this.options.asynchronous  = true;
-    this.options.onComplete    = this.onComplete.bind(this);
-    this.options.defaultParams = this.options.parameters || null;
-    this.url                   = url;
-  },
-
-  getUpdatedChoices: function() {
-    this.startIndicator();
-    
-    var entry = encodeURIComponent(this.options.paramName) + '=' + 
-      encodeURIComponent(this.getToken());
-
-    this.options.parameters = this.options.callback ?
-      this.options.callback(this.element, entry) : entry;
-
-    if(this.options.defaultParams) 
-      this.options.parameters += '&' + this.options.defaultParams;
-    
-    new Ajax.Request(this.url, this.options);
-  },
-
-  onComplete: function(request) {
-    this.updateChoices(request.responseText);
-  }
-});
-
-// The local array autocompleter. Used when you'd prefer to
-// inject an array of autocompletion options into the page, rather
-// than sending out Ajax queries, which can be quite slow sometimes.
-//
-// The constructor takes four parameters. The first two are, as usual,
-// the id of the monitored textbox, and id of the autocompletion menu.
-// The third is the array you want to autocomplete from, and the fourth
-// is the options block.
-//
-// Extra local autocompletion options:
-// - choices - How many autocompletion choices to offer
-//
-// - partialSearch - If false, the autocompleter will match entered
-//                    text only at the beginning of strings in the 
-//                    autocomplete array. Defaults to true, which will
-//                    match text at the beginning of any *word* in the
-//                    strings in the autocomplete array. If you want to
-//                    search anywhere in the string, additionally set
-//                    the option fullSearch to true (default: off).
-//
-// - fullSsearch - Search anywhere in autocomplete array strings.
-//
-// - partialChars - How many characters to enter before triggering
-//                   a partial match (unlike minChars, which defines
-//                   how many characters are required to do any match
-//                   at all). Defaults to 2.
-//
-// - ignoreCase - Whether to ignore case when autocompleting.
-//                 Defaults to true.
-//
-// It's possible to pass in a custom function as the 'selector' 
-// option, if you prefer to write your own autocompletion logic.
-// In that case, the other options above will not apply unless
-// you support them.
-
-Autocompleter.Local = Class.create(Autocompleter.Base, {
-  initialize: function(element, update, array, options) {
-    this.baseInitialize(element, update, options);
-    this.options.array = array;
-  },
-
-  getUpdatedChoices: function() {
-    this.updateChoices(this.options.selector(this));
-  },
-
-  setOptions: function(options) {
-    this.options = Object.extend({
-      choices: 10,
-      partialSearch: true,
-      partialChars: 2,
-      ignoreCase: true,
-      fullSearch: false,
-      selector: function(instance) {
-        var ret       = []; // Beginning matches
-        var partial   = []; // Inside matches
-        var entry     = instance.getToken();
-        var count     = 0;
-
-        for (var i = 0; i < instance.options.array.length &&  
-          ret.length < instance.options.choices ; i++) { 
-
-          var elem = instance.options.array[i];
-          var foundPos = instance.options.ignoreCase ? 
-            elem.toLowerCase().indexOf(entry.toLowerCase()) : 
-            elem.indexOf(entry);
-
-          while (foundPos != -1) {
-            if (foundPos == 0 && elem.length != entry.length) { 
-              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + 
-                elem.substr(entry.length) + "</li>");
-              break;
-            } else if (entry.length >= instance.options.partialChars && 
-              instance.options.partialSearch && foundPos != -1) {
-              if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
-                partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
-                  elem.substr(foundPos, entry.length) + "</strong>" + elem.substr(
-                  foundPos + entry.length) + "</li>");
-                break;
-              }
-            }
-
-            foundPos = instance.options.ignoreCase ? 
-              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : 
-              elem.indexOf(entry, foundPos + 1);
-
-          }
-        }
-        if (partial.length)
-          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length))
-        return "<ul>" + ret.join('') + "</ul>";
-      }
-    }, options || { });
-  }
-});
-
-// AJAX in-place editor and collection editor
-// Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).
-
-// Use this if you notice weird scrolling problems on some browsers,
-// the DOM might be a bit confused when this gets called so do this
-// waits 1 ms (with setTimeout) until it does the activation
-Field.scrollFreeActivate = function(field) {
-  setTimeout(function() {
-    Field.activate(field);
-  }, 1);
-}
-
-Ajax.InPlaceEditor = Class.create({
-  initialize: function(element, url, options) {
-    this.url = url;
-    this.element = element = $(element);
-    this.prepareOptions();
-    this._controls = { };
-    arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
-    Object.extend(this.options, options || { });
-    if (!this.options.formId && this.element.id) {
-      this.options.formId = this.element.id + '-inplaceeditor';
-      if ($(this.options.formId))
-        this.options.formId = '';
-    }
-    if (this.options.externalControl)
-      this.options.externalControl = $(this.options.externalControl);
-    if (!this.options.externalControl)
-      this.options.externalControlOnly = false;
-    this._originalBackground = this.element.getStyle('background-color') || 'transparent';
-    this.element.title = this.options.clickToEditText;
-    this._boundCancelHandler = this.handleFormCancellation.bind(this);
-    this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
-    this._boundFailureHandler = this.handleAJAXFailure.bind(this);
-    this._boundSubmitHandler = this.handleFormSubmission.bind(this);
-    this._boundWrapperHandler = this.wrapUp.bind(this);
-    this.registerListeners();
-  },
-  checkForEscapeOrReturn: function(e) {
-    if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
-    if (Event.KEY_ESC == e.keyCode)
-      this.handleFormCancellation(e);
-    else if (Event.KEY_RETURN == e.keyCode)
-      this.handleFormSubmission(e);
-  },
-  createControl: function(mode, handler, extraClasses) {
-    var control = this.options[mode + 'Control'];
-    var text = this.options[mode + 'Text'];
-    if ('button' == control) {
-      var btn = document.createElement('input');
-      btn.type = 'submit';
-      btn.value = text;
-      btn.className = 'editor_' + mode + '_button';
-      if ('cancel' == mode)
-        btn.onclick = this._boundCancelHandler;
-      this._form.appendChild(btn);
-      this._controls[mode] = btn;
-    } else if ('link' == control) {
-      var link = document.createElement('a');
-      link.href = '#';
-      link.appendChild(document.createTextNode(text));
-      link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
-      link.className = 'editor_' + mode + '_link';
-      if (extraClasses)
-        link.className += ' ' + extraClasses;
-      this._form.appendChild(link);
-      this._controls[mode] = link;
-    }
-  },
-  createEditField: function() {
-    var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
-    var fld;
-    if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) {
-      fld = document.createElement('input');
-      fld.type = 'text';
-      var size = this.options.size || this.options.cols || 0;
-      if (0 < size) fld.size = size;
-    } else {
-      fld = document.createElement('textarea');
-      fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
-      fld.cols = this.options.cols || 40;
-    }
-    fld.name = this.options.paramName;
-    fld.value = text; // No HTML breaks conversion anymore
-    fld.className = 'editor_field';
-    if (this.options.submitOnBlur)
-      fld.onblur = this._boundSubmitHandler;
-    this._controls.editor = fld;
-    if (this.options.loadTextURL)
-      this.loadExternalText();
-    this._form.appendChild(this._controls.editor);
-  },
-  createForm: function() {
-    var ipe = this;
-    function addText(mode, condition) {
-      var text = ipe.options['text' + mode + 'Controls'];
-      if (!text || condition === false) return;
-      ipe._form.appendChild(document.createTextNode(text));
-    };
-    this._form = $(document.createElement('form'));
-    this._form.id = this.options.formId;
-    this._form.addClassName(this.options.formClassName);
-    this._form.onsubmit = this._boundSubmitHandler;
-    this.createEditField();
-    if ('textarea' == this._controls.editor.tagName.toLowerCase())
-      this._form.appendChild(document.createElement('br'));
-    if (this.options.onFormCustomization)
-      this.options.onFormCustomization(this, this._form);
-    addText('Before', this.options.okControl || this.options.cancelControl);
-    this.createControl('ok', this._boundSubmitHandler);
-    addText('Between', this.options.okControl && this.options.cancelControl);
-    this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
-    addText('After', this.options.okControl || this.options.cancelControl);
-  },
-  destroy: function() {
-    if (this._oldInnerHTML)
-      this.element.innerHTML = this._oldInnerHTML;
-    this.leaveEditMode();
-    this.unregisterListeners();
-  },
-  enterEditMode: function(e) {
-    if (this._saving || this._editing) return;
-    this._editing = true;
-    this.triggerCallback('onEnterEditMode');
-    if (this.options.externalControl)
-      this.options.externalControl.hide();
-    this.element.hide();
-    this.createForm();
-    this.element.parentNode.insertBefore(this._form, this.element);
-    if (!this.options.loadTextURL)
-      this.postProcessEditField();
-    if (e) Event.stop(e);
-  },
-  enterHover: function(e) {
-    if (this.options.hoverClassName)
-      this.element.addClassName(this.options.hoverClassName);
-    if (this._saving) return;
-    this.triggerCallback('onEnterHover');
-  },
-  getText: function() {
-    return this.element.innerHTML;
-  },
-  handleAJAXFailure: function(transport) {
-    this.triggerCallback('onFailure', transport);
-    if (this._oldInnerHTML) {
-      this.element.innerHTML = this._oldInnerHTML;
-      this._oldInnerHTML = null;
-    }
-  },
-  handleFormCancellation: function(e) {
-    this.wrapUp();
-    if (e) Event.stop(e);
-  },
-  handleFormSubmission: function(e) {
-    var form = this._form;
-    var value = $F(this._controls.editor);
-    this.prepareSubmission();
-    var params = this.options.callback(form, value) || '';
-    if (Object.isString(params))
-      params = params.toQueryParams();
-    params.editorId = this.element.id;
-    if (this.options.htmlResponse) {
-      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
-      Object.extend(options, {
-        parameters: params,
-        onComplete: this._boundWrapperHandler,
-        onFailure: this._boundFailureHandler
-      });
-      new Ajax.Updater({ success: this.element }, this.url, options);
-    } else {
-      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-      Object.extend(options, {
-        parameters: params,
-        onComplete: this._boundWrapperHandler,
-        onFailure: this._boundFailureHandler
-      });
-      new Ajax.Request(this.url, options);
-    }
-    if (e) Event.stop(e);
-  },
-  leaveEditMode: function() {
-    this.element.removeClassName(this.options.savingClassName);
-    this.removeForm();
-    this.leaveHover();
-    this.element.style.backgroundColor = this._originalBackground;
-    this.element.show();
-    if (this.options.externalControl)
-      this.options.externalControl.show();
-    this._saving = false;
-    this._editing = false;
-    this._oldInnerHTML = null;
-    this.triggerCallback('onLeaveEditMode');
-  },
-  leaveHover: function(e) {
-    if (this.options.hoverClassName)
-      this.element.removeClassName(this.options.hoverClassName);
-    if (this._saving) return;
-    this.triggerCallback('onLeaveHover');
-  },
-  loadExternalText: function() {
-    this._form.addClassName(this.options.loadingClassName);
-    this._controls.editor.disabled = true;
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        this._form.removeClassName(this.options.loadingClassName);
-        var text = transport.responseText;
-        if (this.options.stripLoadedTextTags)
-          text = text.stripTags();
-        this._controls.editor.value = text;
-        this._controls.editor.disabled = false;
-        this.postProcessEditField();
-      }.bind(this),
-      onFailure: this._boundFailureHandler
-    });
-    new Ajax.Request(this.options.loadTextURL, options);
-  },
-  postProcessEditField: function() {
-    var fpc = this.options.fieldPostCreation;
-    if (fpc)
-      $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
-  },
-  prepareOptions: function() {
-    this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
-    Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
-    [this._extraDefaultOptions].flatten().compact().each(function(defs) {
-      Object.extend(this.options, defs);
-    }.bind(this));
-  },
-  prepareSubmission: function() {
-    this._saving = true;
-    this.removeForm();
-    this.leaveHover();
-    this.showSaving();
-  },
-  registerListeners: function() {
-    this._listeners = { };
-    var listener;
-    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
-      listener = this[pair.value].bind(this);
-      this._listeners[pair.key] = listener;
-      if (!this.options.externalControlOnly)
-        this.element.observe(pair.key, listener);
-      if (this.options.externalControl)
-        this.options.externalControl.observe(pair.key, listener);
-    }.bind(this));
-  },
-  removeForm: function() {
-    if (!this._form) return;
-    this._form.remove();
-    this._form = null;
-    this._controls = { };
-  },
-  showSaving: function() {
-    this._oldInnerHTML = this.element.innerHTML;
-    this.element.innerHTML = this.options.savingText;
-    this.element.addClassName(this.options.savingClassName);
-    this.element.style.backgroundColor = this._originalBackground;
-    this.element.show();
-  },
-  triggerCallback: function(cbName, arg) {
-    if ('function' == typeof this.options[cbName]) {
-      this.options[cbName](this, arg);
-    }
-  },
-  unregisterListeners: function() {
-    $H(this._listeners).each(function(pair) {
-      if (!this.options.externalControlOnly)
-        this.element.stopObserving(pair.key, pair.value);
-      if (this.options.externalControl)
-        this.options.externalControl.stopObserving(pair.key, pair.value);
-    }.bind(this));
-  },
-  wrapUp: function(transport) {
-    this.leaveEditMode();
-    // Can't use triggerCallback due to backward compatibility: requires
-    // binding + direct element
-    this._boundComplete(transport, this.element);
-  }
-});
-
-Object.extend(Ajax.InPlaceEditor.prototype, {
-  dispose: Ajax.InPlaceEditor.prototype.destroy
-});
-
-Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
-  initialize: function($super, element, url, options) {
-    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
-    $super(element, url, options);
-  },
-
-  createEditField: function() {
-    var list = document.createElement('select');
-    list.name = this.options.paramName;
-    list.size = 1;
-    this._controls.editor = list;
-    this._collection = this.options.collection || [];
-    if (this.options.loadCollectionURL)
-      this.loadCollection();
-    else
-      this.checkForExternalText();
-    this._form.appendChild(this._controls.editor);
-  },
-
-  loadCollection: function() {
-    this._form.addClassName(this.options.loadingClassName);
-    this.showLoadingText(this.options.loadingCollectionText);
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        var js = transport.responseText.strip();
-        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
-          throw 'Server returned an invalid collection representation.';
-        this._collection = eval(js);
-        this.checkForExternalText();
-      }.bind(this),
-      onFailure: this.onFailure
-    });
-    new Ajax.Request(this.options.loadCollectionURL, options);
-  },
-
-  showLoadingText: function(text) {
-    this._controls.editor.disabled = true;
-    var tempOption = this._controls.editor.firstChild;
-    if (!tempOption) {
-      tempOption = document.createElement('option');
-      tempOption.value = '';
-      this._controls.editor.appendChild(tempOption);
-      tempOption.selected = true;
-    }
-    tempOption.update((text || '').stripScripts().stripTags());
-  },
-
-  checkForExternalText: function() {
-    this._text = this.getText();
-    if (this.options.loadTextURL)
-      this.loadExternalText();
-    else
-      this.buildOptionList();
-  },
-
-  loadExternalText: function() {
-    this.showLoadingText(this.options.loadingText);
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        this._text = transport.responseText.strip();
-        this.buildOptionList();
-      }.bind(this),
-      onFailure: this.onFailure
-    });
-    new Ajax.Request(this.options.loadTextURL, options);
-  },
-
-  buildOptionList: function() {
-    this._form.removeClassName(this.options.loadingClassName);
-    this._collection = this._collection.map(function(entry) {
-      return 2 === entry.length ? entry : [entry, entry].flatten();
-    });
-    var marker = ('value' in this.options) ? this.options.value : this._text;
-    var textFound = this._collection.any(function(entry) {
-      return entry[0] == marker;
-    }.bind(this));
-    this._controls.editor.update('');
-    var option;
-    this._collection.each(function(entry, index) {
-      option = document.createElement('option');
-      option.value = entry[0];
-      option.selected = textFound ? entry[0] == marker : 0 == index;
-      option.appendChild(document.createTextNode(entry[1]));
-      this._controls.editor.appendChild(option);
-    }.bind(this));
-    this._controls.editor.disabled = false;
-    Field.scrollFreeActivate(this._controls.editor);
-  }
-});
-
-//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
-//**** This only  exists for a while,  in order to  let ****
-//**** users adapt to  the new API.  Read up on the new ****
-//**** API and convert your code to it ASAP!            ****
-
-Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
-  if (!options) return;
-  function fallback(name, expr) {
-    if (name in options || expr === undefined) return;
-    options[name] = expr;
-  };
-  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
-    options.cancelLink == options.cancelButton == false ? false : undefined)));
-  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
-    options.okLink == options.okButton == false ? false : undefined)));
-  fallback('highlightColor', options.highlightcolor);
-  fallback('highlightEndColor', options.highlightendcolor);
-};
-
-Object.extend(Ajax.InPlaceEditor, {
-  DefaultOptions: {
-    ajaxOptions: { },
-    autoRows: 3,                                // Use when multi-line w/ rows == 1
-    cancelControl: 'link',                      // 'link'|'button'|false
-    cancelText: 'cancel',
-    clickToEditText: 'Click to edit',
-    externalControl: null,                      // id|elt
-    externalControlOnly: false,
-    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
-    formClassName: 'inplaceeditor-form',
-    formId: null,                               // id|elt
-    highlightColor: '#ffff99',
-    highlightEndColor: '#ffffff',
-    hoverClassName: '',
-    htmlResponse: true,
-    loadingClassName: 'inplaceeditor-loading',
-    loadingText: 'Loading...',
-    okControl: 'button',                        // 'link'|'button'|false
-    okText: 'ok',
-    paramName: 'value',
-    rows: 1,                                    // If 1 and multi-line, uses autoRows
-    savingClassName: 'inplaceeditor-saving',
-    savingText: 'Saving...',
-    size: 0,
-    stripLoadedTextTags: false,
-    submitOnBlur: false,
-    textAfterControls: '',
-    textBeforeControls: '',
-    textBetweenControls: ''
-  },
-  DefaultCallbacks: {
-    callback: function(form) {
-      return Form.serialize(form);
-    },
-    onComplete: function(transport, element) {
-      // For backward compatibility, this one is bound to the IPE, and passes
-      // the element directly.  It was too often customized, so we don't break it.
-      new Effect.Highlight(element, {
-        startcolor: this.options.highlightColor, keepBackgroundImage: true });
-    },
-    onEnterEditMode: null,
-    onEnterHover: function(ipe) {
-      ipe.element.style.backgroundColor = ipe.options.highlightColor;
-      if (ipe._effect)
-        ipe._effect.cancel();
-    },
-    onFailure: function(transport, ipe) {
-      alert('Error communication with the server: ' + transport.responseText.stripTags());
-    },
-    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
-    onLeaveEditMode: null,
-    onLeaveHover: function(ipe) {
-      ipe._effect = new Effect.Highlight(ipe.element, {
-        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
-        restorecolor: ipe._originalBackground, keepBackgroundImage: true
-      });
-    }
-  },
-  Listeners: {
-    click: 'enterEditMode',
-    keydown: 'checkForEscapeOrReturn',
-    mouseover: 'enterHover',
-    mouseout: 'leaveHover'
-  }
-});
-
-Ajax.InPlaceCollectionEditor.DefaultOptions = {
-  loadingCollectionText: 'Loading options...'
-};
-
-// Delayed observer, like Form.Element.Observer, 
-// but waits for delay after last key input
-// Ideal for live-search fields
-
-Form.Element.DelayedObserver = Class.create({
-  initialize: function(element, delay, callback) {
-    this.delay     = delay || 0.5;
-    this.element   = $(element);
-    this.callback  = callback;
-    this.timer     = null;
-    this.lastValue = $F(this.element); 
-    Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
-  },
-  delayedListener: function(event) {
-    if(this.lastValue == $F(this.element)) return;
-    if(this.timer) clearTimeout(this.timer);
-    this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
-    this.lastValue = $F(this.element);
-  },
-  onTimerEvent: function() {
-    this.timer = null;
-    this.callback(this.element, $F(this.element));
-  }
-});
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/dragdrop.js b/mp-wp/wp-includes/js/scriptaculous/dragdrop.js
--- a/mp-wp/wp-includes/js/scriptaculous/dragdrop.js f728e059183adf05bc868d9fd6adb3c5c5329586bea8a6d0c39ac2749edd6d9cd6668fa70ab90c895911858a965a032accc8e777efb3a810bc366aede09dcad4
+++ b/mp-wp/wp-includes/js/scriptaculous/dragdrop.js false
@@ -1,974 +0,0 @@
-// script.aculo.us dragdrop.js v1.8.0, Tue Nov 06 15:01:40 +0300 2007
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
-// 
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-if(Object.isUndefined(Effect))
-  throw("dragdrop.js requires including script.aculo.us' effects.js library");
-
-var Droppables = {
-  drops: [],
-
-  remove: function(element) {
-    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
-  },
-
-  add: function(element) {
-    element = $(element);
-    var options = Object.extend({
-      greedy:     true,
-      hoverclass: null,
-      tree:       false
-    }, arguments[1] || { });
-
-    // cache containers
-    if(options.containment) {
-      options._containers = [];
-      var containment = options.containment;
-      if(Object.isArray(containment)) {
-        containment.each( function(c) { options._containers.push($(c)) });
-      } else {
-        options._containers.push($(containment));
-      }
-    }
-    
-    if(options.accept) options.accept = [options.accept].flatten();
-
-    Element.makePositioned(element); // fix IE
-    options.element = element;
-
-    this.drops.push(options);
-  },
-  
-  findDeepestChild: function(drops) {
-    deepest = drops[0];
-      
-    for (i = 1; i < drops.length; ++i)
-      if (Element.isParent(drops[i].element, deepest.element))
-        deepest = drops[i];
-    
-    return deepest;
-  },
-
-  isContained: function(element, drop) {
-    var containmentNode;
-    if(drop.tree) {
-      containmentNode = element.treeNode; 
-    } else {
-      containmentNode = element.parentNode;
-    }
-    return drop._containers.detect(function(c) { return containmentNode == c });
-  },
-  
-  isAffected: function(point, element, drop) {
-    return (
-      (drop.element!=element) &&
-      ((!drop._containers) ||
-        this.isContained(element, drop)) &&
-      ((!drop.accept) ||
-        (Element.classNames(element).detect( 
-          function(v) { return drop.accept.include(v) } ) )) &&
-      Position.within(drop.element, point[0], point[1]) );
-  },
-
-  deactivate: function(drop) {
-    if(drop.hoverclass)
-      Element.removeClassName(drop.element, drop.hoverclass);
-    this.last_active = null;
-  },
-
-  activate: function(drop) {
-    if(drop.hoverclass)
-      Element.addClassName(drop.element, drop.hoverclass);
-    this.last_active = drop;
-  },
-
-  show: function(point, element) {
-    if(!this.drops.length) return;
-    var drop, affected = [];
-    
-    this.drops.each( function(drop) {
-      if(Droppables.isAffected(point, element, drop))
-        affected.push(drop);
-    });
-        
-    if(affected.length>0)
-      drop = Droppables.findDeepestChild(affected);
-
-    if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
-    if (drop) {
-      Position.within(drop.element, point[0], point[1]);
-      if(drop.onHover)
-        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-      
-      if (drop != this.last_active) Droppables.activate(drop);
-    }
-  },
-
-  fire: function(event, element) {
-    if(!this.last_active) return;
-    Position.prepare();
-
-    if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
-      if (this.last_active.onDrop) {
-        this.last_active.onDrop(element, this.last_active.element, event); 
-        return true; 
-      }
-  },
-
-  reset: function() {
-    if(this.last_active)
-      this.deactivate(this.last_active);
-  }
-}
-
-var Draggables = {
-  drags: [],
-  observers: [],
-  
-  register: function(draggable) {
-    if(this.drags.length == 0) {
-      this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
-      this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
-      this.eventKeypress  = this.keyPress.bindAsEventListener(this);
-      
-      Event.observe(document, "mouseup", this.eventMouseUp);
-      Event.observe(document, "mousemove", this.eventMouseMove);
-      Event.observe(document, "keypress", this.eventKeypress);
-    }
-    this.drags.push(draggable);
-  },
-  
-  unregister: function(draggable) {
-    this.drags = this.drags.reject(function(d) { return d==draggable });
-    if(this.drags.length == 0) {
-      Event.stopObserving(document, "mouseup", this.eventMouseUp);
-      Event.stopObserving(document, "mousemove", this.eventMouseMove);
-      Event.stopObserving(document, "keypress", this.eventKeypress);
-    }
-  },
-  
-  activate: function(draggable) {
-    if(draggable.options.delay) { 
-      this._timeout = setTimeout(function() { 
-        Draggables._timeout = null; 
-        window.focus(); 
-        Draggables.activeDraggable = draggable; 
-      }.bind(this), draggable.options.delay); 
-    } else {
-      window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
-      this.activeDraggable = draggable;
-    }
-  },
-  
-  deactivate: function() {
-    this.activeDraggable = null;
-  },
-  
-  updateDrag: function(event) {
-    if(!this.activeDraggable) return;
-    var pointer = [Event.pointerX(event), Event.pointerY(event)];
-    // Mozilla-based browsers fire successive mousemove events with
-    // the same coordinates, prevent needless redrawing (moz bug?)
-    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
-    this._lastPointer = pointer;
-    
-    this.activeDraggable.updateDrag(event, pointer);
-  },
-  
-  endDrag: function(event) {
-    if(this._timeout) { 
-      clearTimeout(this._timeout); 
-      this._timeout = null; 
-    }
-    if(!this.activeDraggable) return;
-    this._lastPointer = null;
-    this.activeDraggable.endDrag(event);
-    this.activeDraggable = null;
-  },
-  
-  keyPress: function(event) {
-    if(this.activeDraggable)
-      this.activeDraggable.keyPress(event);
-  },
-  
-  addObserver: function(observer) {
-    this.observers.push(observer);
-    this._cacheObserverCallbacks();
-  },
-  
-  removeObserver: function(element) {  // element instead of observer fixes mem leaks
-    this.observers = this.observers.reject( function(o) { return o.element==element });
-    this._cacheObserverCallbacks();
-  },
-  
-  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
-    if(this[eventName+'Count'] > 0)
-      this.observers.each( function(o) {
-        if(o[eventName]) o[eventName](eventName, draggable, event);
-      });
-    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
-  },
-  
-  _cacheObserverCallbacks: function() {
-    ['onStart','onEnd','onDrag'].each( function(eventName) {
-      Draggables[eventName+'Count'] = Draggables.observers.select(
-        function(o) { return o[eventName]; }
-      ).length;
-    });
-  }
-}
-
-/*--------------------------------------------------------------------------*/
-
-var Draggable = Class.create({
-  initialize: function(element) {
-    var defaults = {
-      handle: false,
-      reverteffect: function(element, top_offset, left_offset) {
-        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
-        new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
-          queue: {scope:'_draggable', position:'end'}
-        });
-      },
-      endeffect: function(element) {
-        var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
-        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
-          queue: {scope:'_draggable', position:'end'},
-          afterFinish: function(){ 
-            Draggable._dragging[element] = false 
-          }
-        }); 
-      },
-      zindex: 1000,
-      revert: false,
-      quiet: false,
-      scroll: false,
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-      snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
-      delay: 0
-    };
-    
-    if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
-      Object.extend(defaults, {
-        starteffect: function(element) {
-          element._opacity = Element.getOpacity(element);
-          Draggable._dragging[element] = true;
-          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); 
-        }
-      });
-    
-    var options = Object.extend(defaults, arguments[1] || { });
-
-    this.element = $(element);
-    
-    if(options.handle && Object.isString(options.handle))
-      this.handle = this.element.down('.'+options.handle, 0);
-    
-    if(!this.handle) this.handle = $(options.handle);
-    if(!this.handle) this.handle = this.element;
-    
-    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
-      options.scroll = $(options.scroll);
-      this._isScrollChild = Element.childOf(this.element, options.scroll);
-    }
-
-    Element.makePositioned(this.element); // fix IE    
-
-    this.options  = options;
-    this.dragging = false;   
-
-    this.eventMouseDown = this.initDrag.bindAsEventListener(this);
-    Event.observe(this.handle, "mousedown", this.eventMouseDown);
-    
-    Draggables.register(this);
-  },
-  
-  destroy: function() {
-    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
-    Draggables.unregister(this);
-  },
-  
-  currentDelta: function() {
-    return([
-      parseInt(Element.getStyle(this.element,'left') || '0'),
-      parseInt(Element.getStyle(this.element,'top') || '0')]);
-  },
-  
-  initDrag: function(event) {
-    if(!Object.isUndefined(Draggable._dragging[this.element]) &&
-      Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {    
-      // abort on form elements, fixes a Firefox issue
-      var src = Event.element(event);
-      if((tag_name = src.tagName.toUpperCase()) && (
-        tag_name=='INPUT' ||
-        tag_name=='SELECT' ||
-        tag_name=='OPTION' ||
-        tag_name=='BUTTON' ||
-        tag_name=='TEXTAREA')) return;
-        
-      var pointer = [Event.pointerX(event), Event.pointerY(event)];
-      var pos     = Position.cumulativeOffset(this.element);
-      this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
-      
-      Draggables.activate(this);
-      Event.stop(event);
-    }
-  },
-  
-  startDrag: function(event) {
-    this.dragging = true;
-    if(!this.delta)
-      this.delta = this.currentDelta();
-    
-    if(this.options.zindex) {
-      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
-      this.element.style.zIndex = this.options.zindex;
-    }
-    
-    if(this.options.ghosting) {
-      this._clone = this.element.cloneNode(true);
-      this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
-      if (!this.element._originallyAbsolute)
-        Position.absolutize(this.element);
-      this.element.parentNode.insertBefore(this._clone, this.element);
-    }
-    
-    if(this.options.scroll) {
-      if (this.options.scroll == window) {
-        var where = this._getWindowScroll(this.options.scroll);
-        this.originalScrollLeft = where.left;
-        this.originalScrollTop = where.top;
-      } else {
-        this.originalScrollLeft = this.options.scroll.scrollLeft;
-        this.originalScrollTop = this.options.scroll.scrollTop;
-      }
-    }
-    
-    Draggables.notify('onStart', this, event);
-        
-    if(this.options.starteffect) this.options.starteffect(this.element);
-  },
-  
-  updateDrag: function(event, pointer) {
-    if(!this.dragging) this.startDrag(event);
-    
-    if(!this.options.quiet){
-      Position.prepare();
-      Droppables.show(pointer, this.element);
-    }
-    
-    Draggables.notify('onDrag', this, event);
-    
-    this.draw(pointer);
-    if(this.options.change) this.options.change(this);
-    
-    if(this.options.scroll) {
-      this.stopScrolling();
-      
-      var p;
-      if (this.options.scroll == window) {
-        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
-      } else {
-        p = Position.page(this.options.scroll);
-        p[0] += this.options.scroll.scrollLeft + Position.deltaX;
-        p[1] += this.options.scroll.scrollTop + Position.deltaY;
-        p.push(p[0]+this.options.scroll.offsetWidth);
-        p.push(p[1]+this.options.scroll.offsetHeight);
-      }
-      var speed = [0,0];
-      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
-      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
-      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
-      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
-      this.startScrolling(speed);
-    }
-    
-    // fix AppleWebKit rendering
-    if(Prototype.Browser.WebKit) window.scrollBy(0,0);
-    
-    Event.stop(event);
-  },
-  
-  finishDrag: function(event, success) {
-    this.dragging = false;
-    
-    if(this.options.quiet){
-      Position.prepare();
-      var pointer = [Event.pointerX(event), Event.pointerY(event)];
-      Droppables.show(pointer, this.element);
-    }
-
-    if(this.options.ghosting) {
-      if (!this.element._originallyAbsolute)
-        Position.relativize(this.element);
-      delete this.element._originallyAbsolute;
-      Element.remove(this._clone);
-      this._clone = null;
-    }
-
-    var dropped = false; 
-    if(success) { 
-      dropped = Droppables.fire(event, this.element); 
-      if (!dropped) dropped = false; 
-    }
-    if(dropped && this.options.onDropped) this.options.onDropped(this.element);
-    Draggables.notify('onEnd', this, event);
-
-    var revert = this.options.revert;
-    if(revert && Object.isFunction(revert)) revert = revert(this.element);
-    
-    var d = this.currentDelta();
-    if(revert && this.options.reverteffect) {
-      if (dropped == 0 || revert != 'failure')
-        this.options.reverteffect(this.element,
-          d[1]-this.delta[1], d[0]-this.delta[0]);
-    } else {
-      this.delta = d;
-    }
-
-    if(this.options.zindex)
-      this.element.style.zIndex = this.originalZ;
-
-    if(this.options.endeffect) 
-      this.options.endeffect(this.element);
-      
-    Draggables.deactivate(this);
-    Droppables.reset();
-  },
-  
-  keyPress: function(event) {
-    if(event.keyCode!=Event.KEY_ESC) return;
-    this.finishDrag(event, false);
-    Event.stop(event);
-  },
-  
-  endDrag: function(event) {
-    if(!this.dragging) return;
-    this.stopScrolling();
-    this.finishDrag(event, true);
-    Event.stop(event);
-  },
-  
-  draw: function(point) {
-    var pos = Position.cumulativeOffset(this.element);
-    if(this.options.ghosting) {
-      var r   = Position.realOffset(this.element);
-      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
-    }
-    
-    var d = this.currentDelta();
-    pos[0] -= d[0]; pos[1] -= d[1];
-    
-    if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
-      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
-      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
-    }
-    
-    var p = [0,1].map(function(i){ 
-      return (point[i]-pos[i]-this.offset[i]) 
-    }.bind(this));
-    
-    if(this.options.snap) {
-      if(Object.isFunction(this.options.snap)) {
-        p = this.options.snap(p[0],p[1],this);
-      } else {
-      if(Object.isArray(this.options.snap)) {
-        p = p.map( function(v, i) {
-          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
-      } else {
-        p = p.map( function(v) {
-          return (v/this.options.snap).round()*this.options.snap }.bind(this))
-      }
-    }}
-    
-    var style = this.element.style;
-    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
-      style.left = p[0] + "px";
-    if((!this.options.constraint) || (this.options.constraint=='vertical'))
-      style.top  = p[1] + "px";
-    
-    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
-  },
-  
-  stopScrolling: function() {
-    if(this.scrollInterval) {
-      clearInterval(this.scrollInterval);
-      this.scrollInterval = null;
-      Draggables._lastScrollPointer = null;
-    }
-  },
-  
-  startScrolling: function(speed) {
-    if(!(speed[0] || speed[1])) return;
-    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
-    this.lastScrolled = new Date();
-    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
-  },
-  
-  scroll: function() {
-    var current = new Date();
-    var delta = current - this.lastScrolled;
-    this.lastScrolled = current;
-    if(this.options.scroll == window) {
-      with (this._getWindowScroll(this.options.scroll)) {
-        if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
-          var d = delta / 1000;
-          this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
-        }
-      }
-    } else {
-      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
-      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
-    }
-    
-    Position.prepare();
-    Droppables.show(Draggables._lastPointer, this.element);
-    Draggables.notify('onDrag', this);
-    if (this._isScrollChild) {
-      Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
-      Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
-      Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
-      if (Draggables._lastScrollPointer[0] < 0)
-        Draggables._lastScrollPointer[0] = 0;
-      if (Draggables._lastScrollPointer[1] < 0)
-        Draggables._lastScrollPointer[1] = 0;
-      this.draw(Draggables._lastScrollPointer);
-    }
-    
-    if(this.options.change) this.options.change(this);
-  },
-  
-  _getWindowScroll: function(w) {
-    var T, L, W, H;
-    with (w.document) {
-      if (w.document.documentElement && documentElement.scrollTop) {
-        T = documentElement.scrollTop;
-        L = documentElement.scrollLeft;
-      } else if (w.document.body) {
-        T = body.scrollTop;
-        L = body.scrollLeft;
-      }
-      if (w.innerWidth) {
-        W = w.innerWidth;
-        H = w.innerHeight;
-      } else if (w.document.documentElement && documentElement.clientWidth) {
-        W = documentElement.clientWidth;
-        H = documentElement.clientHeight;
-      } else {
-        W = body.offsetWidth;
-        H = body.offsetHeight
-      }
-    }
-    return { top: T, left: L, width: W, height: H };
-  }
-});
-
-Draggable._dragging = { };
-
-/*--------------------------------------------------------------------------*/
-
-var SortableObserver = Class.create({
-  initialize: function(element, observer) {
-    this.element   = $(element);
-    this.observer  = observer;
-    this.lastValue = Sortable.serialize(this.element);
-  },
-  
-  onStart: function() {
-    this.lastValue = Sortable.serialize(this.element);
-  },
-  
-  onEnd: function() {
-    Sortable.unmark();
-    if(this.lastValue != Sortable.serialize(this.element))
-      this.observer(this.element)
-  }
-});
-
-var Sortable = {
-  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
-  
-  sortables: { },
-  
-  _findRootElement: function(element) {
-    while (element.tagName.toUpperCase() != "BODY") {  
-      if(element.id && Sortable.sortables[element.id]) return element;
-      element = element.parentNode;
-    }
-  },
-
-  options: function(element) {
-    element = Sortable._findRootElement($(element));
-    if(!element) return;
-    return Sortable.sortables[element.id];
-  },
-  
-  destroy: function(element){
-    var s = Sortable.options(element);
-    
-    if(s) {
-      Draggables.removeObserver(s.element);
-      s.droppables.each(function(d){ Droppables.remove(d) });
-      s.draggables.invoke('destroy');
-      
-      delete Sortable.sortables[s.element.id];
-    }
-  },
-
-  create: function(element) {
-    element = $(element);
-    var options = Object.extend({ 
-      element:     element,
-      tag:         'li',       // assumes li children, override with tag: 'tagname'
-      dropOnEmpty: false,
-      tree:        false,
-      treeTag:     'ul',
-      overlap:     'vertical', // one of 'vertical', 'horizontal'
-      constraint:  'vertical', // one of 'vertical', 'horizontal', false
-      containment: element,    // also takes array of elements (or id's); or false
-      handle:      false,      // or a CSS class
-      only:        false,
-      delay:       0,
-      hoverclass:  null,
-      ghosting:    false,
-      quiet:       false, 
-      scroll:      false,
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-      format:      this.SERIALIZE_RULE,
-      
-      // these take arrays of elements or ids and can be 
-      // used for better initialization performance
-      elements:    false,
-      handles:     false,
-      
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
-    }, arguments[1] || { });
-
-    // clear any old sortable with same element
-    this.destroy(element);
-
-    // build options for the draggables
-    var options_for_draggable = {
-      revert:      true,
-      quiet:       options.quiet,
-      scroll:      options.scroll,
-      scrollSpeed: options.scrollSpeed,
-      scrollSensitivity: options.scrollSensitivity,
-      delay:       options.delay,
-      ghosting:    options.ghosting,
-      constraint:  options.constraint,
-      handle:      options.handle };
-
-    if(options.starteffect)
-      options_for_draggable.starteffect = options.starteffect;
-
-    if(options.reverteffect)
-      options_for_draggable.reverteffect = options.reverteffect;
-    else
-      if(options.ghosting) options_for_draggable.reverteffect = function(element) {
-        element.style.top  = 0;
-        element.style.left = 0;
-      };
-
-    if(options.endeffect)
-      options_for_draggable.endeffect = options.endeffect;
-
-    if(options.zindex)
-      options_for_draggable.zindex = options.zindex;
-
-    // build options for the droppables  
-    var options_for_droppable = {
-      overlap:     options.overlap,
-      containment: options.containment,
-      tree:        options.tree,
-      hoverclass:  options.hoverclass,
-      onHover:     Sortable.onHover
-    }
-    
-    var options_for_tree = {
-      onHover:      Sortable.onEmptyHover,
-      overlap:      options.overlap,
-      containment:  options.containment,
-      hoverclass:   options.hoverclass
-    }
-
-    // fix for gecko engine
-    Element.cleanWhitespace(element); 
-
-    options.draggables = [];
-    options.droppables = [];
-
-    // drop on empty handling
-    if(options.dropOnEmpty || options.tree) {
-      Droppables.add(element, options_for_tree);
-      options.droppables.push(element);
-    }
-
-    (options.elements || this.findElements(element, options) || []).each( function(e,i) {
-      var handle = options.handles ? $(options.handles[i]) :
-        (options.handle ? $(e).select('.' + options.handle)[0] : e); 
-      options.draggables.push(
-        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
-      Droppables.add(e, options_for_droppable);
-      if(options.tree) e.treeNode = element;
-      options.droppables.push(e);      
-    });
-    
-    if(options.tree) {
-      (Sortable.findTreeElements(element, options) || []).each( function(e) {
-        Droppables.add(e, options_for_tree);
-        e.treeNode = element;
-        options.droppables.push(e);
-      });
-    }
-
-    // keep reference
-    this.sortables[element.id] = options;
-
-    // for onupdate
-    Draggables.addObserver(new SortableObserver(element, options.onUpdate));
-
-  },
-
-  // return all suitable-for-sortable elements in a guaranteed order
-  findElements: function(element, options) {
-    return Element.findChildren(
-      element, options.only, options.tree ? true : false, options.tag);
-  },
-  
-  findTreeElements: function(element, options) {
-    return Element.findChildren(
-      element, options.only, options.tree ? true : false, options.treeTag);
-  },
-
-  onHover: function(element, dropon, overlap) {
-    if(Element.isParent(dropon, element)) return;
-
-    if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
-      return;
-    } else if(overlap>0.5) {
-      Sortable.mark(dropon, 'before');
-      if(dropon.previousSibling != element) {
-        var oldParentNode = element.parentNode;
-        element.style.visibility = "hidden"; // fix gecko rendering
-        dropon.parentNode.insertBefore(element, dropon);
-        if(dropon.parentNode!=oldParentNode) 
-          Sortable.options(oldParentNode).onChange(element);
-        Sortable.options(dropon.parentNode).onChange(element);
-      }
-    } else {
-      Sortable.mark(dropon, 'after');
-      var nextElement = dropon.nextSibling || null;
-      if(nextElement != element) {
-        var oldParentNode = element.parentNode;
-        element.style.visibility = "hidden"; // fix gecko rendering
-        dropon.parentNode.insertBefore(element, nextElement);
-        if(dropon.parentNode!=oldParentNode) 
-          Sortable.options(oldParentNode).onChange(element);
-        Sortable.options(dropon.parentNode).onChange(element);
-      }
-    }
-  },
-  
-  onEmptyHover: function(element, dropon, overlap) {
-    var oldParentNode = element.parentNode;
-    var droponOptions = Sortable.options(dropon);
-        
-    if(!Element.isParent(dropon, element)) {
-      var index;
-      
-      var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
-      var child = null;
-            
-      if(children) {
-        var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
-        
-        for (index = 0; index < children.length; index += 1) {
-          if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
-            offset -= Element.offsetSize (children[index], droponOptions.overlap);
-          } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
-            child = index + 1 < children.length ? children[index + 1] : null;
-            break;
-          } else {
-            child = children[index];
-            break;
-          }
-        }
-      }
-      
-      dropon.insertBefore(element, child);
-      
-      Sortable.options(oldParentNode).onChange(element);
-      droponOptions.onChange(element);
-    }
-  },
-
-  unmark: function() {
-    if(Sortable._marker) Sortable._marker.hide();
-  },
-
-  mark: function(dropon, position) {
-    // mark on ghosting only
-    var sortable = Sortable.options(dropon.parentNode);
-    if(sortable && !sortable.ghosting) return; 
-
-    if(!Sortable._marker) {
-      Sortable._marker = 
-        ($('dropmarker') || Element.extend(document.createElement('DIV'))).
-          hide().addClassName('dropmarker').setStyle({position:'absolute'});
-      document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
-    }    
-    var offsets = Position.cumulativeOffset(dropon);
-    Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
-    
-    if(position=='after')
-      if(sortable.overlap == 'horizontal') 
-        Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
-      else
-        Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
-    
-    Sortable._marker.show();
-  },
-  
-  _tree: function(element, options, parent) {
-    var children = Sortable.findElements(element, options) || [];
-  
-    for (var i = 0; i < children.length; ++i) {
-      var match = children[i].id.match(options.format);
-
-      if (!match) continue;
-      
-      var child = {
-        id: encodeURIComponent(match ? match[1] : null),
-        element: element,
-        parent: parent,
-        children: [],
-        position: parent.children.length,
-        container: $(children[i]).down(options.treeTag)
-      }
-      
-      /* Get the element containing the children and recurse over it */
-      if (child.container)
-        this._tree(child.container, options, child)
-      
-      parent.children.push (child);
-    }
-
-    return parent; 
-  },
-
-  tree: function(element) {
-    element = $(element);
-    var sortableOptions = this.options(element);
-    var options = Object.extend({
-      tag: sortableOptions.tag,
-      treeTag: sortableOptions.treeTag,
-      only: sortableOptions.only,
-      name: element.id,
-      format: sortableOptions.format
-    }, arguments[1] || { });
-    
-    var root = {
-      id: null,
-      parent: null,
-      children: [],
-      container: element,
-      position: 0
-    }
-    
-    return Sortable._tree(element, options, root);
-  },
-
-  /* Construct a [i] index for a particular node */
-  _constructIndex: function(node) {
-    var index = '';
-    do {
-      if (node.id) index = '[' + node.position + ']' + index;
-    } while ((node = node.parent) != null);
-    return index;
-  },
-
-  sequence: function(element) {
-    element = $(element);
-    var options = Object.extend(this.options(element), arguments[1] || { });
-    
-    return $(this.findElements(element, options) || []).map( function(item) {
-      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
-    });
-  },
-
-  setSequence: function(element, new_sequence) {
-    element = $(element);
-    var options = Object.extend(this.options(element), arguments[2] || { });
-    
-    var nodeMap = { };
-    this.findElements(element, options).each( function(n) {
-        if (n.id.match(options.format))
-            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
-        n.parentNode.removeChild(n);
-    });
-   
-    new_sequence.each(function(ident) {
-      var n = nodeMap[ident];
-      if (n) {
-        n[1].appendChild(n[0]);
-        delete nodeMap[ident];
-      }
-    });
-  },
-  
-  serialize: function(element) {
-    element = $(element);
-    var options = Object.extend(Sortable.options(element), arguments[1] || { });
-    var name = encodeURIComponent(
-      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
-    
-    if (options.tree) {
-      return Sortable.tree(element, arguments[1]).children.map( function (item) {
-        return [name + Sortable._constructIndex(item) + "[id]=" + 
-                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
-      }).flatten().join('&');
-    } else {
-      return Sortable.sequence(element, arguments[1]).map( function(item) {
-        return name + "[]=" + encodeURIComponent(item);
-      }).join('&');
-    }
-  }
-}
-
-// Returns true if child is contained within element
-Element.isParent = function(child, element) {
-  if (!child.parentNode || child == element) return false;
-  if (child.parentNode == element) return true;
-  return Element.isParent(child.parentNode, element);
-}
-
-Element.findChildren = function(element, only, recursive, tagName) {   
-  if(!element.hasChildNodes()) return null;
-  tagName = tagName.toUpperCase();
-  if(only) only = [only].flatten();
-  var elements = [];
-  $A(element.childNodes).each( function(e) {
-    if(e.tagName && e.tagName.toUpperCase()==tagName &&
-      (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
-        elements.push(e);
-    if(recursive) {
-      var grandchildren = Element.findChildren(e, only, recursive, tagName);
-      if(grandchildren) elements.push(grandchildren);
-    }
-  });
-
-  return (elements.length>0 ? elements.flatten() : []);
-}
-
-Element.offsetSize = function (element, type) {
-  return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
-}
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/effects.js b/mp-wp/wp-includes/js/scriptaculous/effects.js
--- a/mp-wp/wp-includes/js/scriptaculous/effects.js 8d811c88ceeea3f18f44c44f87aaae52f5e5d5c242edcaee6e7adfd440ade0bc037117fc3f2ced34df3b3646d8002f0cd11ebe2c0f6e18487fd1526882fbae5e
+++ b/mp-wp/wp-includes/js/scriptaculous/effects.js false
@@ -1,1122 +0,0 @@
-// script.aculo.us effects.js v1.8.0, Tue Nov 06 15:01:40 +0300 2007
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// Contributors:
-//  Justin Palmer (http://encytemedia.com/)
-//  Mark Pilgrim (http://diveintomark.org/)
-//  Martin Bialasinki
-// 
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/ 
-
-// converts rgb() and #xxx to #xxxxxx format,  
-// returns self (or first argument) if not convertable  
-String.prototype.parseColor = function() {  
-  var color = '#';
-  if (this.slice(0,4) == 'rgb(') {  
-    var cols = this.slice(4,this.length-1).split(',');  
-    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);  
-  } else {  
-    if (this.slice(0,1) == '#') {  
-      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();  
-      if (this.length==7) color = this.toLowerCase();  
-    }  
-  }  
-  return (color.length==7 ? color : (arguments[0] || this));  
-};
-
-/*--------------------------------------------------------------------------*/
-
-Element.collectTextNodes = function(element) {  
-  return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue : 
-      (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
-  }).flatten().join('');
-};
-
-Element.collectTextNodesIgnoreClass = function(element, className) {  
-  return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue : 
-      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? 
-        Element.collectTextNodesIgnoreClass(node, className) : ''));
-  }).flatten().join('');
-};
-
-Element.setContentZoom = function(element, percent) {
-  element = $(element);  
-  element.setStyle({fontSize: (percent/100) + 'em'});   
-  if (Prototype.Browser.WebKit) window.scrollBy(0,0);
-  return element;
-};
-
-Element.getInlineOpacity = function(element){
-  return $(element).style.opacity || '';
-};
-
-Element.forceRerendering = function(element) {
-  try {
-    element = $(element);
-    var n = document.createTextNode(' ');
-    element.appendChild(n);
-    element.removeChild(n);
-  } catch(e) { }
-};
-
-/*--------------------------------------------------------------------------*/
-
-var Effect = {
-  _elementDoesNotExistError: {
-    name: 'ElementDoesNotExistError',
-    message: 'The specified DOM element does not exist, but is required for this effect to operate'
-  },
-  Transitions: {
-    linear: Prototype.K,
-    sinoidal: function(pos) {
-      return (-Math.cos(pos*Math.PI)/2) + 0.5;
-    },
-    reverse: function(pos) {
-      return 1-pos;
-    },
-    flicker: function(pos) {
-      var pos = ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
-      return pos > 1 ? 1 : pos;
-    },
-    wobble: function(pos) {
-      return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
-    },
-    pulse: function(pos, pulses) { 
-      pulses = pulses || 5; 
-      return (
-        ((pos % (1/pulses)) * pulses).round() == 0 ? 
-              ((pos * pulses * 2) - (pos * pulses * 2).floor()) : 
-          1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
-        );
-    },
-    spring: function(pos) { 
-      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); 
-    },
-    none: function(pos) {
-      return 0;
-    },
-    full: function(pos) {
-      return 1;
-    }
-  },
-  DefaultOptions: {
-    duration:   1.0,   // seconds
-    fps:        100,   // 100= assume 66fps max.
-    sync:       false, // true for combining
-    from:       0.0,
-    to:         1.0,
-    delay:      0.0,
-    queue:      'parallel'
-  },
-  tagifyText: function(element) {
-    var tagifyStyle = 'position:relative';
-    if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
-    
-    element = $(element);
-    $A(element.childNodes).each( function(child) {
-      if (child.nodeType==3) {
-        child.nodeValue.toArray().each( function(character) {
-          element.insertBefore(
-            new Element('span', {style: tagifyStyle}).update(
-              character == ' ' ? String.fromCharCode(160) : character), 
-              child);
-        });
-        Element.remove(child);
-      }
-    });
-  },
-  multiple: function(element, effect) {
-    var elements;
-    if (((typeof element == 'object') || 
-        Object.isFunction(element)) && 
-       (element.length))
-      elements = element;
-    else
-      elements = $(element).childNodes;
-      
-    var options = Object.extend({
-      speed: 0.1,
-      delay: 0.0
-    }, arguments[2] || { });
-    var masterDelay = options.delay;
-
-    $A(elements).each( function(element, index) {
-      new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
-    });
-  },
-  PAIRS: {
-    'slide':  ['SlideDown','SlideUp'],
-    'blind':  ['BlindDown','BlindUp'],
-    'appear': ['Appear','Fade']
-  },
-  toggle: function(element, effect) {
-    element = $(element);
-    effect = (effect || 'appear').toLowerCase();
-    var options = Object.extend({
-      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
-    }, arguments[2] || { });
-    Effect[element.visible() ? 
-      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
-  }
-};
-
-Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
-
-/* ------------- core effects ------------- */
-
-Effect.ScopedQueue = Class.create(Enumerable, {
-  initialize: function() {
-    this.effects  = [];
-    this.interval = null;    
-  },
-  _each: function(iterator) {
-    this.effects._each(iterator);
-  },
-  add: function(effect) {
-    var timestamp = new Date().getTime();
-    
-    var position = Object.isString(effect.options.queue) ? 
-      effect.options.queue : effect.options.queue.position;
-    
-    switch(position) {
-      case 'front':
-        // move unstarted effects after this effect  
-        this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
-            e.startOn  += effect.finishOn;
-            e.finishOn += effect.finishOn;
-          });
-        break;
-      case 'with-last':
-        timestamp = this.effects.pluck('startOn').max() || timestamp;
-        break;
-      case 'end':
-        // start effect after last queued effect has finished
-        timestamp = this.effects.pluck('finishOn').max() || timestamp;
-        break;
-    }
-    
-    effect.startOn  += timestamp;
-    effect.finishOn += timestamp;
-
-    if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
-      this.effects.push(effect);
-    
-    if (!this.interval)
-      this.interval = setInterval(this.loop.bind(this), 15);
-  },
-  remove: function(effect) {
-    this.effects = this.effects.reject(function(e) { return e==effect });
-    if (this.effects.length == 0) {
-      clearInterval(this.interval);
-      this.interval = null;
-    }
-  },
-  loop: function() {
-    var timePos = new Date().getTime();
-    for(var i=0, len=this.effects.length;i<len;i++) 
-      this.effects[i] && this.effects[i].loop(timePos);
-  }
-});
-
-Effect.Queues = {
-  instances: $H(),
-  get: function(queueName) {
-    if (!Object.isString(queueName)) return queueName;
-    
-    return this.instances.get(queueName) ||
-      this.instances.set(queueName, new Effect.ScopedQueue());
-  }
-};
-Effect.Queue = Effect.Queues.get('global');
-
-Effect.Base = Class.create({
-  position: null,
-  start: function(options) {
-    function codeForEvent(options,eventName){
-      return (
-        (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
-        (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
-      );
-    }
-    if (options && options.transition === false) options.transition = Effect.Transitions.linear;
-    this.options      = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
-    this.currentFrame = 0;
-    this.state        = 'idle';
-    this.startOn      = this.options.delay*1000;
-    this.finishOn     = this.startOn+(this.options.duration*1000);
-    this.fromToDelta  = this.options.to-this.options.from;
-    this.totalTime    = this.finishOn-this.startOn;
-    this.totalFrames  = this.options.fps*this.options.duration;
-    
-    eval('this.render = function(pos){ '+
-      'if (this.state=="idle"){this.state="running";'+
-      codeForEvent(this.options,'beforeSetup')+
-      (this.setup ? 'this.setup();':'')+ 
-      codeForEvent(this.options,'afterSetup')+
-      '};if (this.state=="running"){'+
-      'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
-      'this.position=pos;'+
-      codeForEvent(this.options,'beforeUpdate')+
-      (this.update ? 'this.update(pos);':'')+
-      codeForEvent(this.options,'afterUpdate')+
-      '}}');
-    
-    this.event('beforeStart');
-    if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ? 
-        'global' : this.options.queue.scope).add(this);
-  },
-  loop: function(timePos) {
-    if (timePos >= this.startOn) {
-      if (timePos >= this.finishOn) {
-        this.render(1.0);
-        this.cancel();
-        this.event('beforeFinish');
-        if (this.finish) this.finish(); 
-        this.event('afterFinish');
-        return;  
-      }
-      var pos   = (timePos - this.startOn) / this.totalTime,
-          frame = (pos * this.totalFrames).round();
-      if (frame > this.currentFrame) {
-        this.render(pos);
-        this.currentFrame = frame;
-      }
-    }
-  },
-  cancel: function() {
-    if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ? 
-        'global' : this.options.queue.scope).remove(this);
-    this.state = 'finished';
-  },
-  event: function(eventName) {
-    if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
-    if (this.options[eventName]) this.options[eventName](this);
-  },
-  inspect: function() {
-    var data = $H();
-    for(property in this)
-      if (!Object.isFunction(this[property])) data.set(property, this[property]);
-    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
-  }
-});
-
-Effect.Parallel = Class.create(Effect.Base, {
-  initialize: function(effects) {
-    this.effects = effects || [];
-    this.start(arguments[1]);
-  },
-  update: function(position) {
-    this.effects.invoke('render', position);
-  },
-  finish: function(position) {
-    this.effects.each( function(effect) {
-      effect.render(1.0);
-      effect.cancel();
-      effect.event('beforeFinish');
-      if (effect.finish) effect.finish(position);
-      effect.event('afterFinish');
-    });
-  }
-});
-
-Effect.Tween = Class.create(Effect.Base, {
-  initialize: function(object, from, to) {
-    object = Object.isString(object) ? $(object) : object;
-    var args = $A(arguments), method = args.last(), 
-      options = args.length == 5 ? args[3] : null;
-    this.method = Object.isFunction(method) ? method.bind(object) :
-      Object.isFunction(object[method]) ? object[method].bind(object) : 
-      function(value) { object[method] = value };
-    this.start(Object.extend({ from: from, to: to }, options || { }));
-  },
-  update: function(position) {
-    this.method(position);
-  }
-});
-
-Effect.Event = Class.create(Effect.Base, {
-  initialize: function() {
-    this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
-  },
-  update: Prototype.emptyFunction
-});
-
-Effect.Opacity = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    // make this work on IE on elements without 'layout'
-    if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
-      this.element.setStyle({zoom: 1});
-    var options = Object.extend({
-      from: this.element.getOpacity() || 0.0,
-      to:   1.0
-    }, arguments[1] || { });
-    this.start(options);
-  },
-  update: function(position) {
-    this.element.setOpacity(position);
-  }
-});
-
-Effect.Move = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      x:    0,
-      y:    0,
-      mode: 'relative'
-    }, arguments[1] || { });
-    this.start(options);
-  },
-  setup: function() {
-    this.element.makePositioned();
-    this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
-    this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
-    if (this.options.mode == 'absolute') {
-      this.options.x = this.options.x - this.originalLeft;
-      this.options.y = this.options.y - this.originalTop;
-    }
-  },
-  update: function(position) {
-    this.element.setStyle({
-      left: (this.options.x  * position + this.originalLeft).round() + 'px',
-      top:  (this.options.y  * position + this.originalTop).round()  + 'px'
-    });
-  }
-});
-
-// for backwards compatibility
-Effect.MoveBy = function(element, toTop, toLeft) {
-  return new Effect.Move(element, 
-    Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
-};
-
-Effect.Scale = Class.create(Effect.Base, {
-  initialize: function(element, percent) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      scaleX: true,
-      scaleY: true,
-      scaleContent: true,
-      scaleFromCenter: false,
-      scaleMode: 'box',        // 'box' or 'contents' or { } with provided values
-      scaleFrom: 100.0,
-      scaleTo:   percent
-    }, arguments[2] || { });
-    this.start(options);
-  },
-  setup: function() {
-    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
-    this.elementPositioning = this.element.getStyle('position');
-    
-    this.originalStyle = { };
-    ['top','left','width','height','fontSize'].each( function(k) {
-      this.originalStyle[k] = this.element.style[k];
-    }.bind(this));
-      
-    this.originalTop  = this.element.offsetTop;
-    this.originalLeft = this.element.offsetLeft;
-    
-    var fontSize = this.element.getStyle('font-size') || '100%';
-    ['em','px','%','pt'].each( function(fontSizeType) {
-      if (fontSize.indexOf(fontSizeType)>0) {
-        this.fontSize     = parseFloat(fontSize);
-        this.fontSizeType = fontSizeType;
-      }
-    }.bind(this));
-    
-    this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
-    
-    this.dims = null;
-    if (this.options.scaleMode=='box')
-      this.dims = [this.element.offsetHeight, this.element.offsetWidth];
-    if (/^content/.test(this.options.scaleMode))
-      this.dims = [this.element.scrollHeight, this.element.scrollWidth];
-    if (!this.dims)
-      this.dims = [this.options.scaleMode.originalHeight,
-                   this.options.scaleMode.originalWidth];
-  },
-  update: function(position) {
-    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
-    if (this.options.scaleContent && this.fontSize)
-      this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
-    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
-  },
-  finish: function(position) {
-    if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
-  },
-  setDimensions: function(height, width) {
-    var d = { };
-    if (this.options.scaleX) d.width = width.round() + 'px';
-    if (this.options.scaleY) d.height = height.round() + 'px';
-    if (this.options.scaleFromCenter) {
-      var topd  = (height - this.dims[0])/2;
-      var leftd = (width  - this.dims[1])/2;
-      if (this.elementPositioning == 'absolute') {
-        if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
-        if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
-      } else {
-        if (this.options.scaleY) d.top = -topd + 'px';
-        if (this.options.scaleX) d.left = -leftd + 'px';
-      }
-    }
-    this.element.setStyle(d);
-  }
-});
-
-Effect.Highlight = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
-    this.start(options);
-  },
-  setup: function() {
-    // Prevent executing on elements not in the layout flow
-    if (this.element.getStyle('display')=='none') { this.cancel(); return; }
-    // Disable background image during the effect
-    this.oldStyle = { };
-    if (!this.options.keepBackgroundImage) {
-      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
-      this.element.setStyle({backgroundImage: 'none'});
-    }
-    if (!this.options.endcolor)
-      this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
-    if (!this.options.restorecolor)
-      this.options.restorecolor = this.element.getStyle('background-color');
-    // init color calculations
-    this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
-    this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
-  },
-  update: function(position) {
-    this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
-      return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
-  },
-  finish: function() {
-    this.element.setStyle(Object.extend(this.oldStyle, {
-      backgroundColor: this.options.restorecolor
-    }));
-  }
-});
-
-Effect.ScrollTo = function(element) {
-  var options = arguments[1] || { },
-    scrollOffsets = document.viewport.getScrollOffsets(),
-    elementOffsets = $(element).cumulativeOffset(),
-    max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();  
-
-  if (options.offset) elementOffsets[1] += options.offset;
-
-  return new Effect.Tween(null,
-    scrollOffsets.top,
-    elementOffsets[1] > max ? max : elementOffsets[1],
-    options,
-    function(p){ scrollTo(scrollOffsets.left, p.round()) }
-  );
-};
-
-/* ------------- combination effects ------------- */
-
-Effect.Fade = function(element) {
-  element = $(element);
-  var oldOpacity = element.getInlineOpacity();
-  var options = Object.extend({
-    from: element.getOpacity() || 1.0,
-    to:   0.0,
-    afterFinishInternal: function(effect) { 
-      if (effect.options.to!=0) return;
-      effect.element.hide().setStyle({opacity: oldOpacity}); 
-    }
-  }, arguments[1] || { });
-  return new Effect.Opacity(element,options);
-};
-
-Effect.Appear = function(element) {
-  element = $(element);
-  var options = Object.extend({
-  from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
-  to:   1.0,
-  // force Safari to render floated elements properly
-  afterFinishInternal: function(effect) {
-    effect.element.forceRerendering();
-  },
-  beforeSetup: function(effect) {
-    effect.element.setOpacity(effect.options.from).show(); 
-  }}, arguments[1] || { });
-  return new Effect.Opacity(element,options);
-};
-
-Effect.Puff = function(element) {
-  element = $(element);
-  var oldStyle = { 
-    opacity: element.getInlineOpacity(), 
-    position: element.getStyle('position'),
-    top:  element.style.top,
-    left: element.style.left,
-    width: element.style.width,
-    height: element.style.height
-  };
-  return new Effect.Parallel(
-   [ new Effect.Scale(element, 200, 
-      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), 
-     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], 
-     Object.extend({ duration: 1.0, 
-      beforeSetupInternal: function(effect) {
-        Position.absolutize(effect.effects[0].element)
-      },
-      afterFinishInternal: function(effect) {
-         effect.effects[0].element.hide().setStyle(oldStyle); }
-     }, arguments[1] || { })
-   );
-};
-
-Effect.BlindUp = function(element) {
-  element = $(element);
-  element.makeClipping();
-  return new Effect.Scale(element, 0,
-    Object.extend({ scaleContent: false, 
-      scaleX: false, 
-      restoreAfterFinish: true,
-      afterFinishInternal: function(effect) {
-        effect.element.hide().undoClipping();
-      } 
-    }, arguments[1] || { })
-  );
-};
-
-Effect.BlindDown = function(element) {
-  element = $(element);
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({ 
-    scaleContent: false, 
-    scaleX: false,
-    scaleFrom: 0,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
-    },  
-    afterFinishInternal: function(effect) {
-      effect.element.undoClipping();
-    }
-  }, arguments[1] || { }));
-};
-
-Effect.SwitchOff = function(element) {
-  element = $(element);
-  var oldOpacity = element.getInlineOpacity();
-  return new Effect.Appear(element, Object.extend({
-    duration: 0.4,
-    from: 0,
-    transition: Effect.Transitions.flicker,
-    afterFinishInternal: function(effect) {
-      new Effect.Scale(effect.element, 1, { 
-        duration: 0.3, scaleFromCenter: true,
-        scaleX: false, scaleContent: false, restoreAfterFinish: true,
-        beforeSetup: function(effect) { 
-          effect.element.makePositioned().makeClipping();
-        },
-        afterFinishInternal: function(effect) {
-          effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
-        }
-      })
-    }
-  }, arguments[1] || { }));
-};
-
-Effect.DropOut = function(element) {
-  element = $(element);
-  var oldStyle = {
-    top: element.getStyle('top'),
-    left: element.getStyle('left'),
-    opacity: element.getInlineOpacity() };
-  return new Effect.Parallel(
-    [ new Effect.Move(element, {x: 0, y: 100, sync: true }), 
-      new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
-    Object.extend(
-      { duration: 0.5,
-        beforeSetup: function(effect) {
-          effect.effects[0].element.makePositioned(); 
-        },
-        afterFinishInternal: function(effect) {
-          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
-        } 
-      }, arguments[1] || { }));
-};
-
-Effect.Shake = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    distance: 20,
-    duration: 0.5
-  }, arguments[1] || {});
-  var distance = parseFloat(options.distance);
-  var split = parseFloat(options.duration) / 10.0;
-  var oldStyle = {
-    top: element.getStyle('top'),
-    left: element.getStyle('left') };
-    return new Effect.Move(element,
-      { x:  distance, y: 0, duration: split, afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
-        effect.element.undoPositioned().setStyle(oldStyle);
-  }}) }}) }}) }}) }}) }});
-};
-
-Effect.SlideDown = function(element) {
-  element = $(element).cleanWhitespace();
-  // SlideDown need to have the content of the element wrapped in a container element with fixed height!
-  var oldInnerBottom = element.down().getStyle('bottom');
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({ 
-    scaleContent: false, 
-    scaleX: false, 
-    scaleFrom: window.opera ? 0 : 1,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makePositioned();
-      effect.element.down().makePositioned();
-      if (window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
-    },
-    afterUpdateInternal: function(effect) {
-      effect.element.down().setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' }); 
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.undoClipping().undoPositioned();
-      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
-    }, arguments[1] || { })
-  );
-};
-
-Effect.SlideUp = function(element) {
-  element = $(element).cleanWhitespace();
-  var oldInnerBottom = element.down().getStyle('bottom');
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, window.opera ? 0 : 1,
-   Object.extend({ scaleContent: false, 
-    scaleX: false, 
-    scaleMode: 'box',
-    scaleFrom: 100,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makePositioned();
-      effect.element.down().makePositioned();
-      if (window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping().show();
-    },  
-    afterUpdateInternal: function(effect) {
-      effect.element.down().setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' });
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping().undoPositioned();
-      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
-    }
-   }, arguments[1] || { })
-  );
-};
-
-// Bug in opera makes the TD containing this element expand for a instance after finish 
-Effect.Squish = function(element) {
-  return new Effect.Scale(element, window.opera ? 1 : 0, { 
-    restoreAfterFinish: true,
-    beforeSetup: function(effect) {
-      effect.element.makeClipping(); 
-    },  
-    afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping(); 
-    }
-  });
-};
-
-Effect.Grow = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    direction: 'center',
-    moveTransition: Effect.Transitions.sinoidal,
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.full
-  }, arguments[1] || { });
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    height: element.style.height,
-    width: element.style.width,
-    opacity: element.getInlineOpacity() };
-
-  var dims = element.getDimensions();    
-  var initialMoveX, initialMoveY;
-  var moveX, moveY;
-  
-  switch (options.direction) {
-    case 'top-left':
-      initialMoveX = initialMoveY = moveX = moveY = 0; 
-      break;
-    case 'top-right':
-      initialMoveX = dims.width;
-      initialMoveY = moveY = 0;
-      moveX = -dims.width;
-      break;
-    case 'bottom-left':
-      initialMoveX = moveX = 0;
-      initialMoveY = dims.height;
-      moveY = -dims.height;
-      break;
-    case 'bottom-right':
-      initialMoveX = dims.width;
-      initialMoveY = dims.height;
-      moveX = -dims.width;
-      moveY = -dims.height;
-      break;
-    case 'center':
-      initialMoveX = dims.width / 2;
-      initialMoveY = dims.height / 2;
-      moveX = -dims.width / 2;
-      moveY = -dims.height / 2;
-      break;
-  }
-  
-  return new Effect.Move(element, {
-    x: initialMoveX,
-    y: initialMoveY,
-    duration: 0.01, 
-    beforeSetup: function(effect) {
-      effect.element.hide().makeClipping().makePositioned();
-    },
-    afterFinishInternal: function(effect) {
-      new Effect.Parallel(
-        [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
-          new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
-          new Effect.Scale(effect.element, 100, {
-            scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, 
-            sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
-        ], Object.extend({
-             beforeSetup: function(effect) {
-               effect.effects[0].element.setStyle({height: '0px'}).show(); 
-             },
-             afterFinishInternal: function(effect) {
-               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); 
-             }
-           }, options)
-      )
-    }
-  });
-};
-
-Effect.Shrink = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    direction: 'center',
-    moveTransition: Effect.Transitions.sinoidal,
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.none
-  }, arguments[1] || { });
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    height: element.style.height,
-    width: element.style.width,
-    opacity: element.getInlineOpacity() };
-
-  var dims = element.getDimensions();
-  var moveX, moveY;
-  
-  switch (options.direction) {
-    case 'top-left':
-      moveX = moveY = 0;
-      break;
-    case 'top-right':
-      moveX = dims.width;
-      moveY = 0;
-      break;
-    case 'bottom-left':
-      moveX = 0;
-      moveY = dims.height;
-      break;
-    case 'bottom-right':
-      moveX = dims.width;
-      moveY = dims.height;
-      break;
-    case 'center':  
-      moveX = dims.width / 2;
-      moveY = dims.height / 2;
-      break;
-  }
-  
-  return new Effect.Parallel(
-    [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
-      new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
-      new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
-    ], Object.extend({            
-         beforeStartInternal: function(effect) {
-           effect.effects[0].element.makePositioned().makeClipping(); 
-         },
-         afterFinishInternal: function(effect) {
-           effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
-       }, options)
-  );
-};
-
-Effect.Pulsate = function(element) {
-  element = $(element);
-  var options    = arguments[1] || { };
-  var oldOpacity = element.getInlineOpacity();
-  var transition = options.transition || Effect.Transitions.sinoidal;
-  var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
-  reverser.bind(transition);
-  return new Effect.Opacity(element, 
-    Object.extend(Object.extend({  duration: 2.0, from: 0,
-      afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
-    }, options), {transition: reverser}));
-};
-
-Effect.Fold = function(element) {
-  element = $(element);
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    width: element.style.width,
-    height: element.style.height };
-  element.makeClipping();
-  return new Effect.Scale(element, 5, Object.extend({   
-    scaleContent: false,
-    scaleX: false,
-    afterFinishInternal: function(effect) {
-    new Effect.Scale(element, 1, { 
-      scaleContent: false, 
-      scaleY: false,
-      afterFinishInternal: function(effect) {
-        effect.element.hide().undoClipping().setStyle(oldStyle);
-      } });
-  }}, arguments[1] || { }));
-};
-
-Effect.Morph = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      style: { }
-    }, arguments[1] || { });
-    
-    if (!Object.isString(options.style)) this.style = $H(options.style);
-    else {
-      if (options.style.include(':'))
-        this.style = options.style.parseStyle();
-      else {
-        this.element.addClassName(options.style);
-        this.style = $H(this.element.getStyles());
-        this.element.removeClassName(options.style);
-        var css = this.element.getStyles();
-        this.style = this.style.reject(function(style) {
-          return style.value == css[style.key];
-        });
-        options.afterFinishInternal = function(effect) {
-          effect.element.addClassName(effect.options.style);
-          effect.transforms.each(function(transform) {
-            effect.element.style[transform.style] = '';
-          });
-        }
-      }
-    }
-    this.start(options);
-  },
-  
-  setup: function(){
-    function parseColor(color){
-      if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
-      color = color.parseColor();
-      return $R(0,2).map(function(i){
-        return parseInt( color.slice(i*2+1,i*2+3), 16 ) 
-      });
-    }
-    this.transforms = this.style.map(function(pair){
-      var property = pair[0], value = pair[1], unit = null;
-
-      if (value.parseColor('#zzzzzz') != '#zzzzzz') {
-        value = value.parseColor();
-        unit  = 'color';
-      } else if (property == 'opacity') {
-        value = parseFloat(value);
-        if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
-          this.element.setStyle({zoom: 1});
-      } else if (Element.CSS_LENGTH.test(value)) {
-          var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
-          value = parseFloat(components[1]);
-          unit = (components.length == 3) ? components[2] : null;
-      }
-
-      var originalValue = this.element.getStyle(property);
-      return { 
-        style: property.camelize(), 
-        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), 
-        targetValue: unit=='color' ? parseColor(value) : value,
-        unit: unit
-      };
-    }.bind(this)).reject(function(transform){
-      return (
-        (transform.originalValue == transform.targetValue) ||
-        (
-          transform.unit != 'color' &&
-          (isNaN(transform.originalValue) || isNaN(transform.targetValue))
-        )
-      )
-    });
-  },
-  update: function(position) {
-    var style = { }, transform, i = this.transforms.length;
-    while(i--)
-      style[(transform = this.transforms[i]).style] = 
-        transform.unit=='color' ? '#'+
-          (Math.round(transform.originalValue[0]+
-            (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
-          (Math.round(transform.originalValue[1]+
-            (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
-          (Math.round(transform.originalValue[2]+
-            (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
-        (transform.originalValue +
-          (transform.targetValue - transform.originalValue) * position).toFixed(3) + 
-            (transform.unit === null ? '' : transform.unit);
-    this.element.setStyle(style, true);
-  }
-});
-
-Effect.Transform = Class.create({
-  initialize: function(tracks){
-    this.tracks  = [];
-    this.options = arguments[1] || { };
-    this.addTracks(tracks);
-  },
-  addTracks: function(tracks){
-    tracks.each(function(track){
-      track = $H(track);
-      var data = track.values().first();
-      this.tracks.push($H({
-        ids:     track.keys().first(),
-        effect:  Effect.Morph,
-        options: { style: data }
-      }));
-    }.bind(this));
-    return this;
-  },
-  play: function(){
-    return new Effect.Parallel(
-      this.tracks.map(function(track){
-        var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
-        var elements = [$(ids) || $$(ids)].flatten();
-        return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
-      }).flatten(),
-      this.options
-    );
-  }
-});
-
-Element.CSS_PROPERTIES = $w(
-  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + 
-  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
-  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
-  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
-  'fontSize fontWeight height left letterSpacing lineHeight ' +
-  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
-  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
-  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
-  'right textIndent top width wordSpacing zIndex');
-  
-Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
-
-String.__parseStyleElement = document.createElement('div');
-String.prototype.parseStyle = function(){
-  var style, styleRules = $H();
-  if (Prototype.Browser.WebKit)
-    style = new Element('div',{style:this}).style;
-  else {
-    String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
-    style = String.__parseStyleElement.childNodes[0].style;
-  }
-  
-  Element.CSS_PROPERTIES.each(function(property){
-    if (style[property]) styleRules.set(property, style[property]); 
-  });
-  
-  if (Prototype.Browser.IE && this.include('opacity'))
-    styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
-
-  return styleRules;
-};
-
-if (document.defaultView && document.defaultView.getComputedStyle) {
-  Element.getStyles = function(element) {
-    var css = document.defaultView.getComputedStyle($(element), null);
-    return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
-      styles[property] = css[property];
-      return styles;
-    });
-  };
-} else {
-  Element.getStyles = function(element) {
-    element = $(element);
-    var css = element.currentStyle, styles;
-    styles = Element.CSS_PROPERTIES.inject({ }, function(hash, property) {
-      hash.set(property, css[property]);
-      return hash;
-    });
-    if (!styles.opacity) styles.set('opacity', element.getOpacity());
-    return styles;
-  };
-};
-
-Effect.Methods = {
-  morph: function(element, style) {
-    element = $(element);
-    new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
-    return element;
-  },
-  visualEffect: function(element, effect, options) {
-    element = $(element)
-    var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
-    new Effect[klass](element, options);
-    return element;
-  },
-  highlight: function(element, options) {
-    element = $(element);
-    new Effect.Highlight(element, options);
-    return element;
-  }
-};
-
-$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
-  'pulsate shake puff squish switchOff dropOut').each(
-  function(effect) { 
-    Effect.Methods[effect] = function(element, options){
-      element = $(element);
-      Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
-      return element;
-    }
-  }
-);
-
-$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( 
-  function(f) { Effect.Methods[f] = Element[f]; }
-);
-
-Element.addMethods(Effect.Methods);
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/prototype.js b/mp-wp/wp-includes/js/scriptaculous/prototype.js
--- a/mp-wp/wp-includes/js/scriptaculous/prototype.js 066cb61e50765a665d7a67d70150fdd04668dab0d87c5b98eb13fdccbab0c79e1dd904c870c73c8871ddd2a2ea20f0975f10cc0d7643fb00d12b9d414a4d6e29
+++ b/mp-wp/wp-includes/js/scriptaculous/prototype.js false
@@ -1,4184 +0,0 @@
-/*  Prototype JavaScript framework, version 1.6.0
- *  (c) 2005-2007 Sam Stephenson
- *
- *  Prototype is freely distributable under the terms of an MIT-style license.
- *  For details, see the Prototype web site: http://www.prototypejs.org/
- *
- *--------------------------------------------------------------------------*/
-
-var Prototype = {
-  Version: '1.6.0',
-
-  Browser: {
-    IE:     !!(window.attachEvent && !window.opera),
-    Opera:  !!window.opera,
-    WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
-    Gecko:  navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1,
-    MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
-  },
-
-  BrowserFeatures: {
-    XPath: !!document.evaluate,
-    ElementExtensions: !!window.HTMLElement,
-    SpecificElementExtensions:
-      document.createElement('div').__proto__ &&
-      document.createElement('div').__proto__ !==
-        document.createElement('form').__proto__
-  },
-
-  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
-  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
-
-  emptyFunction: function() { },
-  K: function(x) { return x }
-};
-
-if (Prototype.Browser.MobileSafari)
-  Prototype.BrowserFeatures.SpecificElementExtensions = false;
-
-if (Prototype.Browser.WebKit)
-  Prototype.BrowserFeatures.XPath = false;
-
-/* Based on Alex Arnell's inheritance implementation. */
-var Class = {
-  create: function() {
-    var parent = null, properties = $A(arguments);
-    if (Object.isFunction(properties[0]))
-      parent = properties.shift();
-
-    function klass() {
-      this.initialize.apply(this, arguments);
-    }
-
-    Object.extend(klass, Class.Methods);
-    klass.superclass = parent;
-    klass.subclasses = [];
-
-    if (parent) {
-      var subclass = function() { };
-      subclass.prototype = parent.prototype;
-      klass.prototype = new subclass;
-      parent.subclasses.push(klass);
-    }
-
-    for (var i = 0; i < properties.length; i++)
-      klass.addMethods(properties[i]);
-
-    if (!klass.prototype.initialize)
-      klass.prototype.initialize = Prototype.emptyFunction;
-
-    klass.prototype.constructor = klass;
-
-    return klass;
-  }
-};
-
-Class.Methods = {
-  addMethods: function(source) {
-    var ancestor   = this.superclass && this.superclass.prototype;
-    var properties = Object.keys(source);
-
-    if (!Object.keys({ toString: true }).length)
-      properties.push("toString", "valueOf");
-
-    for (var i = 0, length = properties.length; i < length; i++) {
-      var property = properties[i], value = source[property];
-      if (ancestor && Object.isFunction(value) &&
-          value.argumentNames().first() == "$super") {
-        var method = value, value = Object.extend((function(m) {
-          return function() { return ancestor[m].apply(this, arguments) };
-        })(property).wrap(method), {
-          valueOf:  function() { return method },
-          toString: function() { return method.toString() }
-        });
-      }
-      this.prototype[property] = value;
-    }
-
-    return this;
-  }
-};
-
-var Abstract = { };
-
-Object.extend = function(destination, source) {
-  for (var property in source)
-    destination[property] = source[property];
-  return destination;
-};
-
-Object.extend(Object, {
-  inspect: function(object) {
-    try {
-      if (object === undefined) return 'undefined';
-      if (object === null) return 'null';
-      return object.inspect ? object.inspect() : object.toString();
-    } catch (e) {
-      if (e instanceof RangeError) return '...';
-      throw e;
-    }
-  },
-
-  toJSON: function(object) {
-    var type = typeof object;
-    switch (type) {
-      case 'undefined':
-      case 'function':
-      case 'unknown': return;
-      case 'boolean': return object.toString();
-    }
-
-    if (object === null) return 'null';
-    if (object.toJSON) return object.toJSON();
-    if (Object.isElement(object)) return;
-
-    var results = [];
-    for (var property in object) {
-      var value = Object.toJSON(object[property]);
-      if (value !== undefined)
-        results.push(property.toJSON() + ': ' + value);
-    }
-
-    return '{' + results.join(', ') + '}';
-  },
-
-  toQueryString: function(object) {
-    return $H(object).toQueryString();
-  },
-
-  toHTML: function(object) {
-    return object && object.toHTML ? object.toHTML() : String.interpret(object);
-  },
-
-  keys: function(object) {
-    var keys = [];
-    for (var property in object)
-      keys.push(property);
-    return keys;
-  },
-
-  values: function(object) {
-    var values = [];
-    for (var property in object)
-      values.push(object[property]);
-    return values;
-  },
-
-  clone: function(object) {
-    return Object.extend({ }, object);
-  },
-
-  isElement: function(object) {
-    return object && object.nodeType == 1;
-  },
-
-  isArray: function(object) {
-    return object && object.constructor === Array;
-  },
-
-  isHash: function(object) {
-    return object instanceof Hash;
-  },
-
-  isFunction: function(object) {
-    return typeof object == "function";
-  },
-
-  isString: function(object) {
-    return typeof object == "string";
-  },
-
-  isNumber: function(object) {
-    return typeof object == "number";
-  },
-
-  isUndefined: function(object) {
-    return typeof object == "undefined";
-  }
-});
-
-Object.extend(Function.prototype, {
-  argumentNames: function() {
-    var names = this.toString().match(/^[\s\(]*function[^(]*\((.*?)\)/)[1].split(",").invoke("strip");
-    return names.length == 1 && !names[0] ? [] : names;
-  },
-
-  bind: function() {
-    if (arguments.length < 2 && arguments[0] === undefined) return this;
-    var __method = this, args = $A(arguments), object = args.shift();
-    return function() {
-      return __method.apply(object, args.concat($A(arguments)));
-    }
-  },
-
-  bindAsEventListener: function() {
-    var __method = this, args = $A(arguments), object = args.shift();
-    return function(event) {
-      return __method.apply(object, [event || window.event].concat(args));
-    }
-  },
-
-  curry: function() {
-    if (!arguments.length) return this;
-    var __method = this, args = $A(arguments);
-    return function() {
-      return __method.apply(this, args.concat($A(arguments)));
-    }
-  },
-
-  delay: function() {
-    var __method = this, args = $A(arguments), timeout = args.shift() * 1000;
-    return window.setTimeout(function() {
-      return __method.apply(__method, args);
-    }, timeout);
-  },
-
-  wrap: function(wrapper) {
-    var __method = this;
-    return function() {
-      return wrapper.apply(this, [__method.bind(this)].concat($A(arguments)));
-    }
-  },
-
-  methodize: function() {
-    if (this._methodized) return this._methodized;
-    var __method = this;
-    return this._methodized = function() {
-      return __method.apply(null, [this].concat($A(arguments)));
-    };
-  }
-});
-
-Function.prototype.defer = Function.prototype.delay.curry(0.01);
-
-Date.prototype.toJSON = function() {
-  return '"' + this.getUTCFullYear() + '-' +
-    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
-    this.getUTCDate().toPaddedString(2) + 'T' +
-    this.getUTCHours().toPaddedString(2) + ':' +
-    this.getUTCMinutes().toPaddedString(2) + ':' +
-    this.getUTCSeconds().toPaddedString(2) + 'Z"';
-};
-
-var Try = {
-  these: function() {
-    var returnValue;
-
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      var lambda = arguments[i];
-      try {
-        returnValue = lambda();
-        break;
-      } catch (e) { }
-    }
-
-    return returnValue;
-  }
-};
-
-RegExp.prototype.match = RegExp.prototype.test;
-
-RegExp.escape = function(str) {
-  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
-};
-
-/*--------------------------------------------------------------------------*/
-
-var PeriodicalExecuter = Class.create({
-  initialize: function(callback, frequency) {
-    this.callback = callback;
-    this.frequency = frequency;
-    this.currentlyExecuting = false;
-
-    this.registerCallback();
-  },
-
-  registerCallback: function() {
-    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
-  },
-
-  execute: function() {
-    this.callback(this);
-  },
-
-  stop: function() {
-    if (!this.timer) return;
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-
-  onTimerEvent: function() {
-    if (!this.currentlyExecuting) {
-      try {
-        this.currentlyExecuting = true;
-        this.execute();
-      } finally {
-        this.currentlyExecuting = false;
-      }
-    }
-  }
-});
-Object.extend(String, {
-  interpret: function(value) {
-    return value == null ? '' : String(value);
-  },
-  specialChar: {
-    '\b': '\\b',
-    '\t': '\\t',
-    '\n': '\\n',
-    '\f': '\\f',
-    '\r': '\\r',
-    '\\': '\\\\'
-  }
-});
-
-Object.extend(String.prototype, {
-  gsub: function(pattern, replacement) {
-    var result = '', source = this, match;
-    replacement = arguments.callee.prepareReplacement(replacement);
-
-    while (source.length > 0) {
-      if (match = source.match(pattern)) {
-        result += source.slice(0, match.index);
-        result += String.interpret(replacement(match));
-        source  = source.slice(match.index + match[0].length);
-      } else {
-        result += source, source = '';
-      }
-    }
-    return result;
-  },
-
-  sub: function(pattern, replacement, count) {
-    replacement = this.gsub.prepareReplacement(replacement);
-    count = count === undefined ? 1 : count;
-
-    return this.gsub(pattern, function(match) {
-      if (--count < 0) return match[0];
-      return replacement(match);
-    });
-  },
-
-  scan: function(pattern, iterator) {
-    this.gsub(pattern, iterator);
-    return String(this);
-  },
-
-  truncate: function(length, truncation) {
-    length = length || 30;
-    truncation = truncation === undefined ? '...' : truncation;
-    return this.length > length ?
-      this.slice(0, length - truncation.length) + truncation : String(this);
-  },
-
-  strip: function() {
-    return this.replace(/^\s+/, '').replace(/\s+$/, '');
-  },
-
-  stripTags: function() {
-    return this.replace(/<\/?[^>]+>/gi, '');
-  },
-
-  stripScripts: function() {
-    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
-  },
-
-  extractScripts: function() {
-    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
-    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
-    return (this.match(matchAll) || []).map(function(scriptTag) {
-      return (scriptTag.match(matchOne) || ['', ''])[1];
-    });
-  },
-
-  evalScripts: function() {
-    return this.extractScripts().map(function(script) { return eval(script) });
-  },
-
-  escapeHTML: function() {
-    var self = arguments.callee;
-    self.text.data = this;
-    return self.div.innerHTML;
-  },
-
-  unescapeHTML: function() {
-    var div = new Element('div');
-    div.innerHTML = this.stripTags();
-    return div.childNodes[0] ? (div.childNodes.length > 1 ?
-      $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
-      div.childNodes[0].nodeValue) : '';
-  },
-
-  toQueryParams: function(separator) {
-    var match = this.strip().match(/([^?#]*)(#.*)?$/);
-    if (!match) return { };
-
-    return match[1].split(separator || '&').inject({ }, function(hash, pair) {
-      if ((pair = pair.split('='))[0]) {
-        var key = decodeURIComponent(pair.shift());
-        var value = pair.length > 1 ? pair.join('=') : pair[0];
-        if (value != undefined) value = decodeURIComponent(value);
-
-        if (key in hash) {
-          if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
-          hash[key].push(value);
-        }
-        else hash[key] = value;
-      }
-      return hash;
-    });
-  },
-
-  toArray: function() {
-    return this.split('');
-  },
-
-  succ: function() {
-    return this.slice(0, this.length - 1) +
-      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
-  },
-
-  times: function(count) {
-    return count < 1 ? '' : new Array(count + 1).join(this);
-  },
-
-  camelize: function() {
-    var parts = this.split('-'), len = parts.length;
-    if (len == 1) return parts[0];
-
-    var camelized = this.charAt(0) == '-'
-      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
-      : parts[0];
-
-    for (var i = 1; i < len; i++)
-      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
-
-    return camelized;
-  },
-
-  capitalize: function() {
-    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
-  },
-
-  underscore: function() {
-    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
-  },
-
-  dasherize: function() {
-    return this.gsub(/_/,'-');
-  },
-
-  inspect: function(useDoubleQuotes) {
-    var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
-      var character = String.specialChar[match[0]];
-      return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
-    });
-    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
-    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
-  },
-
-  toJSON: function() {
-    return this.inspect(true);
-  },
-
-  unfilterJSON: function(filter) {
-    return this.sub(filter || Prototype.JSONFilter, '#{1}');
-  },
-
-  isJSON: function() {
-    var str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
-    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
-  },
-
-  evalJSON: function(sanitize) {
-    var json = this.unfilterJSON();
-    try {
-      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
-    } catch (e) { }
-    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
-  },
-
-  include: function(pattern) {
-    return this.indexOf(pattern) > -1;
-  },
-
-  startsWith: function(pattern) {
-    return this.indexOf(pattern) === 0;
-  },
-
-  endsWith: function(pattern) {
-    var d = this.length - pattern.length;
-    return d >= 0 && this.lastIndexOf(pattern) === d;
-  },
-
-  empty: function() {
-    return this == '';
-  },
-
-  blank: function() {
-    return /^\s*$/.test(this);
-  },
-
-  interpolate: function(object, pattern) {
-    return new Template(this, pattern).evaluate(object);
-  }
-});
-
-if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
-  escapeHTML: function() {
-    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-  },
-  unescapeHTML: function() {
-    return this.replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
-  }
-});
-
-String.prototype.gsub.prepareReplacement = function(replacement) {
-  if (Object.isFunction(replacement)) return replacement;
-  var template = new Template(replacement);
-  return function(match) { return template.evaluate(match) };
-};
-
-String.prototype.parseQuery = String.prototype.toQueryParams;
-
-Object.extend(String.prototype.escapeHTML, {
-  div:  document.createElement('div'),
-  text: document.createTextNode('')
-});
-
-with (String.prototype.escapeHTML) div.appendChild(text);
-
-var Template = Class.create({
-  initialize: function(template, pattern) {
-    this.template = template.toString();
-    this.pattern = pattern || Template.Pattern;
-  },
-
-  evaluate: function(object) {
-    if (Object.isFunction(object.toTemplateReplacements))
-      object = object.toTemplateReplacements();
-
-    return this.template.gsub(this.pattern, function(match) {
-      if (object == null) return '';
-
-      var before = match[1] || '';
-      if (before == '\\') return match[2];
-
-      var ctx = object, expr = match[3];
-      var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/, match = pattern.exec(expr);
-      if (match == null) return before;
-
-      while (match != null) {
-        var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
-        ctx = ctx[comp];
-        if (null == ctx || '' == match[3]) break;
-        expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
-        match = pattern.exec(expr);
-      }
-
-      return before + String.interpret(ctx);
-    }.bind(this));
-  }
-});
-Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
-
-var $break = { };
-
-var Enumerable = {
-  each: function(iterator, context) {
-    var index = 0;
-    iterator = iterator.bind(context);
-    try {
-      this._each(function(value) {
-        iterator(value, index++);
-      });
-    } catch (e) {
-      if (e != $break) throw e;
-    }
-    return this;
-  },
-
-  eachSlice: function(number, iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var index = -number, slices = [], array = this.toArray();
-    while ((index += number) < array.length)
-      slices.push(array.slice(index, index+number));
-    return slices.collect(iterator, context);
-  },
-
-  all: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var result = true;
-    this.each(function(value, index) {
-      result = result && !!iterator(value, index);
-      if (!result) throw $break;
-    });
-    return result;
-  },
-
-  any: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var result = false;
-    this.each(function(value, index) {
-      if (result = !!iterator(value, index))
-        throw $break;
-    });
-    return result;
-  },
-
-  collect: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var results = [];
-    this.each(function(value, index) {
-      results.push(iterator(value, index));
-    });
-    return results;
-  },
-
-  detect: function(iterator, context) {
-    iterator = iterator.bind(context);
-    var result;
-    this.each(function(value, index) {
-      if (iterator(value, index)) {
-        result = value;
-        throw $break;
-      }
-    });
-    return result;
-  },
-
-  findAll: function(iterator, context) {
-    iterator = iterator.bind(context);
-    var results = [];
-    this.each(function(value, index) {
-      if (iterator(value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  grep: function(filter, iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var results = [];
-
-    if (Object.isString(filter))
-      filter = new RegExp(filter);
-
-    this.each(function(value, index) {
-      if (filter.match(value))
-        results.push(iterator(value, index));
-    });
-    return results;
-  },
-
-  include: function(object) {
-    if (Object.isFunction(this.indexOf))
-      if (this.indexOf(object) != -1) return true;
-
-    var found = false;
-    this.each(function(value) {
-      if (value == object) {
-        found = true;
-        throw $break;
-      }
-    });
-    return found;
-  },
-
-  inGroupsOf: function(number, fillWith) {
-    fillWith = fillWith === undefined ? null : fillWith;
-    return this.eachSlice(number, function(slice) {
-      while(slice.length < number) slice.push(fillWith);
-      return slice;
-    });
-  },
-
-  inject: function(memo, iterator, context) {
-    iterator = iterator.bind(context);
-    this.each(function(value, index) {
-      memo = iterator(memo, value, index);
-    });
-    return memo;
-  },
-
-  invoke: function(method) {
-    var args = $A(arguments).slice(1);
-    return this.map(function(value) {
-      return value[method].apply(value, args);
-    });
-  },
-
-  max: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var result;
-    this.each(function(value, index) {
-      value = iterator(value, index);
-      if (result == undefined || value >= result)
-        result = value;
-    });
-    return result;
-  },
-
-  min: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var result;
-    this.each(function(value, index) {
-      value = iterator(value, index);
-      if (result == undefined || value < result)
-        result = value;
-    });
-    return result;
-  },
-
-  partition: function(iterator, context) {
-    iterator = iterator ? iterator.bind(context) : Prototype.K;
-    var trues = [], falses = [];
-    this.each(function(value, index) {
-      (iterator(value, index) ?
-        trues : falses).push(value);
-    });
-    return [trues, falses];
-  },
-
-  pluck: function(property) {
-    var results = [];
-    this.each(function(value) {
-      results.push(value[property]);
-    });
-    return results;
-  },
-
-  reject: function(iterator, context) {
-    iterator = iterator.bind(context);
-    var results = [];
-    this.each(function(value, index) {
-      if (!iterator(value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  sortBy: function(iterator, context) {
-    iterator = iterator.bind(context);
-    return this.map(function(value, index) {
-      return {value: value, criteria: iterator(value, index)};
-    }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }).pluck('value');
-  },
-
-  toArray: function() {
-    return this.map();
-  },
-
-  zip: function() {
-    var iterator = Prototype.K, args = $A(arguments);
-    if (Object.isFunction(args.last()))
-      iterator = args.pop();
-
-    var collections = [this].concat(args).map($A);
-    return this.map(function(value, index) {
-      return iterator(collections.pluck(index));
-    });
-  },
-
-  size: function() {
-    return this.toArray().length;
-  },
-
-  inspect: function() {
-    return '#<Enumerable:' + this.toArray().inspect() + '>';
-  }
-};
-
-Object.extend(Enumerable, {
-  map:     Enumerable.collect,
-  find:    Enumerable.detect,
-  select:  Enumerable.findAll,
-  filter:  Enumerable.findAll,
-  member:  Enumerable.include,
-  entries: Enumerable.toArray,
-  every:   Enumerable.all,
-  some:    Enumerable.any
-});
-function $A(iterable) {
-  if (!iterable) return [];
-  if (iterable.toArray) return iterable.toArray();
-  var length = iterable.length, results = new Array(length);
-  while (length--) results[length] = iterable[length];
-  return results;
-}
-
-if (Prototype.Browser.WebKit) {
-  function $A(iterable) {
-    if (!iterable) return [];
-    if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') &&
-        iterable.toArray) return iterable.toArray();
-    var length = iterable.length, results = new Array(length);
-    while (length--) results[length] = iterable[length];
-    return results;
-  }
-}
-
-Array.from = $A;
-
-Object.extend(Array.prototype, Enumerable);
-
-if (!Array.prototype._reverse) Array.prototype._reverse = Array.prototype.reverse;
-
-Object.extend(Array.prototype, {
-  _each: function(iterator) {
-    for (var i = 0, length = this.length; i < length; i++)
-      iterator(this[i]);
-  },
-
-  clear: function() {
-    this.length = 0;
-    return this;
-  },
-
-  first: function() {
-    return this[0];
-  },
-
-  last: function() {
-    return this[this.length - 1];
-  },
-
-  compact: function() {
-    return this.select(function(value) {
-      return value != null;
-    });
-  },
-
-  flatten: function() {
-    return this.inject([], function(array, value) {
-      return array.concat(Object.isArray(value) ?
-        value.flatten() : [value]);
-    });
-  },
-
-  without: function() {
-    var values = $A(arguments);
-    return this.select(function(value) {
-      return !values.include(value);
-    });
-  },
-
-  reverse: function(inline) {
-    return (inline !== false ? this : this.toArray())._reverse();
-  },
-
-  reduce: function() {
-    return this.length > 1 ? this : this[0];
-  },
-
-  uniq: function(sorted) {
-    return this.inject([], function(array, value, index) {
-      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
-        array.push(value);
-      return array;
-    });
-  },
-
-  intersect: function(array) {
-    return this.uniq().findAll(function(item) {
-      return array.detect(function(value) { return item === value });
-    });
-  },
-
-  clone: function() {
-    return [].concat(this);
-  },
-
-  size: function() {
-    return this.length;
-  },
-
-  inspect: function() {
-    return '[' + this.map(Object.inspect).join(', ') + ']';
-  },
-
-  toJSON: function() {
-    var results = [];
-    this.each(function(object) {
-      var value = Object.toJSON(object);
-      if (value !== undefined) results.push(value);
-    });
-    return '[' + results.join(', ') + ']';
-  }
-});
-
-// use native browser JS 1.6 implementation if available
-if (Object.isFunction(Array.prototype.forEach))
-  Array.prototype._each = Array.prototype.forEach;
-
-if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
-  i || (i = 0);
-  var length = this.length;
-  if (i < 0) i = length + i;
-  for (; i < length; i++)
-    if (this[i] === item) return i;
-  return -1;
-};
-
-if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
-  i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
-  var n = this.slice(0, i).reverse().indexOf(item);
-  return (n < 0) ? n : i - n - 1;
-};
-
-Array.prototype.toArray = Array.prototype.clone;
-
-function $w(string) {
-  if (!Object.isString(string)) return [];
-  string = string.strip();
-  return string ? string.split(/\s+/) : [];
-}
-
-if (Prototype.Browser.Opera){
-  Array.prototype.concat = function() {
-    var array = [];
-    for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      if (Object.isArray(arguments[i])) {
-        for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
-          array.push(arguments[i][j]);
-      } else {
-        array.push(arguments[i]);
-      }
-    }
-    return array;
-  };
-}
-Object.extend(Number.prototype, {
-  toColorPart: function() {
-    return this.toPaddedString(2, 16);
-  },
-
-  succ: function() {
-    return this + 1;
-  },
-
-  times: function(iterator) {
-    $R(0, this, true).each(iterator);
-    return this;
-  },
-
-  toPaddedString: function(length, radix) {
-    var string = this.toString(radix || 10);
-    return '0'.times(length - string.length) + string;
-  },
-
-  toJSON: function() {
-    return isFinite(this) ? this.toString() : 'null';
-  }
-});
-
-$w('abs round ceil floor').each(function(method){
-  Number.prototype[method] = Math[method].methodize();
-});
-function $H(object) {
-  return new Hash(object);
-};
-
-var Hash = Class.create(Enumerable, (function() {
-  if (function() {
-    var i = 0, Test = function(value) { this.key = value };
-    Test.prototype.key = 'foo';
-    for (var property in new Test('bar')) i++;
-    return i > 1;
-  }()) {
-    function each(iterator) {
-      var cache = [];
-      for (var key in this._object) {
-        var value = this._object[key];
-        if (cache.include(key)) continue;
-        cache.push(key);
-        var pair = [key, value];
-        pair.key = key;
-        pair.value = value;
-        iterator(pair);
-      }
-    }
-  } else {
-    function each(iterator) {
-      for (var key in this._object) {
-        var value = this._object[key], pair = [key, value];
-        pair.key = key;
-        pair.value = value;
-        iterator(pair);
-      }
-    }
-  }
-
-  function toQueryPair(key, value) {
-    if (Object.isUndefined(value)) return key;
-    return key + '=' + encodeURIComponent(String.interpret(value));
-  }
-
-  return {
-    initialize: function(object) {
-      this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
-    },
-
-    _each: each,
-
-    set: function(key, value) {
-      return this._object[key] = value;
-    },
-
-    get: function(key) {
-      return this._object[key];
-    },
-
-    unset: function(key) {
-      var value = this._object[key];
-      delete this._object[key];
-      return value;
-    },
-
-    toObject: function() {
-      return Object.clone(this._object);
-    },
-
-    keys: function() {
-      return this.pluck('key');
-    },
-
-    values: function() {
-      return this.pluck('value');
-    },
-
-    index: function(value) {
-      var match = this.detect(function(pair) {
-        return pair.value === value;
-      });
-      return match && match.key;
-    },
-
-    merge: function(object) {
-      return this.clone().update(object);
-    },
-
-    update: function(object) {
-      return new Hash(object).inject(this, function(result, pair) {
-        result.set(pair.key, pair.value);
-        return result;
-      });
-    },
-
-    toQueryString: function() {
-      return this.map(function(pair) {
-        var key = encodeURIComponent(pair.key), values = pair.value;
-
-        if (values && typeof values == 'object') {
-          if (Object.isArray(values))
-            return values.map(toQueryPair.curry(key)).join('&');
-        }
-        return toQueryPair(key, values);
-      }).join('&');
-    },
-
-    inspect: function() {
-      return '#<Hash:{' + this.map(function(pair) {
-        return pair.map(Object.inspect).join(': ');
-      }).join(', ') + '}>';
-    },
-
-    toJSON: function() {
-      return Object.toJSON(this.toObject());
-    },
-
-    clone: function() {
-      return new Hash(this);
-    }
-  }
-})());
-
-Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
-Hash.from = $H;
-var ObjectRange = Class.create(Enumerable, {
-  initialize: function(start, end, exclusive) {
-    this.start = start;
-    this.end = end;
-    this.exclusive = exclusive;
-  },
-
-  _each: function(iterator) {
-    var value = this.start;
-    while (this.include(value)) {
-      iterator(value);
-      value = value.succ();
-    }
-  },
-
-  include: function(value) {
-    if (value < this.start)
-      return false;
-    if (this.exclusive)
-      return value < this.end;
-    return value <= this.end;
-  }
-});
-
-var $R = function(start, end, exclusive) {
-  return new ObjectRange(start, end, exclusive);
-};
-
-var Ajax = {
-  getTransport: function() {
-    return Try.these(
-      function() {return new XMLHttpRequest()},
-      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
-      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
-    ) || false;
-  },
-
-  activeRequestCount: 0
-};
-
-Ajax.Responders = {
-  responders: [],
-
-  _each: function(iterator) {
-    this.responders._each(iterator);
-  },
-
-  register: function(responder) {
-    if (!this.include(responder))
-      this.responders.push(responder);
-  },
-
-  unregister: function(responder) {
-    this.responders = this.responders.without(responder);
-  },
-
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-      if (Object.isFunction(responder[callback])) {
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
-        } catch (e) { }
-      }
-    });
-  }
-};
-
-Object.extend(Ajax.Responders, Enumerable);
-
-Ajax.Responders.register({
-  onCreate:   function() { Ajax.activeRequestCount++ },
-  onComplete: function() { Ajax.activeRequestCount-- }
-});
-
-Ajax.Base = Class.create({
-  initialize: function(options) {
-    this.options = {
-      method:       'post',
-      asynchronous: true,
-      contentType:  'application/x-www-form-urlencoded',
-      encoding:     'UTF-8',
-      parameters:   '',
-      evalJSON:     true,
-      evalJS:       true
-    };
-    Object.extend(this.options, options || { });
-
-    this.options.method = this.options.method.toLowerCase();
-    if (Object.isString(this.options.parameters))
-      this.options.parameters = this.options.parameters.toQueryParams();
-  }
-});
-
-Ajax.Request = Class.create(Ajax.Base, {
-  _complete: false,
-
-  initialize: function($super, url, options) {
-    $super(options);
-    this.transport = Ajax.getTransport();
-    this.request(url);
-  },
-
-  request: function(url) {
-    this.url = url;
-    this.method = this.options.method;
-    var params = Object.clone(this.options.parameters);
-
-    if (!['get', 'post'].include(this.method)) {
-      // simulate other verbs over post
-      params['_method'] = this.method;
-      this.method = 'post';
-    }
-
-    this.parameters = params;
-
-    if (params = Object.toQueryString(params)) {
-      // when GET, append parameters to URL
-      if (this.method == 'get')
-        this.url += (this.url.include('?') ? '&' : '?') + params;
-      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
-        params += '&_=';
-    }
-
-    try {
-      var response = new Ajax.Response(this);
-      if (this.options.onCreate) this.options.onCreate(response);
-      Ajax.Responders.dispatch('onCreate', this, response);
-
-      this.transport.open(this.method.toUpperCase(), this.url,
-        this.options.asynchronous);
-
-      if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
-
-      this.transport.onreadystatechange = this.onStateChange.bind(this);
-      this.setRequestHeaders();
-
-      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
-      this.transport.send(this.body);
-
-      /* Force Firefox to handle ready state 4 for synchronous requests */
-      if (!this.options.asynchronous && this.transport.overrideMimeType)
-        this.onStateChange();
-
-    }
-    catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  onStateChange: function() {
-    var readyState = this.transport.readyState;
-    if (readyState > 1 && !((readyState == 4) && this._complete))
-      this.respondToReadyState(this.transport.readyState);
-  },
-
-  setRequestHeaders: function() {
-    var headers = {
-      'X-Requested-With': 'XMLHttpRequest',
-      'X-Prototype-Version': Prototype.Version,
-      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
-    };
-
-    if (this.method == 'post') {
-      headers['Content-type'] = this.options.contentType +
-        (this.options.encoding ? '; charset=' + this.options.encoding : '');
-
-      /* Force "Connection: close" for older Mozilla browsers to work
-       * around a bug where XMLHttpRequest sends an incorrect
-       * Content-length header. See Mozilla Bugzilla #246651.
-       */
-      if (this.transport.overrideMimeType &&
-          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
-            headers['Connection'] = 'close';
-    }
-
-    // user-defined headers
-    if (typeof this.options.requestHeaders == 'object') {
-      var extras = this.options.requestHeaders;
-
-      if (Object.isFunction(extras.push))
-        for (var i = 0, length = extras.length; i < length; i += 2)
-          headers[extras[i]] = extras[i+1];
-      else
-        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
-    }
-
-    for (var name in headers)
-      this.transport.setRequestHeader(name, headers[name]);
-  },
-
-  success: function() {
-    var status = this.getStatus();
-    return !status || (status >= 200 && status < 300);
-  },
-
-  getStatus: function() {
-    try {
-      return this.transport.status || 0;
-    } catch (e) { return 0 }
-  },
-
-  respondToReadyState: function(readyState) {
-    var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
-
-    if (state == 'Complete') {
-      try {
-        this._complete = true;
-        (this.options['on' + response.status]
-         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(response, response.headerJSON);
-      } catch (e) {
-        this.dispatchException(e);
-      }
-
-      var contentType = response.getHeader('Content-type');
-      if (this.options.evalJS == 'force'
-          || (this.options.evalJS && contentType
-          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
-        this.evalResponse();
-    }
-
-    try {
-      (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
-      Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
-    } catch (e) {
-      this.dispatchException(e);
-    }
-
-    if (state == 'Complete') {
-      // avoid memory leak in MSIE: clean up
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-    }
-  },
-
-  getHeader: function(name) {
-    try {
-      return this.transport.getResponseHeader(name);
-    } catch (e) { return null }
-  },
-
-  evalResponse: function() {
-    try {
-      return eval((this.transport.responseText || '').unfilterJSON());
-    } catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  dispatchException: function(exception) {
-    (this.options.onException || Prototype.emptyFunction)(this, exception);
-    Ajax.Responders.dispatch('onException', this, exception);
-  }
-});
-
-Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
-
-Ajax.Response = Class.create({
-  initialize: function(request){
-    this.request = request;
-    var transport  = this.transport  = request.transport,
-        readyState = this.readyState = transport.readyState;
-
-    if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
-      this.status       = this.getStatus();
-      this.statusText   = this.getStatusText();
-      this.responseText = String.interpret(transport.responseText);
-      this.headerJSON   = this._getHeaderJSON();
-    }
-
-    if(readyState == 4) {
-      var xml = transport.responseXML;
-      this.responseXML  = xml === undefined ? null : xml;
-      this.responseJSON = this._getResponseJSON();
-    }
-  },
-
-  status:      0,
-  statusText: '',
-
-  getStatus: Ajax.Request.prototype.getStatus,
-
-  getStatusText: function() {
-    try {
-      return this.transport.statusText || '';
-    } catch (e) { return '' }
-  },
-
-  getHeader: Ajax.Request.prototype.getHeader,
-
-  getAllHeaders: function() {
-    try {
-      return this.getAllResponseHeaders();
-    } catch (e) { return null }
-  },
-
-  getResponseHeader: function(name) {
-    return this.transport.getResponseHeader(name);
-  },
-
-  getAllResponseHeaders: function() {
-    return this.transport.getAllResponseHeaders();
-  },
-
-  _getHeaderJSON: function() {
-    var json = this.getHeader('X-JSON');
-    if (!json) return null;
-    json = decodeURIComponent(escape(json));
-    try {
-      return json.evalJSON(this.request.options.sanitizeJSON);
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  },
-
-  _getResponseJSON: function() {
-    var options = this.request.options;
-    if (!options.evalJSON || (options.evalJSON != 'force' &&
-      !(this.getHeader('Content-type') || '').include('application/json')))
-        return null;
-    try {
-      return this.transport.responseText.evalJSON(options.sanitizeJSON);
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  }
-});
-
-Ajax.Updater = Class.create(Ajax.Request, {
-  initialize: function($super, container, url, options) {
-    this.container = {
-      success: (container.success || container),
-      failure: (container.failure || (container.success ? null : container))
-    };
-
-    options = options || { };
-    var onComplete = options.onComplete;
-    options.onComplete = (function(response, param) {
-      this.updateContent(response.responseText);
-      if (Object.isFunction(onComplete)) onComplete(response, param);
-    }).bind(this);
-
-    $super(url, options);
-  },
-
-  updateContent: function(responseText) {
-    var receiver = this.container[this.success() ? 'success' : 'failure'],
-        options = this.options;
-
-    if (!options.evalScripts) responseText = responseText.stripScripts();
-
-    if (receiver = $(receiver)) {
-      if (options.insertion) {
-        if (Object.isString(options.insertion)) {
-          var insertion = { }; insertion[options.insertion] = responseText;
-          receiver.insert(insertion);
-        }
-        else options.insertion(receiver, responseText);
-      }
-      else receiver.update(responseText);
-    }
-
-    if (this.success()) {
-      if (this.onComplete) this.onComplete.bind(this).defer();
-    }
-  }
-});
-
-Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
-  initialize: function($super, container, url, options) {
-    $super(options);
-    this.onComplete = this.options.onComplete;
-
-    this.frequency = (this.options.frequency || 2);
-    this.decay = (this.options.decay || 1);
-
-    this.updater = { };
-    this.container = container;
-    this.url = url;
-
-    this.start();
-  },
-
-  start: function() {
-    this.options.onComplete = this.updateComplete.bind(this);
-    this.onTimerEvent();
-  },
-
-  stop: function() {
-    this.updater.options.onComplete = undefined;
-    clearTimeout(this.timer);
-    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
-  },
-
-  updateComplete: function(response) {
-    if (this.options.decay) {
-      this.decay = (response.responseText == this.lastText ?
-        this.decay * this.options.decay : 1);
-
-      this.lastText = response.responseText;
-    }
-    this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
-  },
-
-  onTimerEvent: function() {
-    this.updater = new Ajax.Updater(this.container, this.url, this.options);
-  }
-});
-function $(element) {
-  if (arguments.length > 1) {
-    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
-      elements.push($(arguments[i]));
-    return elements;
-  }
-  if (Object.isString(element))
-    element = document.getElementById(element);
-  return Element.extend(element);
-}
-
-if (Prototype.BrowserFeatures.XPath) {
-  document._getElementsByXPath = function(expression, parentElement) {
-    var results = [];
-    var query = document.evaluate(expression, $(parentElement) || document,
-      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    for (var i = 0, length = query.snapshotLength; i < length; i++)
-      results.push(Element.extend(query.snapshotItem(i)));
-    return results;
-  };
-}
-
-/*--------------------------------------------------------------------------*/
-
-if (!window.Node) var Node = { };
-
-if (!Node.ELEMENT_NODE) {
-  // DOM level 2 ECMAScript Language Binding
-  Object.extend(Node, {
-    ELEMENT_NODE: 1,
-    ATTRIBUTE_NODE: 2,
-    TEXT_NODE: 3,
-    CDATA_SECTION_NODE: 4,
-    ENTITY_REFERENCE_NODE: 5,
-    ENTITY_NODE: 6,
-    PROCESSING_INSTRUCTION_NODE: 7,
-    COMMENT_NODE: 8,
-    DOCUMENT_NODE: 9,
-    DOCUMENT_TYPE_NODE: 10,
-    DOCUMENT_FRAGMENT_NODE: 11,
-    NOTATION_NODE: 12
-  });
-}
-
-(function() {
-  var element = this.Element;
-  this.Element = function(tagName, attributes) {
-    attributes = attributes || { };
-    tagName = tagName.toLowerCase();
-    var cache = Element.cache;
-    if (Prototype.Browser.IE && attributes.name) {
-      tagName = '<' + tagName + ' name="' + attributes.name + '">';
-      delete attributes.name;
-      return Element.writeAttribute(document.createElement(tagName), attributes);
-    }
-    if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
-    return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
-  };
-  Object.extend(this.Element, element || { });
-}).call(window);
-
-Element.cache = { };
-
-Element.Methods = {
-  visible: function(element) {
-    return $(element).style.display != 'none';
-  },
-
-  toggle: function(element) {
-    element = $(element);
-    Element[Element.visible(element) ? 'hide' : 'show'](element);
-    return element;
-  },
-
-  hide: function(element) {
-    $(element).style.display = 'none';
-    return element;
-  },
-
-  show: function(element) {
-    $(element).style.display = '';
-    return element;
-  },
-
-  remove: function(element) {
-    element = $(element);
-    element.parentNode.removeChild(element);
-    return element;
-  },
-
-  update: function(element, content) {
-    element = $(element);
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) return element.update().insert(content);
-    content = Object.toHTML(content);
-    element.innerHTML = content.stripScripts();
-    content.evalScripts.bind(content).defer();
-    return element;
-  },
-
-  replace: function(element, content) {
-    element = $(element);
-    if (content && content.toElement) content = content.toElement();
-    else if (!Object.isElement(content)) {
-      content = Object.toHTML(content);
-      var range = element.ownerDocument.createRange();
-      range.selectNode(element);
-      content.evalScripts.bind(content).defer();
-      content = range.createContextualFragment(content.stripScripts());
-    }
-    element.parentNode.replaceChild(content, element);
-    return element;
-  },
-
-  insert: function(element, insertions) {
-    element = $(element);
-
-    if (Object.isString(insertions) || Object.isNumber(insertions) ||
-        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
-          insertions = {bottom:insertions};
-
-    var content, t, range;
-
-    for (position in insertions) {
-      content  = insertions[position];
-      position = position.toLowerCase();
-      t = Element._insertionTranslations[position];
-
-      if (content && content.toElement) content = content.toElement();
-      if (Object.isElement(content)) {
-        t.insert(element, content);
-        continue;
-      }
-
-      content = Object.toHTML(content);
-
-      range = element.ownerDocument.createRange();
-      t.initializeRange(element, range);
-      t.insert(element, range.createContextualFragment(content.stripScripts()));
-
-      content.evalScripts.bind(content).defer();
-    }
-
-    return element;
-  },
-
-  wrap: function(element, wrapper, attributes) {
-    element = $(element);
-    if (Object.isElement(wrapper))
-      $(wrapper).writeAttribute(attributes || { });
-    else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
-    else wrapper = new Element('div', wrapper);
-    if (element.parentNode)
-      element.parentNode.replaceChild(wrapper, element);
-    wrapper.appendChild(element);
-    return wrapper;
-  },
-
-  inspect: function(element) {
-    element = $(element);
-    var result = '<' + element.tagName.toLowerCase();
-    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
-      var property = pair.first(), attribute = pair.last();
-      var value = (element[property] || '').toString();
-      if (value) result += ' ' + attribute + '=' + value.inspect(true);
-    });
-    return result + '>';
-  },
-
-  recursivelyCollect: function(element, property) {
-    element = $(element);
-    var elements = [];
-    while (element = element[property])
-      if (element.nodeType == 1)
-        elements.push(Element.extend(element));
-    return elements;
-  },
-
-  ancestors: function(element) {
-    return $(element).recursivelyCollect('parentNode');
-  },
-
-  descendants: function(element) {
-    return $A($(element).getElementsByTagName('*')).each(Element.extend);
-  },
-
-  firstDescendant: function(element) {
-    element = $(element).firstChild;
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    return $(element);
-  },
-
-  immediateDescendants: function(element) {
-    if (!(element = $(element).firstChild)) return [];
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    if (element) return [element].concat($(element).nextSiblings());
-    return [];
-  },
-
-  previousSiblings: function(element) {
-    return $(element).recursivelyCollect('previousSibling');
-  },
-
-  nextSiblings: function(element) {
-    return $(element).recursivelyCollect('nextSibling');
-  },
-
-  siblings: function(element) {
-    element = $(element);
-    return element.previousSiblings().reverse().concat(element.nextSiblings());
-  },
-
-  match: function(element, selector) {
-    if (Object.isString(selector))
-      selector = new Selector(selector);
-    return selector.match($(element));
-  },
-
-  up: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(element.parentNode);
-    var ancestors = element.ancestors();
-    return expression ? Selector.findElement(ancestors, expression, index) :
-      ancestors[index || 0];
-  },
-
-  down: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return element.firstDescendant();
-    var descendants = element.descendants();
-    return expression ? Selector.findElement(descendants, expression, index) :
-      descendants[index || 0];
-  },
-
-  previous: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
-    var previousSiblings = element.previousSiblings();
-    return expression ? Selector.findElement(previousSiblings, expression, index) :
-      previousSiblings[index || 0];
-  },
-
-  next: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
-    var nextSiblings = element.nextSiblings();
-    return expression ? Selector.findElement(nextSiblings, expression, index) :
-      nextSiblings[index || 0];
-  },
-
-  select: function() {
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element, args);
-  },
-
-  adjacent: function() {
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element.parentNode, args).without(element);
-  },
-
-  identify: function(element) {
-    element = $(element);
-    var id = element.readAttribute('id'), self = arguments.callee;
-    if (id) return id;
-    do { id = 'anonymous_element_' + self.counter++ } while ($(id));
-    element.writeAttribute('id', id);
-    return id;
-  },
-
-  readAttribute: function(element, name) {
-    element = $(element);
-    if (Prototype.Browser.IE) {
-      var t = Element._attributeTranslations.read;
-      if (t.values[name]) return t.values[name](element, name);
-      if (t.names[name]) name = t.names[name];
-      if (name.include(':')) {
-        return (!element.attributes || !element.attributes[name]) ? null :
-         element.attributes[name].value;
-      }
-    }
-    return element.getAttribute(name);
-  },
-
-  writeAttribute: function(element, name, value) {
-    element = $(element);
-    var attributes = { }, t = Element._attributeTranslations.write;
-
-    if (typeof name == 'object') attributes = name;
-    else attributes[name] = value === undefined ? true : value;
-
-    for (var attr in attributes) {
-      var name = t.names[attr] || attr, value = attributes[attr];
-      if (t.values[attr]) name = t.values[attr](element, value);
-      if (value === false || value === null)
-        element.removeAttribute(name);
-      else if (value === true)
-        element.setAttribute(name, name);
-      else element.setAttribute(name, value);
-    }
-    return element;
-  },
-
-  getHeight: function(element) {
-    return $(element).getDimensions().height;
-  },
-
-  getWidth: function(element) {
-    return $(element).getDimensions().width;
-  },
-
-  classNames: function(element) {
-    return new Element.ClassNames(element);
-  },
-
-  hasClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    var elementClassName = element.className;
-    return (elementClassName.length > 0 && (elementClassName == className ||
-      new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
-  },
-
-  addClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    if (!element.hasClassName(className))
-      element.className += (element.className ? ' ' : '') + className;
-    return element;
-  },
-
-  removeClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    element.className = element.className.replace(
-      new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
-    return element;
-  },
-
-  toggleClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    return element[element.hasClassName(className) ?
-      'removeClassName' : 'addClassName'](className);
-  },
-
-  // removes whitespace-only text node children
-  cleanWhitespace: function(element) {
-    element = $(element);
-    var node = element.firstChild;
-    while (node) {
-      var nextNode = node.nextSibling;
-      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
-        element.removeChild(node);
-      node = nextNode;
-    }
-    return element;
-  },
-
-  empty: function(element) {
-    return $(element).innerHTML.blank();
-  },
-
-  descendantOf: function(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
-
-    if (element.compareDocumentPosition)
-      return (element.compareDocumentPosition(ancestor) & 8) === 8;
-
-    if (element.sourceIndex && !Prototype.Browser.Opera) {
-      var e = element.sourceIndex, a = ancestor.sourceIndex,
-       nextAncestor = ancestor.nextSibling;
-      if (!nextAncestor) {
-        do { ancestor = ancestor.parentNode; }
-        while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
-      }
-      if (nextAncestor) return (e > a && e < nextAncestor.sourceIndex);
-    }
-
-    while (element = element.parentNode)
-      if (element == ancestor) return true;
-    return false;
-  },
-
-  scrollTo: function(element) {
-    element = $(element);
-    var pos = element.cumulativeOffset();
-    window.scrollTo(pos[0], pos[1]);
-    return element;
-  },
-
-  getStyle: function(element, style) {
-    element = $(element);
-    style = style == 'float' ? 'cssFloat' : style.camelize();
-    var value = element.style[style];
-    if (!value) {
-      var css = document.defaultView.getComputedStyle(element, null);
-      value = css ? css[style] : null;
-    }
-    if (style == 'opacity') return value ? parseFloat(value) : 1.0;
-    return value == 'auto' ? null : value;
-  },
-
-  getOpacity: function(element) {
-    return $(element).getStyle('opacity');
-  },
-
-  setStyle: function(element, styles) {
-    element = $(element);
-    var elementStyle = element.style, match;
-    if (Object.isString(styles)) {
-      element.style.cssText += ';' + styles;
-      return styles.include('opacity') ?
-        element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
-    }
-    for (var property in styles)
-      if (property == 'opacity') element.setOpacity(styles[property]);
-      else
-        elementStyle[(property == 'float' || property == 'cssFloat') ?
-          (elementStyle.styleFloat === undefined ? 'cssFloat' : 'styleFloat') :
-            property] = styles[property];
-
-    return element;
-  },
-
-  setOpacity: function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1 || value === '') ? '' :
-      (value < 0.00001) ? 0 : value;
-    return element;
-  },
-
-  getDimensions: function(element) {
-    element = $(element);
-    var display = $(element).getStyle('display');
-    if (display != 'none' && display != null) // Safari bug
-      return {width: element.offsetWidth, height: element.offsetHeight};
-
-    // All *Width and *Height properties give 0 on elements with display none,
-    // so enable the element temporarily
-    var els = element.style;
-    var originalVisibility = els.visibility;
-    var originalPosition = els.position;
-    var originalDisplay = els.display;
-    els.visibility = 'hidden';
-    els.position = 'absolute';
-    els.display = 'block';
-    var originalWidth = element.clientWidth;
-    var originalHeight = element.clientHeight;
-    els.display = originalDisplay;
-    els.position = originalPosition;
-    els.visibility = originalVisibility;
-    return {width: originalWidth, height: originalHeight};
-  },
-
-  makePositioned: function(element) {
-    element = $(element);
-    var pos = Element.getStyle(element, 'position');
-    if (pos == 'static' || !pos) {
-      element._madePositioned = true;
-      element.style.position = 'relative';
-      // Opera returns the offset relative to the positioning context, when an
-      // element is position relative but top and left have not been defined
-      if (window.opera) {
-        element.style.top = 0;
-        element.style.left = 0;
-      }
-    }
-    return element;
-  },
-
-  undoPositioned: function(element) {
-    element = $(element);
-    if (element._madePositioned) {
-      element._madePositioned = undefined;
-      element.style.position =
-        element.style.top =
-        element.style.left =
-        element.style.bottom =
-        element.style.right = '';
-    }
-    return element;
-  },
-
-  makeClipping: function(element) {
-    element = $(element);
-    if (element._overflow) return element;
-    element._overflow = Element.getStyle(element, 'overflow') || 'auto';
-    if (element._overflow !== 'hidden')
-      element.style.overflow = 'hidden';
-    return element;
-  },
-
-  undoClipping: function(element) {
-    element = $(element);
-    if (!element._overflow) return element;
-    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
-    element._overflow = null;
-    return element;
-  },
-
-  cumulativeOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  positionedOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-      if (element) {
-        if (element.tagName == 'BODY') break;
-        var p = Element.getStyle(element, 'position');
-        if (p == 'relative' || p == 'absolute') break;
-      }
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  absolutize: function(element) {
-    element = $(element);
-    if (element.getStyle('position') == 'absolute') return;
-    // Position.prepare(); // To be done manually by Scripty when it needs it.
-
-    var offsets = element.positionedOffset();
-    var top     = offsets[1];
-    var left    = offsets[0];
-    var width   = element.clientWidth;
-    var height  = element.clientHeight;
-
-    element._originalLeft   = left - parseFloat(element.style.left  || 0);
-    element._originalTop    = top  - parseFloat(element.style.top || 0);
-    element._originalWidth  = element.style.width;
-    element._originalHeight = element.style.height;
-
-    element.style.position = 'absolute';
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.width  = width + 'px';
-    element.style.height = height + 'px';
-    return element;
-  },
-
-  relativize: function(element) {
-    element = $(element);
-    if (element.getStyle('position') == 'relative') return;
-    // Position.prepare(); // To be done manually by Scripty when it needs it.
-
-    element.style.position = 'relative';
-    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
-    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
-
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.height = element._originalHeight;
-    element.style.width  = element._originalWidth;
-    return element;
-  },
-
-  cumulativeScrollOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.scrollTop  || 0;
-      valueL += element.scrollLeft || 0;
-      element = element.parentNode;
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  getOffsetParent: function(element) {
-    if (element.offsetParent) return $(element.offsetParent);
-    if (element == document.body) return $(element);
-
-    while ((element = element.parentNode) && element != document.body)
-      if (Element.getStyle(element, 'position') != 'static')
-        return $(element);
-
-    return $(document.body);
-  },
-
-  viewportOffset: function(forElement) {
-    var valueT = 0, valueL = 0;
-
-    var element = forElement;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-
-      // Safari fix
-      if (element.offsetParent == document.body &&
-        Element.getStyle(element, 'position') == 'absolute') break;
-
-    } while (element = element.offsetParent);
-
-    element = forElement;
-    do {
-      if (!Prototype.Browser.Opera || element.tagName == 'BODY') {
-        valueT -= element.scrollTop  || 0;
-        valueL -= element.scrollLeft || 0;
-      }
-    } while (element = element.parentNode);
-
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  clonePosition: function(element, source) {
-    var options = Object.extend({
-      setLeft:    true,
-      setTop:     true,
-      setWidth:   true,
-      setHeight:  true,
-      offsetTop:  0,
-      offsetLeft: 0
-    }, arguments[2] || { });
-
-    // find page position of source
-    source = $(source);
-    var p = source.viewportOffset();
-
-    // find coordinate system to use
-    element = $(element);
-    var delta = [0, 0];
-    var parent = null;
-    // delta [0,0] will do fine with position: fixed elements,
-    // position:absolute needs offsetParent deltas
-    if (Element.getStyle(element, 'position') == 'absolute') {
-      parent = element.getOffsetParent();
-      delta = parent.viewportOffset();
-    }
-
-    // correct by body offsets (fixes Safari)
-    if (parent == document.body) {
-      delta[0] -= document.body.offsetLeft;
-      delta[1] -= document.body.offsetTop;
-    }
-
-    // set position
-    if (options.setLeft)   element.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
-    if (options.setTop)    element.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
-    if (options.setWidth)  element.style.width = source.offsetWidth + 'px';
-    if (options.setHeight) element.style.height = source.offsetHeight + 'px';
-    return element;
-  }
-};
-
-Element.Methods.identify.counter = 1;
-
-Object.extend(Element.Methods, {
-  getElementsBySelector: Element.Methods.select,
-  childElements: Element.Methods.immediateDescendants
-});
-
-Element._attributeTranslations = {
-  write: {
-    names: {
-      className: 'class',
-      htmlFor:   'for'
-    },
-    values: { }
-  }
-};
-
-
-if (!document.createRange || Prototype.Browser.Opera) {
-  Element.Methods.insert = function(element, insertions) {
-    element = $(element);
-
-    if (Object.isString(insertions) || Object.isNumber(insertions) ||
-        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
-          insertions = { bottom: insertions };
-
-    var t = Element._insertionTranslations, content, position, pos, tagName;
-
-    for (position in insertions) {
-      content  = insertions[position];
-      position = position.toLowerCase();
-      pos      = t[position];
-
-      if (content && content.toElement) content = content.toElement();
-      if (Object.isElement(content)) {
-        pos.insert(element, content);
-        continue;
-      }
-
-      content = Object.toHTML(content);
-      tagName = ((position == 'before' || position == 'after')
-        ? element.parentNode : element).tagName.toUpperCase();
-
-      if (t.tags[tagName]) {
-        var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-        if (position == 'top' || position == 'after') fragments.reverse();
-        fragments.each(pos.insert.curry(element));
-      }
-      else element.insertAdjacentHTML(pos.adjacency, content.stripScripts());
-
-      content.evalScripts.bind(content).defer();
-    }
-
-    return element;
-  };
-}
-
-if (Prototype.Browser.Opera) {
-  Element.Methods._getStyle = Element.Methods.getStyle;
-  Element.Methods.getStyle = function(element, style) {
-    switch(style) {
-      case 'left':
-      case 'top':
-      case 'right':
-      case 'bottom':
-        if (Element._getStyle(element, 'position') == 'static') return null;
-      default: return Element._getStyle(element, style);
-    }
-  };
-  Element.Methods._readAttribute = Element.Methods.readAttribute;
-  Element.Methods.readAttribute = function(element, attribute) {
-    if (attribute == 'title') return element.title;
-    return Element._readAttribute(element, attribute);
-  };
-}
-
-else if (Prototype.Browser.IE) {
-  $w('positionedOffset getOffsetParent viewportOffset').each(function(method) {
-    Element.Methods[method] = Element.Methods[method].wrap(
-      function(proceed, element) {
-        element = $(element);
-        var position = element.getStyle('position');
-        if (position != 'static') return proceed(element);
-        element.setStyle({ position: 'relative' });
-        var value = proceed(element);
-        element.setStyle({ position: position });
-        return value;
-      }
-    );
-  });
-
-  Element.Methods.getStyle = function(element, style) {
-    element = $(element);
-    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
-    var value = element.style[style];
-    if (!value && element.currentStyle) value = element.currentStyle[style];
-
-    if (style == 'opacity') {
-      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
-        if (value[1]) return parseFloat(value[1]) / 100;
-      return 1.0;
-    }
-
-    if (value == 'auto') {
-      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
-        return element['offset' + style.capitalize()] + 'px';
-      return null;
-    }
-    return value;
-  };
-
-  Element.Methods.setOpacity = function(element, value) {
-    function stripAlpha(filter){
-      return filter.replace(/alpha\([^\)]*\)/gi,'');
-    }
-    element = $(element);
-    var currentStyle = element.currentStyle;
-    if ((currentStyle && !currentStyle.hasLayout) ||
-      (!currentStyle && element.style.zoom == 'normal'))
-        element.style.zoom = 1;
-
-    var filter = element.getStyle('filter'), style = element.style;
-    if (value == 1 || value === '') {
-      (filter = stripAlpha(filter)) ?
-        style.filter = filter : style.removeAttribute('filter');
-      return element;
-    } else if (value < 0.00001) value = 0;
-    style.filter = stripAlpha(filter) +
-      'alpha(opacity=' + (value * 100) + ')';
-    return element;
-  };
-
-  Element._attributeTranslations = {
-    read: {
-      names: {
-        'class': 'className',
-        'for':   'htmlFor'
-      },
-      values: {
-        _getAttr: function(element, attribute) {
-          return element.getAttribute(attribute, 2);
-        },
-        _getAttrNode: function(element, attribute) {
-          var node = element.getAttributeNode(attribute);
-          return node ? node.value : "";
-        },
-        _getEv: function(element, attribute) {
-          var attribute = element.getAttribute(attribute);
-          return attribute ? attribute.toString().slice(23, -2) : null;
-        },
-        _flag: function(element, attribute) {
-          return $(element).hasAttribute(attribute) ? attribute : null;
-        },
-        style: function(element) {
-          return element.style.cssText.toLowerCase();
-        },
-        title: function(element) {
-          return element.title;
-        }
-      }
-    }
-  };
-
-  Element._attributeTranslations.write = {
-    names: Object.clone(Element._attributeTranslations.read.names),
-    values: {
-      checked: function(element, value) {
-        element.checked = !!value;
-      },
-
-      style: function(element, value) {
-        element.style.cssText = value ? value : '';
-      }
-    }
-  };
-
-  Element._attributeTranslations.has = {};
-
-  $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
-      'encType maxLength readOnly longDesc').each(function(attr) {
-    Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
-    Element._attributeTranslations.has[attr.toLowerCase()] = attr;
-  });
-
-  (function(v) {
-    Object.extend(v, {
-      href:        v._getAttr,
-      src:         v._getAttr,
-      type:        v._getAttr,
-      action:      v._getAttrNode,
-      disabled:    v._flag,
-      checked:     v._flag,
-      readonly:    v._flag,
-      multiple:    v._flag,
-      onload:      v._getEv,
-      onunload:    v._getEv,
-      onclick:     v._getEv,
-      ondblclick:  v._getEv,
-      onmousedown: v._getEv,
-      onmouseup:   v._getEv,
-      onmouseover: v._getEv,
-      onmousemove: v._getEv,
-      onmouseout:  v._getEv,
-      onfocus:     v._getEv,
-      onblur:      v._getEv,
-      onkeypress:  v._getEv,
-      onkeydown:   v._getEv,
-      onkeyup:     v._getEv,
-      onsubmit:    v._getEv,
-      onreset:     v._getEv,
-      onselect:    v._getEv,
-      onchange:    v._getEv
-    });
-  })(Element._attributeTranslations.read.values);
-}
-
-else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1) ? 0.999999 :
-      (value === '') ? '' : (value < 0.00001) ? 0 : value;
-    return element;
-  };
-}
-
-else if (Prototype.Browser.WebKit) {
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1 || value === '') ? '' :
-      (value < 0.00001) ? 0 : value;
-
-    if (value == 1)
-      if(element.tagName == 'IMG' && element.width) {
-        element.width++; element.width--;
-      } else try {
-        var n = document.createTextNode(' ');
-        element.appendChild(n);
-        element.removeChild(n);
-      } catch (e) { }
-
-    return element;
-  };
-
-  // Safari returns margins on body which is incorrect if the child is absolutely
-  // positioned.  For performance reasons, redefine Position.cumulativeOffset for
-  // KHTML/WebKit only.
-  Element.Methods.cumulativeOffset = function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      if (element.offsetParent == document.body)
-        if (Element.getStyle(element, 'position') == 'absolute') break;
-
-      element = element.offsetParent;
-    } while (element);
-
-    return Element._returnOffset(valueL, valueT);
-  };
-}
-
-if (Prototype.Browser.IE || Prototype.Browser.Opera) {
-  // IE and Opera are missing .innerHTML support for TABLE-related and SELECT elements
-  Element.Methods.update = function(element, content) {
-    element = $(element);
-
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) return element.update().insert(content);
-
-    content = Object.toHTML(content);
-    var tagName = element.tagName.toUpperCase();
-
-    if (tagName in Element._insertionTranslations.tags) {
-      $A(element.childNodes).each(function(node) { element.removeChild(node) });
-      Element._getContentFromAnonymousElement(tagName, content.stripScripts())
-        .each(function(node) { element.appendChild(node) });
-    }
-    else element.innerHTML = content.stripScripts();
-
-    content.evalScripts.bind(content).defer();
-    return element;
-  };
-}
-
-if (document.createElement('div').outerHTML) {
-  Element.Methods.replace = function(element, content) {
-    element = $(element);
-
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) {
-      element.parentNode.replaceChild(content, element);
-      return element;
-    }
-
-    content = Object.toHTML(content);
-    var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
-
-    if (Element._insertionTranslations.tags[tagName]) {
-      var nextSibling = element.next();
-      var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-      parent.removeChild(element);
-      if (nextSibling)
-        fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
-      else
-        fragments.each(function(node) { parent.appendChild(node) });
-    }
-    else element.outerHTML = content.stripScripts();
-
-    content.evalScripts.bind(content).defer();
-    return element;
-  };
-}
-
-Element._returnOffset = function(l, t) {
-  var result = [l, t];
-  result.left = l;
-  result.top = t;
-  return result;
-};
-
-Element._getContentFromAnonymousElement = function(tagName, html) {
-  var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
-  div.innerHTML = t[0] + html + t[1];
-  t[2].times(function() { div = div.firstChild });
-  return $A(div.childNodes);
-};
-
-Element._insertionTranslations = {
-  before: {
-    adjacency: 'beforeBegin',
-    insert: function(element, node) {
-      element.parentNode.insertBefore(node, element);
-    },
-    initializeRange: function(element, range) {
-      range.setStartBefore(element);
-    }
-  },
-  top: {
-    adjacency: 'afterBegin',
-    insert: function(element, node) {
-      element.insertBefore(node, element.firstChild);
-    },
-    initializeRange: function(element, range) {
-      range.selectNodeContents(element);
-      range.collapse(true);
-    }
-  },
-  bottom: {
-    adjacency: 'beforeEnd',
-    insert: function(element, node) {
-      element.appendChild(node);
-    }
-  },
-  after: {
-    adjacency: 'afterEnd',
-    insert: function(element, node) {
-      element.parentNode.insertBefore(node, element.nextSibling);
-    },
-    initializeRange: function(element, range) {
-      range.setStartAfter(element);
-    }
-  },
-  tags: {
-    TABLE:  ['<table>',                '</table>',                   1],
-    TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
-    TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
-    TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
-    SELECT: ['<select>',               '</select>',                  1]
-  }
-};
-
-(function() {
-  this.bottom.initializeRange = this.top.initializeRange;
-  Object.extend(this.tags, {
-    THEAD: this.tags.TBODY,
-    TFOOT: this.tags.TBODY,
-    TH:    this.tags.TD
-  });
-}).call(Element._insertionTranslations);
-
-Element.Methods.Simulated = {
-  hasAttribute: function(element, attribute) {
-    attribute = Element._attributeTranslations.has[attribute] || attribute;
-    var node = $(element).getAttributeNode(attribute);
-    return node && node.specified;
-  }
-};
-
-Element.Methods.ByTag = { };
-
-Object.extend(Element, Element.Methods);
-
-if (!Prototype.BrowserFeatures.ElementExtensions &&
-    document.createElement('div').__proto__) {
-  window.HTMLElement = { };
-  window.HTMLElement.prototype = document.createElement('div').__proto__;
-  Prototype.BrowserFeatures.ElementExtensions = true;
-}
-
-Element.extend = (function() {
-  if (Prototype.BrowserFeatures.SpecificElementExtensions)
-    return Prototype.K;
-
-  var Methods = { }, ByTag = Element.Methods.ByTag;
-
-  var extend = Object.extend(function(element) {
-    if (!element || element._extendedByPrototype ||
-        element.nodeType != 1 || element == window) return element;
-
-    var methods = Object.clone(Methods),
-      tagName = element.tagName, property, value;
-
-    // extend methods for specific tags
-    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
-
-    for (property in methods) {
-      value = methods[property];
-      if (Object.isFunction(value) && !(property in element))
-        element[property] = value.methodize();
-    }
-
-    element._extendedByPrototype = Prototype.emptyFunction;
-    return element;
-
-  }, {
-    refresh: function() {
-      // extend methods for all tags (Safari doesn't need this)
-      if (!Prototype.BrowserFeatures.ElementExtensions) {
-        Object.extend(Methods, Element.Methods);
-        Object.extend(Methods, Element.Methods.Simulated);
-      }
-    }
-  });
-
-  extend.refresh();
-  return extend;
-})();
-
-Element.hasAttribute = function(element, attribute) {
-  if (element.hasAttribute) return element.hasAttribute(attribute);
-  return Element.Methods.Simulated.hasAttribute(element, attribute);
-};
-
-Element.addMethods = function(methods) {
-  var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
-
-  if (!methods) {
-    Object.extend(Form, Form.Methods);
-    Object.extend(Form.Element, Form.Element.Methods);
-    Object.extend(Element.Methods.ByTag, {
-      "FORM":     Object.clone(Form.Methods),
-      "INPUT":    Object.clone(Form.Element.Methods),
-      "SELECT":   Object.clone(Form.Element.Methods),
-      "TEXTAREA": Object.clone(Form.Element.Methods)
-    });
-  }
-
-  if (arguments.length == 2) {
-    var tagName = methods;
-    methods = arguments[1];
-  }
-
-  if (!tagName) Object.extend(Element.Methods, methods || { });
-  else {
-    if (Object.isArray(tagName)) tagName.each(extend);
-    else extend(tagName);
-  }
-
-  function extend(tagName) {
-    tagName = tagName.toUpperCase();
-    if (!Element.Methods.ByTag[tagName])
-      Element.Methods.ByTag[tagName] = { };
-    Object.extend(Element.Methods.ByTag[tagName], methods);
-  }
-
-  function copy(methods, destination, onlyIfAbsent) {
-    onlyIfAbsent = onlyIfAbsent || false;
-    for (var property in methods) {
-      var value = methods[property];
-      if (!Object.isFunction(value)) continue;
-      if (!onlyIfAbsent || !(property in destination))
-        destination[property] = value.methodize();
-    }
-  }
-
-  function findDOMClass(tagName) {
-    var klass;
-    var trans = {
-      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
-      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
-      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
-      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
-      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
-      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
-      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
-      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
-      "FrameSet", "IFRAME": "IFrame"
-    };
-    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName.capitalize() + 'Element';
-    if (window[klass]) return window[klass];
-
-    window[klass] = { };
-    window[klass].prototype = document.createElement(tagName).__proto__;
-    return window[klass];
-  }
-
-  if (F.ElementExtensions) {
-    copy(Element.Methods, HTMLElement.prototype);
-    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
-  }
-
-  if (F.SpecificElementExtensions) {
-    for (var tag in Element.Methods.ByTag) {
-      var klass = findDOMClass(tag);
-      if (Object.isUndefined(klass)) continue;
-      copy(T[tag], klass.prototype);
-    }
-  }
-
-  Object.extend(Element, Element.Methods);
-  delete Element.ByTag;
-
-  if (Element.extend.refresh) Element.extend.refresh();
-  Element.cache = { };
-};
-
-document.viewport = {
-  getDimensions: function() {
-    var dimensions = { };
-    $w('width height').each(function(d) {
-      var D = d.capitalize();
-      dimensions[d] = self['inner' + D] ||
-       (document.documentElement['client' + D] || document.body['client' + D]);
-    });
-    return dimensions;
-  },
-
-  getWidth: function() {
-    return this.getDimensions().width;
-  },
-
-  getHeight: function() {
-    return this.getDimensions().height;
-  },
-
-  getScrollOffsets: function() {
-    return Element._returnOffset(
-      window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
-      window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
-  }
-};
-/* Portions of the Selector class are derived from Jack Slocum`s DomQuery,
- * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
- * license.  Please see http://www.yui-ext.com/ for more information. */
-
-var Selector = Class.create({
-  initialize: function(expression) {
-    this.expression = expression.strip();
-    this.compileMatcher();
-  },
-
-  compileMatcher: function() {
-    // Selectors with namespaced attributes can't use the XPath version
-    if (Prototype.BrowserFeatures.XPath && !(/(\[[\w-]*?:|:checked)/).test(this.expression))
-      return this.compileXPathMatcher();
-
-    var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
-        c = Selector.criteria, le, p, m;
-
-    if (Selector._cache[e]) {
-      this.matcher = Selector._cache[e];
-      return;
-    }
-
-    this.matcher = ["this.matcher = function(root) {",
-                    "var r = root, h = Selector.handlers, c = false, n;"];
-
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        p = ps[i];
-        if (m = e.match(p)) {
-          this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
-    	      new Template(c[i]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.matcher.push("return h.unique(n);\n}");
-    eval(this.matcher.join('\n'));
-    Selector._cache[this.expression] = this.matcher;
-  },
-
-  compileXPathMatcher: function() {
-    var e = this.expression, ps = Selector.patterns,
-        x = Selector.xpath, le, m;
-
-    if (Selector._cache[e]) {
-      this.xpath = Selector._cache[e]; return;
-    }
-
-    this.matcher = ['.//*'];
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        if (m = e.match(ps[i])) {
-          this.matcher.push(Object.isFunction(x[i]) ? x[i](m) :
-            new Template(x[i]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.xpath = this.matcher.join('');
-    Selector._cache[this.expression] = this.xpath;
-  },
-
-  findElements: function(root) {
-    root = root || document;
-    if (this.xpath) return document._getElementsByXPath(this.xpath, root);
-    return this.matcher(root);
-  },
-
-  match: function(element) {
-    this.tokens = [];
-
-    var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
-    var le, p, m;
-
-    while (e && le !== e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        p = ps[i];
-        if (m = e.match(p)) {
-          // use the Selector.assertions methods unless the selector
-          // is too complex.
-          if (as[i]) {
-            this.tokens.push([i, Object.clone(m)]);
-            e = e.replace(m[0], '');
-          } else {
-            // reluctantly do a document-wide search
-            // and look for a match in the array
-            return this.findElements(document).include(element);
-          }
-        }
-      }
-    }
-
-    var match = true, name, matches;
-    for (var i = 0, token; token = this.tokens[i]; i++) {
-      name = token[0], matches = token[1];
-      if (!Selector.assertions[name](element, matches)) {
-        match = false; break;
-      }
-    }
-
-    return match;
-  },
-
-  toString: function() {
-    return this.expression;
-  },
-
-  inspect: function() {
-    return "#<Selector:" + this.expression.inspect() + ">";
-  }
-});
-
-Object.extend(Selector, {
-  _cache: { },
-
-  xpath: {
-    descendant:   "//*",
-    child:        "/*",
-    adjacent:     "/following-sibling::*[1]",
-    laterSibling: '/following-sibling::*',
-    tagName:      function(m) {
-      if (m[1] == '*') return '';
-      return "[local-name()='" + m[1].toLowerCase() +
-             "' or local-name()='" + m[1].toUpperCase() + "']";
-    },
-    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
-    id:           "[@id='#{1}']",
-    attrPresence: "[@#{1}]",
-    attr: function(m) {
-      m[3] = m[5] || m[6];
-      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
-    },
-    pseudo: function(m) {
-      var h = Selector.xpath.pseudos[m[1]];
-      if (!h) return '';
-      if (Object.isFunction(h)) return h(m);
-      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
-    },
-    operators: {
-      '=':  "[@#{1}='#{3}']",
-      '!=': "[@#{1}!='#{3}']",
-      '^=': "[starts-with(@#{1}, '#{3}')]",
-      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
-      '*=': "[contains(@#{1}, '#{3}')]",
-      '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
-      '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
-    },
-    pseudos: {
-      'first-child': '[not(preceding-sibling::*)]',
-      'last-child':  '[not(following-sibling::*)]',
-      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
-      'empty':       "[count(*) = 0 and (count(text()) = 0 or translate(text(), ' \t\r\n', '') = '')]",
-      'checked':     "[@checked]",
-      'disabled':    "[@disabled]",
-      'enabled':     "[not(@disabled)]",
-      'not': function(m) {
-        var e = m[6], p = Selector.patterns,
-            x = Selector.xpath, le, m, v;
-
-        var exclusion = [];
-        while (e && le != e && (/\S/).test(e)) {
-          le = e;
-          for (var i in p) {
-            if (m = e.match(p[i])) {
-              v = Object.isFunction(x[i]) ? x[i](m) : new Template(x[i]).evaluate(m);
-              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
-              e = e.replace(m[0], '');
-              break;
-            }
-          }
-        }
-        return "[not(" + exclusion.join(" and ") + ")]";
-      },
-      'nth-child':      function(m) {
-        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
-      },
-      'nth-last-child': function(m) {
-        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
-      },
-      'nth-of-type':    function(m) {
-        return Selector.xpath.pseudos.nth("position() ", m);
-      },
-      'nth-last-of-type': function(m) {
-        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
-      },
-      'first-of-type':  function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
-      },
-      'last-of-type':   function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
-      },
-      'only-of-type':   function(m) {
-        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
-      },
-      nth: function(fragment, m) {
-        var mm, formula = m[6], predicate;
-        if (formula == 'even') formula = '2n+0';
-        if (formula == 'odd')  formula = '2n+1';
-        if (mm = formula.match(/^(\d+)$/)) // digit only
-          return '[' + fragment + "= " + mm[1] + ']';
-        if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-          if (mm[1] == "-") mm[1] = -1;
-          var a = mm[1] ? Number(mm[1]) : 1;
-          var b = mm[2] ? Number(mm[2]) : 0;
-          predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
-          "((#{fragment} - #{b}) div #{a} >= 0)]";
-          return new Template(predicate).evaluate({
-            fragment: fragment, a: a, b: b });
-        }
-      }
-    }
-  },
-
-  criteria: {
-    tagName:      'n = h.tagName(n, r, "#{1}", c);   c = false;',
-    className:    'n = h.className(n, r, "#{1}", c); c = false;',
-    id:           'n = h.id(n, r, "#{1}", c);        c = false;',
-    attrPresence: 'n = h.attrPresence(n, r, "#{1}"); c = false;',
-    attr: function(m) {
-      m[3] = (m[5] || m[6]);
-      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}"); c = false;').evaluate(m);
-    },
-    pseudo: function(m) {
-      if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
-      return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
-    },
-    descendant:   'c = "descendant";',
-    child:        'c = "child";',
-    adjacent:     'c = "adjacent";',
-    laterSibling: 'c = "laterSibling";'
-  },
-
-  patterns: {
-    // combinators must be listed first
-    // (and descendant needs to be last combinator)
-    laterSibling: /^\s*~\s*/,
-    child:        /^\s*>\s*/,
-    adjacent:     /^\s*\+\s*/,
-    descendant:   /^\s/,
-
-    // selectors follow
-    tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
-    id:           /^#([\w\-\*]+)(\b|$)/,
-    className:    /^\.([\w\-\*]+)(\b|$)/,
-    pseudo:       /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s)|(?=:))/,
-    attrPresence: /^\[([\w]+)\]/,
-    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
-  },
-
-  // for Selector.match and Element#match
-  assertions: {
-    tagName: function(element, matches) {
-      return matches[1].toUpperCase() == element.tagName.toUpperCase();
-    },
-
-    className: function(element, matches) {
-      return Element.hasClassName(element, matches[1]);
-    },
-
-    id: function(element, matches) {
-      return element.id === matches[1];
-    },
-
-    attrPresence: function(element, matches) {
-      return Element.hasAttribute(element, matches[1]);
-    },
-
-    attr: function(element, matches) {
-      var nodeValue = Element.readAttribute(element, matches[1]);
-      return Selector.operators[matches[2]](nodeValue, matches[3]);
-    }
-  },
-
-  handlers: {
-    // UTILITY FUNCTIONS
-    // joins two collections
-    concat: function(a, b) {
-      for (var i = 0, node; node = b[i]; i++)
-        a.push(node);
-      return a;
-    },
-
-    // marks an array of nodes for counting
-    mark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._counted = true;
-      return nodes;
-    },
-
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._counted = undefined;
-      return nodes;
-    },
-
-    // mark each child node with its position (for nth calls)
-    // "ofType" flag indicates whether we're indexing for nth-of-type
-    // rather than nth-child
-    index: function(parentNode, reverse, ofType) {
-      parentNode._counted = true;
-      if (reverse) {
-        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
-          var node = nodes[i];
-          if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
-        }
-      } else {
-        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
-          if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
-      }
-    },
-
-    // filters out duplicates and extends all nodes
-    unique: function(nodes) {
-      if (nodes.length == 0) return nodes;
-      var results = [], n;
-      for (var i = 0, l = nodes.length; i < l; i++)
-        if (!(n = nodes[i])._counted) {
-          n._counted = true;
-          results.push(Element.extend(n));
-        }
-      return Selector.handlers.unmark(results);
-    },
-
-    // COMBINATOR FUNCTIONS
-    descendant: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, node.getElementsByTagName('*'));
-      return results;
-    },
-
-    child: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        for (var j = 0, children = [], child; child = node.childNodes[j]; j++)
-          if (child.nodeType == 1 && child.tagName != '!') results.push(child);
-      }
-      return results;
-    },
-
-    adjacent: function(nodes) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        var next = this.nextElementSibling(node);
-        if (next) results.push(next);
-      }
-      return results;
-    },
-
-    laterSibling: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, Element.nextSiblings(node));
-      return results;
-    },
-
-    nextElementSibling: function(node) {
-      while (node = node.nextSibling)
-	      if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    previousElementSibling: function(node) {
-      while (node = node.previousSibling)
-        if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    // TOKEN FUNCTIONS
-    tagName: function(nodes, root, tagName, combinator) {
-      tagName = tagName.toUpperCase();
-      var results = [], h = Selector.handlers;
-      if (nodes) {
-        if (combinator) {
-          // fastlane for ordinary descendant combinators
-          if (combinator == "descendant") {
-            for (var i = 0, node; node = nodes[i]; i++)
-              h.concat(results, node.getElementsByTagName(tagName));
-            return results;
-          } else nodes = this[combinator](nodes);
-          if (tagName == "*") return nodes;
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.tagName.toUpperCase() == tagName) results.push(node);
-        return results;
-      } else return root.getElementsByTagName(tagName);
-    },
-
-    id: function(nodes, root, id, combinator) {
-      var targetNode = $(id), h = Selector.handlers;
-      if (!targetNode) return [];
-      if (!nodes && root == document) return [targetNode];
-      if (nodes) {
-        if (combinator) {
-          if (combinator == 'child') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (targetNode.parentNode == node) return [targetNode];
-          } else if (combinator == 'descendant') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Element.descendantOf(targetNode, node)) return [targetNode];
-          } else if (combinator == 'adjacent') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Selector.handlers.previousElementSibling(targetNode) == node)
-                return [targetNode];
-          } else nodes = h[combinator](nodes);
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node == targetNode) return [targetNode];
-        return [];
-      }
-      return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
-    },
-
-    className: function(nodes, root, className, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      return Selector.handlers.byClassName(nodes, root, className);
-    },
-
-    byClassName: function(nodes, root, className) {
-      if (!nodes) nodes = Selector.handlers.descendant([root]);
-      var needle = ' ' + className + ' ';
-      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
-        nodeClassName = node.className;
-        if (nodeClassName.length == 0) continue;
-        if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
-          results.push(node);
-      }
-      return results;
-    },
-
-    attrPresence: function(nodes, root, attr) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      var results = [];
-      for (var i = 0, node; node = nodes[i]; i++)
-        if (Element.hasAttribute(node, attr)) results.push(node);
-      return results;
-    },
-
-    attr: function(nodes, root, attr, value, operator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      var handler = Selector.operators[operator], results = [];
-      for (var i = 0, node; node = nodes[i]; i++) {
-        var nodeValue = Element.readAttribute(node, attr);
-        if (nodeValue === null) continue;
-        if (handler(nodeValue, value)) results.push(node);
-      }
-      return results;
-    },
-
-    pseudo: function(nodes, name, value, root, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      return Selector.pseudos[name](nodes, value, root);
-    }
-  },
-
-  pseudos: {
-    'first-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.previousElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'last-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.nextElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'only-child': function(nodes, value, root) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
-          results.push(node);
-      return results;
-    },
-    'nth-child':        function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root);
-    },
-    'nth-last-child':   function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true);
-    },
-    'nth-of-type':      function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, false, true);
-    },
-    'nth-last-of-type': function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true, true);
-    },
-    'first-of-type':    function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, false, true);
-    },
-    'last-of-type':     function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, true, true);
-    },
-    'only-of-type':     function(nodes, formula, root) {
-      var p = Selector.pseudos;
-      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
-    },
-
-    // handles the an+b logic
-    getIndices: function(a, b, total) {
-      if (a == 0) return b > 0 ? [b] : [];
-      return $R(1, total).inject([], function(memo, i) {
-        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
-        return memo;
-      });
-    },
-
-    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
-    nth: function(nodes, formula, root, reverse, ofType) {
-      if (nodes.length == 0) return [];
-      if (formula == 'even') formula = '2n+0';
-      if (formula == 'odd')  formula = '2n+1';
-      var h = Selector.handlers, results = [], indexed = [], m;
-      h.mark(nodes);
-      for (var i = 0, node; node = nodes[i]; i++) {
-        if (!node.parentNode._counted) {
-          h.index(node.parentNode, reverse, ofType);
-          indexed.push(node.parentNode);
-        }
-      }
-      if (formula.match(/^\d+$/)) { // just a number
-        formula = Number(formula);
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.nodeIndex == formula) results.push(node);
-      } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-        if (m[1] == "-") m[1] = -1;
-        var a = m[1] ? Number(m[1]) : 1;
-        var b = m[2] ? Number(m[2]) : 0;
-        var indices = Selector.pseudos.getIndices(a, b, nodes.length);
-        for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
-          for (var j = 0; j < l; j++)
-            if (node.nodeIndex == indices[j]) results.push(node);
-        }
-      }
-      h.unmark(nodes);
-      h.unmark(indexed);
-      return results;
-    },
-
-    'empty': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        // IE treats comments as element nodes
-        if (node.tagName == '!' || (node.firstChild && !node.innerHTML.match(/^\s*$/))) continue;
-        results.push(node);
-      }
-      return results;
-    },
-
-    'not': function(nodes, selector, root) {
-      var h = Selector.handlers, selectorType, m;
-      var exclusions = new Selector(selector).findElements(root);
-      h.mark(exclusions);
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node._counted) results.push(node);
-      h.unmark(exclusions);
-      return results;
-    },
-
-    'enabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node.disabled) results.push(node);
-      return results;
-    },
-
-    'disabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.disabled) results.push(node);
-      return results;
-    },
-
-    'checked': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.checked) results.push(node);
-      return results;
-    }
-  },
-
-  operators: {
-    '=':  function(nv, v) { return nv == v; },
-    '!=': function(nv, v) { return nv != v; },
-    '^=': function(nv, v) { return nv.startsWith(v); },
-    '$=': function(nv, v) { return nv.endsWith(v); },
-    '*=': function(nv, v) { return nv.include(v); },
-    '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
-    '|=': function(nv, v) { return ('-' + nv.toUpperCase() + '-').include('-' + v.toUpperCase() + '-'); }
-  },
-
-  matchElements: function(elements, expression) {
-    var matches = new Selector(expression).findElements(), h = Selector.handlers;
-    h.mark(matches);
-    for (var i = 0, results = [], element; element = elements[i]; i++)
-      if (element._counted) results.push(element);
-    h.unmark(matches);
-    return results;
-  },
-
-  findElement: function(elements, expression, index) {
-    if (Object.isNumber(expression)) {
-      index = expression; expression = false;
-    }
-    return Selector.matchElements(elements, expression || '*')[index || 0];
-  },
-
-  findChildElements: function(element, expressions) {
-    var exprs = expressions.join(','), expressions = [];
-    exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
-      expressions.push(m[1].strip());
-    });
-    var results = [], h = Selector.handlers;
-    for (var i = 0, l = expressions.length, selector; i < l; i++) {
-      selector = new Selector(expressions[i].strip());
-      h.concat(results, selector.findElements(element));
-    }
-    return (l > 1) ? h.unique(results) : results;
-  }
-});
-
-function $$() {
-  return Selector.findChildElements(document, $A(arguments));
-}
-var Form = {
-  reset: function(form) {
-    $(form).reset();
-    return form;
-  },
-
-  serializeElements: function(elements, options) {
-    if (typeof options != 'object') options = { hash: !!options };
-    else if (options.hash === undefined) options.hash = true;
-    var key, value, submitted = false, submit = options.submit;
-
-    var data = elements.inject({ }, function(result, element) {
-      if (!element.disabled && element.name) {
-        key = element.name; value = $(element).getValue();
-        if (value != null && (element.type != 'submit' || (!submitted &&
-            submit !== false && (!submit || key == submit) && (submitted = true)))) {
-          if (key in result) {
-            // a key is already present; construct an array of values
-            if (!Object.isArray(result[key])) result[key] = [result[key]];
-            result[key].push(value);
-          }
-          else result[key] = value;
-        }
-      }
-      return result;
-    });
-
-    return options.hash ? data : Object.toQueryString(data);
-  }
-};
-
-Form.Methods = {
-  serialize: function(form, options) {
-    return Form.serializeElements(Form.getElements(form), options);
-  },
-
-  getElements: function(form) {
-    return $A($(form).getElementsByTagName('*')).inject([],
-      function(elements, child) {
-        if (Form.Element.Serializers[child.tagName.toLowerCase()])
-          elements.push(Element.extend(child));
-        return elements;
-      }
-    );
-  },
-
-  getInputs: function(form, typeName, name) {
-    form = $(form);
-    var inputs = form.getElementsByTagName('input');
-
-    if (!typeName && !name) return $A(inputs).map(Element.extend);
-
-    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
-      var input = inputs[i];
-      if ((typeName && input.type != typeName) || (name && input.name != name))
-        continue;
-      matchingInputs.push(Element.extend(input));
-    }
-
-    return matchingInputs;
-  },
-
-  disable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('disable');
-    return form;
-  },
-
-  enable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('enable');
-    return form;
-  },
-
-  findFirstElement: function(form) {
-    var elements = $(form).getElements().findAll(function(element) {
-      return 'hidden' != element.type && !element.disabled;
-    });
-    var firstByIndex = elements.findAll(function(element) {
-      return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
-    }).sortBy(function(element) { return element.tabIndex }).first();
-
-    return firstByIndex ? firstByIndex : elements.find(function(element) {
-      return ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
-    });
-  },
-
-  focusFirstElement: function(form) {
-    form = $(form);
-    form.findFirstElement().activate();
-    return form;
-  },
-
-  request: function(form, options) {
-    form = $(form), options = Object.clone(options || { });
-
-    var params = options.parameters, action = form.readAttribute('action') || '';
-    if (action.blank()) action = window.location.href;
-    options.parameters = form.serialize(true);
-
-    if (params) {
-      if (Object.isString(params)) params = params.toQueryParams();
-      Object.extend(options.parameters, params);
-    }
-
-    if (form.hasAttribute('method') && !options.method)
-      options.method = form.method;
-
-    return new Ajax.Request(action, options);
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element = {
-  focus: function(element) {
-    $(element).focus();
-    return element;
-  },
-
-  select: function(element) {
-    $(element).select();
-    return element;
-  }
-};
-
-Form.Element.Methods = {
-  serialize: function(element) {
-    element = $(element);
-    if (!element.disabled && element.name) {
-      var value = element.getValue();
-      if (value != undefined) {
-        var pair = { };
-        pair[element.name] = value;
-        return Object.toQueryString(pair);
-      }
-    }
-    return '';
-  },
-
-  getValue: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    return Form.Element.Serializers[method](element);
-  },
-
-  setValue: function(element, value) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    Form.Element.Serializers[method](element, value);
-    return element;
-  },
-
-  clear: function(element) {
-    $(element).value = '';
-    return element;
-  },
-
-  present: function(element) {
-    return $(element).value != '';
-  },
-
-  activate: function(element) {
-    element = $(element);
-    try {
-      element.focus();
-      if (element.select && (element.tagName.toLowerCase() != 'input' ||
-          !['button', 'reset', 'submit'].include(element.type)))
-        element.select();
-    } catch (e) { }
-    return element;
-  },
-
-  disable: function(element) {
-    element = $(element);
-    element.blur();
-    element.disabled = true;
-    return element;
-  },
-
-  enable: function(element) {
-    element = $(element);
-    element.disabled = false;
-    return element;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-var Field = Form.Element;
-var $F = Form.Element.Methods.getValue;
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element.Serializers = {
-  input: function(element, value) {
-    switch (element.type.toLowerCase()) {
-      case 'checkbox':
-      case 'radio':
-        return Form.Element.Serializers.inputSelector(element, value);
-      default:
-        return Form.Element.Serializers.textarea(element, value);
-    }
-  },
-
-  inputSelector: function(element, value) {
-    if (value === undefined) return element.checked ? element.value : null;
-    else element.checked = !!value;
-  },
-
-  textarea: function(element, value) {
-    if (value === undefined) return element.value;
-    else element.value = value;
-  },
-
-  select: function(element, index) {
-    if (index === undefined)
-      return this[element.type == 'select-one' ?
-        'selectOne' : 'selectMany'](element);
-    else {
-      var opt, value, single = !Object.isArray(index);
-      for (var i = 0, length = element.length; i < length; i++) {
-        opt = element.options[i];
-        value = this.optionValue(opt);
-        if (single) {
-          if (value == index) {
-            opt.selected = true;
-            return;
-          }
-        }
-        else opt.selected = index.include(value);
-      }
-    }
-  },
-
-  selectOne: function(element) {
-    var index = element.selectedIndex;
-    return index >= 0 ? this.optionValue(element.options[index]) : null;
-  },
-
-  selectMany: function(element) {
-    var values, length = element.length;
-    if (!length) return null;
-
-    for (var i = 0, values = []; i < length; i++) {
-      var opt = element.options[i];
-      if (opt.selected) values.push(this.optionValue(opt));
-    }
-    return values;
-  },
-
-  optionValue: function(opt) {
-    // extend element because hasAttribute may not be native
-    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
-  initialize: function($super, element, frequency, callback) {
-    $super(callback, frequency);
-    this.element   = $(element);
-    this.lastValue = this.getValue();
-  },
-
-  execute: function() {
-    var value = this.getValue();
-    if (Object.isString(this.lastValue) && Object.isString(value) ?
-        this.lastValue != value : String(this.lastValue) != String(value)) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  }
-});
-
-Form.Element.Observer = Class.create(Abstract.TimedObserver, {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.Observer = Class.create(Abstract.TimedObserver, {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.EventObserver = Class.create({
-  initialize: function(element, callback) {
-    this.element  = $(element);
-    this.callback = callback;
-
-    this.lastValue = this.getValue();
-    if (this.element.tagName.toLowerCase() == 'form')
-      this.registerFormCallbacks();
-    else
-      this.registerCallback(this.element);
-  },
-
-  onElementEvent: function() {
-    var value = this.getValue();
-    if (this.lastValue != value) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  },
-
-  registerFormCallbacks: function() {
-    Form.getElements(this.element).each(this.registerCallback, this);
-  },
-
-  registerCallback: function(element) {
-    if (element.type) {
-      switch (element.type.toLowerCase()) {
-        case 'checkbox':
-        case 'radio':
-          Event.observe(element, 'click', this.onElementEvent.bind(this));
-          break;
-        default:
-          Event.observe(element, 'change', this.onElementEvent.bind(this));
-          break;
-      }
-    }
-  }
-});
-
-Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.EventObserver = Class.create(Abstract.EventObserver, {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-if (!window.Event) var Event = { };
-
-Object.extend(Event, {
-  KEY_BACKSPACE: 8,
-  KEY_TAB:       9,
-  KEY_RETURN:   13,
-  KEY_ESC:      27,
-  KEY_LEFT:     37,
-  KEY_UP:       38,
-  KEY_RIGHT:    39,
-  KEY_DOWN:     40,
-  KEY_DELETE:   46,
-  KEY_HOME:     36,
-  KEY_END:      35,
-  KEY_PAGEUP:   33,
-  KEY_PAGEDOWN: 34,
-  KEY_INSERT:   45,
-
-  cache: { },
-
-  relatedTarget: function(event) {
-    var element;
-    switch(event.type) {
-      case 'mouseover': element = event.fromElement; break;
-      case 'mouseout':  element = event.toElement;   break;
-      default: return null;
-    }
-    return Element.extend(element);
-  }
-});
-
-Event.Methods = (function() {
-  var isButton;
-
-  if (Prototype.Browser.IE) {
-    var buttonMap = { 0: 1, 1: 4, 2: 2 };
-    isButton = function(event, code) {
-      return event.button == buttonMap[code];
-    };
-
-  } else if (Prototype.Browser.WebKit) {
-    isButton = function(event, code) {
-      switch (code) {
-        case 0: return event.which == 1 && !event.metaKey;
-        case 1: return event.which == 1 && event.metaKey;
-        default: return false;
-      }
-    };
-
-  } else {
-    isButton = function(event, code) {
-      return event.which ? (event.which === code + 1) : (event.button === code);
-    };
-  }
-
-  return {
-    isLeftClick:   function(event) { return isButton(event, 0) },
-    isMiddleClick: function(event) { return isButton(event, 1) },
-    isRightClick:  function(event) { return isButton(event, 2) },
-
-    element: function(event) {
-      var node = Event.extend(event).target;
-      return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node);
-    },
-
-    findElement: function(event, expression) {
-      var element = Event.element(event);
-      return element.match(expression) ? element : element.up(expression);
-    },
-
-    pointer: function(event) {
-      return {
-        x: event.pageX || (event.clientX +
-          (document.documentElement.scrollLeft || document.body.scrollLeft)),
-        y: event.pageY || (event.clientY +
-          (document.documentElement.scrollTop || document.body.scrollTop))
-      };
-    },
-
-    pointerX: function(event) { return Event.pointer(event).x },
-    pointerY: function(event) { return Event.pointer(event).y },
-
-    stop: function(event) {
-      Event.extend(event);
-      event.preventDefault();
-      event.stopPropagation();
-      event.stopped = true;
-    }
-  };
-})();
-
-Event.extend = (function() {
-  var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
-    m[name] = Event.Methods[name].methodize();
-    return m;
-  });
-
-  if (Prototype.Browser.IE) {
-    Object.extend(methods, {
-      stopPropagation: function() { this.cancelBubble = true },
-      preventDefault:  function() { this.returnValue = false },
-      inspect: function() { return "[object Event]" }
-    });
-
-    return function(event) {
-      if (!event) return false;
-      if (event._extendedByPrototype) return event;
-
-      event._extendedByPrototype = Prototype.emptyFunction;
-      var pointer = Event.pointer(event);
-      Object.extend(event, {
-        target: event.srcElement,
-        relatedTarget: Event.relatedTarget(event),
-        pageX:  pointer.x,
-        pageY:  pointer.y
-      });
-      return Object.extend(event, methods);
-    };
-
-  } else {
-    Event.prototype = Event.prototype || document.createEvent("HTMLEvents").__proto__;
-    Object.extend(Event.prototype, methods);
-    return Prototype.K;
-  }
-})();
-
-Object.extend(Event, (function() {
-  var cache = Event.cache;
-
-  function getEventID(element) {
-    if (element._eventID) return element._eventID;
-    arguments.callee.id = arguments.callee.id || 1;
-    return element._eventID = ++arguments.callee.id;
-  }
-
-  function getDOMEventName(eventName) {
-    if (eventName && eventName.include(':')) return "dataavailable";
-    return eventName;
-  }
-
-  function getCacheForID(id) {
-    return cache[id] = cache[id] || { };
-  }
-
-  function getWrappersForEventName(id, eventName) {
-    var c = getCacheForID(id);
-    return c[eventName] = c[eventName] || [];
-  }
-
-  function createWrapper(element, eventName, handler) {
-    var id = getEventID(element);
-    var c = getWrappersForEventName(id, eventName);
-    if (c.pluck("handler").include(handler)) return false;
-
-    var wrapper = function(event) {
-      if (!Event || !Event.extend ||
-        (event.eventName && event.eventName != eventName))
-          return false;
-
-      Event.extend(event);
-      handler.call(element, event)
-    };
-
-    wrapper.handler = handler;
-    c.push(wrapper);
-    return wrapper;
-  }
-
-  function findWrapper(id, eventName, handler) {
-    var c = getWrappersForEventName(id, eventName);
-    return c.find(function(wrapper) { return wrapper.handler == handler });
-  }
-
-  function destroyWrapper(id, eventName, handler) {
-    var c = getCacheForID(id);
-    if (!c[eventName]) return false;
-    c[eventName] = c[eventName].without(findWrapper(id, eventName, handler));
-  }
-
-  function destroyCache() {
-    for (var id in cache)
-      for (var eventName in cache[id])
-        cache[id][eventName] = null;
-  }
-
-  if (window.attachEvent) {
-    window.attachEvent("onunload", destroyCache);
-  }
-
-  return {
-    observe: function(element, eventName, handler) {
-      element = $(element);
-      var name = getDOMEventName(eventName);
-
-      var wrapper = createWrapper(element, eventName, handler);
-      if (!wrapper) return element;
-
-      if (element.addEventListener) {
-        element.addEventListener(name, wrapper, false);
-      } else {
-        element.attachEvent("on" + name, wrapper);
-      }
-
-      return element;
-    },
-
-    stopObserving: function(element, eventName, handler) {
-      element = $(element);
-      var id = getEventID(element), name = getDOMEventName(eventName);
-
-      if (!handler && eventName) {
-        getWrappersForEventName(id, eventName).each(function(wrapper) {
-          element.stopObserving(eventName, wrapper.handler);
-        });
-        return element;
-
-      } else if (!eventName) {
-        Object.keys(getCacheForID(id)).each(function(eventName) {
-          element.stopObserving(eventName);
-        });
-        return element;
-      }
-
-      var wrapper = findWrapper(id, eventName, handler);
-      if (!wrapper) return element;
-
-      if (element.removeEventListener) {
-        element.removeEventListener(name, wrapper, false);
-      } else {
-        element.detachEvent("on" + name, wrapper);
-      }
-
-      destroyWrapper(id, eventName, handler);
-
-      return element;
-    },
-
-    fire: function(element, eventName, memo) {
-      element = $(element);
-      if (element == document && document.createEvent && !element.dispatchEvent)
-        element = document.documentElement;
-
-      if (document.createEvent) {
-        var event = document.createEvent("HTMLEvents");
-        event.initEvent("dataavailable", true, true);
-      } else {
-        var event = document.createEventObject();
-        event.eventType = "ondataavailable";
-      }
-
-      event.eventName = eventName;
-      event.memo = memo || { };
-
-      if (document.createEvent) {
-        element.dispatchEvent(event);
-      } else {
-        element.fireEvent(event.eventType, event);
-      }
-
-      return event;
-    }
-  };
-})());
-
-Object.extend(Event, Event.Methods);
-
-Element.addMethods({
-  fire:          Event.fire,
-  observe:       Event.observe,
-  stopObserving: Event.stopObserving
-});
-
-Object.extend(document, {
-  fire:          Element.Methods.fire.methodize(),
-  observe:       Element.Methods.observe.methodize(),
-  stopObserving: Element.Methods.stopObserving.methodize()
-});
-
-(function() {
-  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
-     Matthias Miller, Dean Edwards and John Resig. */
-
-  var timer, fired = false;
-
-  function fireContentLoadedEvent() {
-    if (fired) return;
-    if (timer) window.clearInterval(timer);
-    document.fire("dom:loaded");
-    fired = true;
-  }
-
-  if (document.addEventListener) {
-    if (Prototype.Browser.WebKit) {
-      timer = window.setInterval(function() {
-        if (/loaded|complete/.test(document.readyState))
-          fireContentLoadedEvent();
-      }, 0);
-
-      Event.observe(window, "load", fireContentLoadedEvent);
-
-    } else {
-      document.addEventListener("DOMContentLoaded",
-        fireContentLoadedEvent, false);
-    }
-
-  } else {
-    document.write("<script id=__onDOMContentLoaded defer src=//:><\/script>");
-    $("__onDOMContentLoaded").onreadystatechange = function() {
-      if (this.readyState == "complete") {
-        this.onreadystatechange = null;
-        fireContentLoadedEvent();
-      }
-    };
-  }
-})();
-/*------------------------------- DEPRECATED -------------------------------*/
-
-Hash.toQueryString = Object.toQueryString;
-
-var Toggle = { display: Element.toggle };
-
-Element.Methods.childOf = Element.Methods.descendantOf;
-
-var Insertion = {
-  Before: function(element, content) {
-    return Element.insert(element, {before:content});
-  },
-
-  Top: function(element, content) {
-    return Element.insert(element, {top:content});
-  },
-
-  Bottom: function(element, content) {
-    return Element.insert(element, {bottom:content});
-  },
-
-  After: function(element, content) {
-    return Element.insert(element, {after:content});
-  }
-};
-
-var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
-
-// This should be moved to script.aculo.us; notice the deprecated methods
-// further below, that map to the newer Element methods.
-var Position = {
-  // set to true if needed, warning: firefox performance problems
-  // NOT neeeded for page scrolling, only if draggable contained in
-  // scrollable elements
-  includeScrollOffsets: false,
-
-  // must be called before calling withinIncludingScrolloffset, every time the
-  // page is scrolled
-  prepare: function() {
-    this.deltaX =  window.pageXOffset
-                || document.documentElement.scrollLeft
-                || document.body.scrollLeft
-                || 0;
-    this.deltaY =  window.pageYOffset
-                || document.documentElement.scrollTop
-                || document.body.scrollTop
-                || 0;
-  },
-
-  // caches x/y coordinate pair to use with overlap
-  within: function(element, x, y) {
-    if (this.includeScrollOffsets)
-      return this.withinIncludingScrolloffsets(element, x, y);
-    this.xcomp = x;
-    this.ycomp = y;
-    this.offset = Element.cumulativeOffset(element);
-
-    return (y >= this.offset[1] &&
-            y <  this.offset[1] + element.offsetHeight &&
-            x >= this.offset[0] &&
-            x <  this.offset[0] + element.offsetWidth);
-  },
-
-  withinIncludingScrolloffsets: function(element, x, y) {
-    var offsetcache = Element.cumulativeScrollOffset(element);
-
-    this.xcomp = x + offsetcache[0] - this.deltaX;
-    this.ycomp = y + offsetcache[1] - this.deltaY;
-    this.offset = Element.cumulativeOffset(element);
-
-    return (this.ycomp >= this.offset[1] &&
-            this.ycomp <  this.offset[1] + element.offsetHeight &&
-            this.xcomp >= this.offset[0] &&
-            this.xcomp <  this.offset[0] + element.offsetWidth);
-  },
-
-  // within must be called directly before
-  overlap: function(mode, element) {
-    if (!mode) return 0;
-    if (mode == 'vertical')
-      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
-        element.offsetHeight;
-    if (mode == 'horizontal')
-      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
-        element.offsetWidth;
-  },
-
-  // Deprecation layer -- use newer Element methods now (1.5.2).
-
-  cumulativeOffset: Element.Methods.cumulativeOffset,
-
-  positionedOffset: Element.Methods.positionedOffset,
-
-  absolutize: function(element) {
-    Position.prepare();
-    return Element.absolutize(element);
-  },
-
-  relativize: function(element) {
-    Position.prepare();
-    return Element.relativize(element);
-  },
-
-  realOffset: Element.Methods.cumulativeScrollOffset,
-
-  offsetParent: Element.Methods.getOffsetParent,
-
-  page: Element.Methods.viewportOffset,
-
-  clone: function(source, target, options) {
-    options = options || { };
-    return Element.clonePosition(target, source, options);
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
-  function iter(name) {
-    return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
-  }
-
-  instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
-  function(element, className) {
-    className = className.toString().strip();
-    var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
-    return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
-  } : function(element, className) {
-    className = className.toString().strip();
-    var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
-    if (!classNames && !className) return elements;
-
-    var nodes = $(element).getElementsByTagName('*');
-    className = ' ' + className + ' ';
-
-    for (var i = 0, child, cn; child = nodes[i]; i++) {
-      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
-          (classNames && classNames.all(function(name) {
-            return !name.toString().blank() && cn.include(' ' + name + ' ');
-          }))))
-        elements.push(Element.extend(child));
-    }
-    return elements;
-  };
-
-  return function(className, parentElement) {
-    return $(parentElement || document.body).getElementsByClassName(className);
-  };
-}(Element.Methods);
-
-/*--------------------------------------------------------------------------*/
-
-Element.ClassNames = Class.create();
-Element.ClassNames.prototype = {
-  initialize: function(element) {
-    this.element = $(element);
-  },
-
-  _each: function(iterator) {
-    this.element.className.split(/\s+/).select(function(name) {
-      return name.length > 0;
-    })._each(iterator);
-  },
-
-  set: function(className) {
-    this.element.className = className;
-  },
-
-  add: function(classNameToAdd) {
-    if (this.include(classNameToAdd)) return;
-    this.set($A(this).concat(classNameToAdd).join(' '));
-  },
-
-  remove: function(classNameToRemove) {
-    if (!this.include(classNameToRemove)) return;
-    this.set($A(this).without(classNameToRemove).join(' '));
-  },
-
-  toString: function() {
-    return $A(this).join(' ');
-  }
-};
-
-Object.extend(Element.ClassNames.prototype, Enumerable);
-
-/*--------------------------------------------------------------------------*/
-
-Element.addMethods();
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/scriptaculous.js b/mp-wp/wp-includes/js/scriptaculous/scriptaculous.js
--- a/mp-wp/wp-includes/js/scriptaculous/scriptaculous.js 1bf62b59e6e8920e465495f14abf44dbfdae10f9633eab17c26b98781f6c254a81663f9ba7350f2e92095c89d1e90c6ce973306cc93659b2605e8524831d0cc1
+++ b/mp-wp/wp-includes/js/scriptaculous/scriptaculous.js false
@@ -1,58 +0,0 @@
-// script.aculo.us scriptaculous.js v1.8.0, Tue Nov 06 15:01:40 +0300 2007
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Scriptaculous = {
-  Version: '1.8.0',
-  require: function(libraryName) {
-    // inserting via DOM fails in Safari 2.0, so brute force approach
-    document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
-  },
-  REQUIRED_PROTOTYPE: '1.6.0',
-  load: function() {
-    function convertVersionString(versionString){
-      var r = versionString.split('.');
-      return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]);
-    }
- 
-    if((typeof Prototype=='undefined') || 
-       (typeof Element == 'undefined') || 
-       (typeof Element.Methods=='undefined') ||
-       (convertVersionString(Prototype.Version) < 
-        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
-       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
-        Scriptaculous.REQUIRED_PROTOTYPE);
-    
-    $A(document.getElementsByTagName("script")).findAll( function(s) {
-      return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
-    }).each( function(s) {
-      var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
-      var includes = s.src.match(/\?.*load=([a-z,]*)/);
-      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
-       function(include) { Scriptaculous.require(path+include+'.js') });
-    });
-  }
-}
-
-Scriptaculous.load();
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/slider.js b/mp-wp/wp-includes/js/scriptaculous/slider.js
--- a/mp-wp/wp-includes/js/scriptaculous/slider.js c6737e3827261a69e975c8c783d5496e7e5c3166318caa868b8ff3aec4aa2deed46fa0c0825cd5df1e8fe82728e8534b081337c1dce047c48f0ef0fdb8b47ecf
+++ b/mp-wp/wp-includes/js/scriptaculous/slider.js false
@@ -1,275 +0,0 @@
-// script.aculo.us slider.js v1.8.0, Tue Nov 06 15:01:40 +0300 2007
-
-// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs 
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-if (!Control) var Control = { };
-
-// options:
-//  axis: 'vertical', or 'horizontal' (default)
-//
-// callbacks:
-//  onChange(value)
-//  onSlide(value)
-Control.Slider = Class.create({
-  initialize: function(handle, track, options) {
-    var slider = this;
-    
-    if (Object.isArray(handle)) {
-      this.handles = handle.collect( function(e) { return $(e) });
-    } else {
-      this.handles = [$(handle)];
-    }
-    
-    this.track   = $(track);
-    this.options = options || { };
-
-    this.axis      = this.options.axis || 'horizontal';
-    this.increment = this.options.increment || 1;
-    this.step      = parseInt(this.options.step || '1');
-    this.range     = this.options.range || $R(0,1);
-    
-    this.value     = 0; // assure backwards compat
-    this.values    = this.handles.map( function() { return 0 });
-    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
-    this.options.startSpan = $(this.options.startSpan || null);
-    this.options.endSpan   = $(this.options.endSpan || null);
-
-    this.restricted = this.options.restricted || false;
-
-    this.maximum   = this.options.maximum || this.range.end;
-    this.minimum   = this.options.minimum || this.range.start;
-
-    // Will be used to align the handle onto the track, if necessary
-    this.alignX = parseInt(this.options.alignX || '0');
-    this.alignY = parseInt(this.options.alignY || '0');
-    
-    this.trackLength = this.maximumOffset() - this.minimumOffset();
-
-    this.handleLength = this.isVertical() ? 
-      (this.handles[0].offsetHeight != 0 ? 
-        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : 
-      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : 
-        this.handles[0].style.width.replace(/px$/,""));
-
-    this.active   = false;
-    this.dragging = false;
-    this.disabled = false;
-
-    if (this.options.disabled) this.setDisabled();
-
-    // Allowed values array
-    this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
-    if (this.allowedValues) {
-      this.minimum = this.allowedValues.min();
-      this.maximum = this.allowedValues.max();
-    }
-
-    this.eventMouseDown = this.startDrag.bindAsEventListener(this);
-    this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
-    this.eventMouseMove = this.update.bindAsEventListener(this);
-
-    // Initialize handles in reverse (make sure first handle is active)
-    this.handles.each( function(h,i) {
-      i = slider.handles.length-1-i;
-      slider.setValue(parseFloat(
-        (Object.isArray(slider.options.sliderValue) ? 
-          slider.options.sliderValue[i] : slider.options.sliderValue) || 
-         slider.range.start), i);
-      h.makePositioned().observe("mousedown", slider.eventMouseDown);
-    });
-    
-    this.track.observe("mousedown", this.eventMouseDown);
-    document.observe("mouseup", this.eventMouseUp);
-    document.observe("mousemove", this.eventMouseMove);
-    
-    this.initialized = true;
-  },
-  dispose: function() {
-    var slider = this;    
-    Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
-    Event.stopObserving(document, "mouseup", this.eventMouseUp);
-    Event.stopObserving(document, "mousemove", this.eventMouseMove);
-    this.handles.each( function(h) {
-      Event.stopObserving(h, "mousedown", slider.eventMouseDown);
-    });
-  },
-  setDisabled: function(){
-    this.disabled = true;
-  },
-  setEnabled: function(){
-    this.disabled = false;
-  },  
-  getNearestValue: function(value){
-    if (this.allowedValues){
-      if (value >= this.allowedValues.max()) return(this.allowedValues.max());
-      if (value <= this.allowedValues.min()) return(this.allowedValues.min());
-      
-      var offset = Math.abs(this.allowedValues[0] - value);
-      var newValue = this.allowedValues[0];
-      this.allowedValues.each( function(v) {
-        var currentOffset = Math.abs(v - value);
-        if (currentOffset <= offset){
-          newValue = v;
-          offset = currentOffset;
-        } 
-      });
-      return newValue;
-    }
-    if (value > this.range.end) return this.range.end;
-    if (value < this.range.start) return this.range.start;
-    return value;
-  },
-  setValue: function(sliderValue, handleIdx){
-    if (!this.active) {
-      this.activeHandleIdx = handleIdx || 0;
-      this.activeHandle    = this.handles[this.activeHandleIdx];
-      this.updateStyles();
-    }
-    handleIdx = handleIdx || this.activeHandleIdx || 0;
-    if (this.initialized && this.restricted) {
-      if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
-        sliderValue = this.values[handleIdx-1];
-      if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
-        sliderValue = this.values[handleIdx+1];
-    }
-    sliderValue = this.getNearestValue(sliderValue);
-    this.values[handleIdx] = sliderValue;
-    this.value = this.values[0]; // assure backwards compat
-    
-    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = 
-      this.translateToPx(sliderValue);
-    
-    this.drawSpans();
-    if (!this.dragging || !this.event) this.updateFinished();
-  },
-  setValueBy: function(delta, handleIdx) {
-    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, 
-      handleIdx || this.activeHandleIdx || 0);
-  },
-  translateToPx: function(value) {
-    return Math.round(
-      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * 
-      (value - this.range.start)) + "px";
-  },
-  translateToValue: function(offset) {
-    return ((offset/(this.trackLength-this.handleLength) * 
-      (this.range.end-this.range.start)) + this.range.start);
-  },
-  getRange: function(range) {
-    var v = this.values.sortBy(Prototype.K); 
-    range = range || 0;
-    return $R(v[range],v[range+1]);
-  },
-  minimumOffset: function(){
-    return(this.isVertical() ? this.alignY : this.alignX);
-  },
-  maximumOffset: function(){
-    return(this.isVertical() ? 
-      (this.track.offsetHeight != 0 ? this.track.offsetHeight :
-        this.track.style.height.replace(/px$/,"")) - this.alignY : 
-      (this.track.offsetWidth != 0 ? this.track.offsetWidth : 
-        this.track.style.width.replace(/px$/,"")) - this.alignX);
-  },  
-  isVertical:  function(){
-    return (this.axis == 'vertical');
-  },
-  drawSpans: function() {
-    var slider = this;
-    if (this.spans)
-      $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
-    if (this.options.startSpan)
-      this.setSpan(this.options.startSpan,
-        $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
-    if (this.options.endSpan)
-      this.setSpan(this.options.endSpan, 
-        $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
-  },
-  setSpan: function(span, range) {
-    if (this.isVertical()) {
-      span.style.top = this.translateToPx(range.start);
-      span.style.height = this.translateToPx(range.end - range.start + this.range.start);
-    } else {
-      span.style.left = this.translateToPx(range.start);
-      span.style.width = this.translateToPx(range.end - range.start + this.range.start);
-    }
-  },
-  updateStyles: function() {
-    this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
-    Element.addClassName(this.activeHandle, 'selected');
-  },
-  startDrag: function(event) {
-    if (Event.isLeftClick(event)) {
-      if (!this.disabled){
-        this.active = true;
-        
-        var handle = Event.element(event);
-        var pointer  = [Event.pointerX(event), Event.pointerY(event)];
-        var track = handle;
-        if (track==this.track) {
-          var offsets  = Position.cumulativeOffset(this.track); 
-          this.event = event;
-          this.setValue(this.translateToValue( 
-           (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
-          ));
-          var offsets  = Position.cumulativeOffset(this.activeHandle);
-          this.offsetX = (pointer[0] - offsets[0]);
-          this.offsetY = (pointer[1] - offsets[1]);
-        } else {
-          // find the handle (prevents issues with Safari)
-          while((this.handles.indexOf(handle) == -1) && handle.parentNode) 
-            handle = handle.parentNode;
-            
-          if (this.handles.indexOf(handle)!=-1) {
-            this.activeHandle    = handle;
-            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
-            this.updateStyles();
-            
-            var offsets  = Position.cumulativeOffset(this.activeHandle);
-            this.offsetX = (pointer[0] - offsets[0]);
-            this.offsetY = (pointer[1] - offsets[1]);
-          }
-        }
-      }
-      Event.stop(event);
-    }
-  },
-  update: function(event) {
-   if (this.active) {
-      if (!this.dragging) this.dragging = true;
-      this.draw(event);
-      if (Prototype.Browser.WebKit) window.scrollBy(0,0);
-      Event.stop(event);
-   }
-  },
-  draw: function(event) {
-    var pointer = [Event.pointerX(event), Event.pointerY(event)];
-    var offsets = Position.cumulativeOffset(this.track);
-    pointer[0] -= this.offsetX + offsets[0];
-    pointer[1] -= this.offsetY + offsets[1];
-    this.event = event;
-    this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
-    if (this.initialized && this.options.onSlide)
-      this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
-  },
-  endDrag: function(event) {
-    if (this.active && this.dragging) {
-      this.finishDrag(event, true);
-      Event.stop(event);
-    }
-    this.active = false;
-    this.dragging = false;
-  },  
-  finishDrag: function(event, success) {
-    this.active = false;
-    this.dragging = false;
-    this.updateFinished();
-  },
-  updateFinished: function() {
-    if (this.initialized && this.options.onChange) 
-      this.options.onChange(this.values.length>1 ? this.values : this.value, this);
-    this.event = null;
-  }
-});
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/sound.js b/mp-wp/wp-includes/js/scriptaculous/sound.js
--- a/mp-wp/wp-includes/js/scriptaculous/sound.js 9f9bd93aee457040a2d8e1fa6b47c0fe0b2c67e8173f1f0f02bc65de25f923e4add7e147ee1137405ab007a4db3b47860dfc07bb6594dbe9e71061c081b752c1
+++ b/mp-wp/wp-includes/js/scriptaculous/sound.js false
@@ -1,55 +0,0 @@
-// script.aculo.us sound.js v1.8.0, Tue Nov 06 15:01:40 +0300 2007
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//
-// Based on code created by Jules Gravinese (http://www.webveteran.com/)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-Sound = {
-  tracks: {},
-  _enabled: true,
-  template:
-    new Template('<embed style="height:0" id="sound_#{track}_#{id}" src="#{url}" loop="false" autostart="true" hidden="true"/>'),
-  enable: function(){
-    Sound._enabled = true;
-  },
-  disable: function(){
-    Sound._enabled = false;
-  },
-  play: function(url){
-    if(!Sound._enabled) return;
-    var options = Object.extend({
-      track: 'global', url: url, replace: false
-    }, arguments[1] || {});
-    
-    if(options.replace && this.tracks[options.track]) {
-      $R(0, this.tracks[options.track].id).each(function(id){
-        var sound = $('sound_'+options.track+'_'+id);
-        sound.Stop && sound.Stop();
-        sound.remove();
-      })
-      this.tracks[options.track] = null;
-    }
-      
-    if(!this.tracks[options.track])
-      this.tracks[options.track] = { id: 0 }
-    else
-      this.tracks[options.track].id++;
-      
-    options.id = this.tracks[options.track].id;
-    $$('body')[0].insert( 
-      Prototype.Browser.IE ? new Element('bgsound',{
-        id: 'sound_'+options.track+'_'+options.id,
-        src: options.url, loop: 1, autostart: true
-      }) : Sound.template.evaluate(options));
-  }
-};
-
-if(Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0){
-  if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('QuickTime') != -1 }))
-    Sound.template = new Template('<object id="sound_#{track}_#{id}" width="0" height="0" type="audio/mpeg" data="#{url}"/>')
-  else
-    Sound.play = function(){}
-}
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/unittest.js b/mp-wp/wp-includes/js/scriptaculous/unittest.js
--- a/mp-wp/wp-includes/js/scriptaculous/unittest.js d95dcaa12b429103ef454c613b5fda763667b8b98e141f08b8a312469e01b9cb313216067bfe21b73425e3610b39efbc1b28c65218888bcb2c0f4fe023d1ed14
+++ b/mp-wp/wp-includes/js/scriptaculous/unittest.js false
@@ -1,568 +0,0 @@
-// script.aculo.us unittest.js v1.8.0, Tue Nov 06 15:01:40 +0300 2007
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
-//           (c) 2005-2007 Michael Schuerig (http://www.schuerig.de/michael/)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-// experimental, Firefox-only
-Event.simulateMouse = function(element, eventName) {
-  var options = Object.extend({
-    pointerX: 0,
-    pointerY: 0,
-    buttons:  0,
-    ctrlKey:  false,
-    altKey:   false,
-    shiftKey: false,
-    metaKey:  false
-  }, arguments[2] || {});
-  var oEvent = document.createEvent("MouseEvents");
-  oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
-    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
-    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
-  
-  if(this.mark) Element.remove(this.mark);
-  this.mark = document.createElement('div');
-  this.mark.appendChild(document.createTextNode(" "));
-  document.body.appendChild(this.mark);
-  this.mark.style.position = 'absolute';
-  this.mark.style.top = options.pointerY + "px";
-  this.mark.style.left = options.pointerX + "px";
-  this.mark.style.width = "5px";
-  this.mark.style.height = "5px;";
-  this.mark.style.borderTop = "1px solid red;"
-  this.mark.style.borderLeft = "1px solid red;"
-  
-  if(this.step)
-    alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
-  
-  $(element).dispatchEvent(oEvent);
-};
-
-// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2.
-// You need to downgrade to 1.0.4 for now to get this working
-// See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much
-Event.simulateKey = function(element, eventName) {
-  var options = Object.extend({
-    ctrlKey: false,
-    altKey: false,
-    shiftKey: false,
-    metaKey: false,
-    keyCode: 0,
-    charCode: 0
-  }, arguments[2] || {});
-
-  var oEvent = document.createEvent("KeyEvents");
-  oEvent.initKeyEvent(eventName, true, true, window, 
-    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
-    options.keyCode, options.charCode );
-  $(element).dispatchEvent(oEvent);
-};
-
-Event.simulateKeys = function(element, command) {
-  for(var i=0; i<command.length; i++) {
-    Event.simulateKey(element,'keypress',{charCode:command.charCodeAt(i)});
-  }
-};
-
-var Test = {}
-Test.Unit = {};
-
-// security exception workaround
-Test.Unit.inspect = Object.inspect;
-
-Test.Unit.Logger = Class.create();
-Test.Unit.Logger.prototype = {
-  initialize: function(log) {
-    this.log = $(log);
-    if (this.log) {
-      this._createLogTable();
-    }
-  },
-  start: function(testName) {
-    if (!this.log) return;
-    this.testName = testName;
-    this.lastLogLine = document.createElement('tr');
-    this.statusCell = document.createElement('td');
-    this.nameCell = document.createElement('td');
-    this.nameCell.className = "nameCell";
-    this.nameCell.appendChild(document.createTextNode(testName));
-    this.messageCell = document.createElement('td');
-    this.lastLogLine.appendChild(this.statusCell);
-    this.lastLogLine.appendChild(this.nameCell);
-    this.lastLogLine.appendChild(this.messageCell);
-    this.loglines.appendChild(this.lastLogLine);
-  },
-  finish: function(status, summary) {
-    if (!this.log) return;
-    this.lastLogLine.className = status;
-    this.statusCell.innerHTML = status;
-    this.messageCell.innerHTML = this._toHTML(summary);
-    this.addLinksToResults();
-  },
-  message: function(message) {
-    if (!this.log) return;
-    this.messageCell.innerHTML = this._toHTML(message);
-  },
-  summary: function(summary) {
-    if (!this.log) return;
-    this.logsummary.innerHTML = this._toHTML(summary);
-  },
-  _createLogTable: function() {
-    this.log.innerHTML =
-    '<div id="logsummary"></div>' +
-    '<table id="logtable">' +
-    '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
-    '<tbody id="loglines"></tbody>' +
-    '</table>';
-    this.logsummary = $('logsummary')
-    this.loglines = $('loglines');
-  },
-  _toHTML: function(txt) {
-    return txt.escapeHTML().replace(/\n/g,"<br/>");
-  },
-  addLinksToResults: function(){ 
-    $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
-      td.title = "Run only this test"
-      Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;});
-    });
-    $$("tr.passed .nameCell").each( function(td){ // todo: limit to children of this.log
-      td.title = "Run all tests"
-      Event.observe(td, 'click', function(){ window.location.search = "";});
-    });
-  }
-}
-
-Test.Unit.Runner = Class.create();
-Test.Unit.Runner.prototype = {
-  initialize: function(testcases) {
-    this.options = Object.extend({
-      testLog: 'testlog'
-    }, arguments[1] || {});
-    this.options.resultsURL = this.parseResultsURLQueryParameter();
-    this.options.tests      = this.parseTestsQueryParameter();
-    if (this.options.testLog) {
-      this.options.testLog = $(this.options.testLog) || null;
-    }
-    if(this.options.tests) {
-      this.tests = [];
-      for(var i = 0; i < this.options.tests.length; i++) {
-        if(/^test/.test(this.options.tests[i])) {
-          this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"]));
-        }
-      }
-    } else {
-      if (this.options.test) {
-        this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])];
-      } else {
-        this.tests = [];
-        for(var testcase in testcases) {
-          if(/^test/.test(testcase)) {
-            this.tests.push(
-               new Test.Unit.Testcase(
-                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, 
-                 testcases[testcase], testcases["setup"], testcases["teardown"]
-               ));
-          }
-        }
-      }
-    }
-    this.currentTest = 0;
-    this.logger = new Test.Unit.Logger(this.options.testLog);
-    setTimeout(this.runTests.bind(this), 1000);
-  },
-  parseResultsURLQueryParameter: function() {
-    return window.location.search.parseQuery()["resultsURL"];
-  },
-  parseTestsQueryParameter: function(){
-    if (window.location.search.parseQuery()["tests"]){
-        return window.location.search.parseQuery()["tests"].split(',');
-    };
-  },
-  // Returns:
-  //  "ERROR" if there was an error,
-  //  "FAILURE" if there was a failure, or
-  //  "SUCCESS" if there was neither
-  getResult: function() {
-    var hasFailure = false;
-    for(var i=0;i<this.tests.length;i++) {
-      if (this.tests[i].errors > 0) {
-        return "ERROR";
-      }
-      if (this.tests[i].failures > 0) {
-        hasFailure = true;
-      }
-    }
-    if (hasFailure) {
-      return "FAILURE";
-    } else {
-      return "SUCCESS";
-    }
-  },
-  postResults: function() {
-    if (this.options.resultsURL) {
-      new Ajax.Request(this.options.resultsURL, 
-        { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
-    }
-  },
-  runTests: function() {
-    var test = this.tests[this.currentTest];
-    if (!test) {
-      // finished!
-      this.postResults();
-      this.logger.summary(this.summary());
-      return;
-    }
-    if(!test.isWaiting) {
-      this.logger.start(test.name);
-    }
-    test.run();
-    if(test.isWaiting) {
-      this.logger.message("Waiting for " + test.timeToWait + "ms");
-      setTimeout(this.runTests.bind(this), test.timeToWait || 1000);
-    } else {
-      this.logger.finish(test.status(), test.summary());
-      this.currentTest++;
-      // tail recursive, hopefully the browser will skip the stackframe
-      this.runTests();
-    }
-  },
-  summary: function() {
-    var assertions = 0;
-    var failures = 0;
-    var errors = 0;
-    var messages = [];
-    for(var i=0;i<this.tests.length;i++) {
-      assertions +=   this.tests[i].assertions;
-      failures   +=   this.tests[i].failures;
-      errors     +=   this.tests[i].errors;
-    }
-    return (
-      (this.options.context ? this.options.context + ': ': '') + 
-      this.tests.length + " tests, " + 
-      assertions + " assertions, " + 
-      failures   + " failures, " +
-      errors     + " errors");
-  }
-}
-
-Test.Unit.Assertions = Class.create();
-Test.Unit.Assertions.prototype = {
-  initialize: function() {
-    this.assertions = 0;
-    this.failures   = 0;
-    this.errors     = 0;
-    this.messages   = [];
-  },
-  summary: function() {
-    return (
-      this.assertions + " assertions, " + 
-      this.failures   + " failures, " +
-      this.errors     + " errors" + "\n" +
-      this.messages.join("\n"));
-  },
-  pass: function() {
-    this.assertions++;
-  },
-  fail: function(message) {
-    this.failures++;
-    this.messages.push("Failure: " + message);
-  },
-  info: function(message) {
-    this.messages.push("Info: " + message);
-  },
-  error: function(error) {
-    this.errors++;
-    this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")");
-  },
-  status: function() {
-    if (this.failures > 0) return 'failed';
-    if (this.errors > 0) return 'error';
-    return 'passed';
-  },
-  assert: function(expression) {
-    var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
-    try { expression ? this.pass() : 
-      this.fail(message); }
-    catch(e) { this.error(e); }
-  },
-  assertEqual: function(expected, actual) {
-    var message = arguments[2] || "assertEqual";
-    try { (expected == actual) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
-        '", actual "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertInspect: function(expected, actual) {
-    var message = arguments[2] || "assertInspect";
-    try { (expected == actual.inspect()) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
-        '", actual "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertEnumEqual: function(expected, actual) {
-    var message = arguments[2] || "assertEnumEqual";
-    try { $A(expected).length == $A(actual).length && 
-      expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
-        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
-          ', actual ' + Test.Unit.inspect(actual)); }
-    catch(e) { this.error(e); }
-  },
-  assertNotEqual: function(expected, actual) {
-    var message = arguments[2] || "assertNotEqual";
-    try { (expected != actual) ? this.pass() : 
-      this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertIdentical"; 
-    try { (expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
-  },
-  assertNotIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertNotIdentical"; 
-    try { !(expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
-  },
-  assertNull: function(obj) {
-    var message = arguments[1] || 'assertNull'
-    try { (obj==null) ? this.pass() : 
-      this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertMatch: function(expected, actual) {
-    var message = arguments[2] || 'assertMatch';
-    var regex = new RegExp(expected);
-    try { (regex.exec(actual)) ? this.pass() :
-      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertHidden: function(element) {
-    var message = arguments[1] || 'assertHidden';
-    this.assertEqual("none", element.style.display, message);
-  },
-  assertNotNull: function(object) {
-    var message = arguments[1] || 'assertNotNull';
-    this.assert(object != null, message);
-  },
-  assertType: function(expected, actual) {
-    var message = arguments[2] || 'assertType';
-    try { 
-      (actual.constructor == expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + (actual.constructor) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertNotOfType: function(expected, actual) {
-    var message = arguments[2] || 'assertNotOfType';
-    try { 
-      (actual.constructor != expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + (actual.constructor) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertInstanceOf: function(expected, actual) {
-    var message = arguments[2] || 'assertInstanceOf';
-    try { 
-      (actual instanceof expected) ? this.pass() : 
-      this.fail(message + ": object was not an instance of the expected type"); }
-    catch(e) { this.error(e); } 
-  },
-  assertNotInstanceOf: function(expected, actual) {
-    var message = arguments[2] || 'assertNotInstanceOf';
-    try { 
-      !(actual instanceof expected) ? this.pass() : 
-      this.fail(message + ": object was an instance of the not expected type"); }
-    catch(e) { this.error(e); } 
-  },
-  assertRespondsTo: function(method, obj) {
-    var message = arguments[2] || 'assertRespondsTo';
-    try {
-      (obj[method] && typeof obj[method] == 'function') ? this.pass() : 
-      this.fail(message + ": object doesn't respond to [" + method + "]"); }
-    catch(e) { this.error(e); }
-  },
-  assertReturnsTrue: function(method, obj) {
-    var message = arguments[2] || 'assertReturnsTrue';
-    try {
-      var m = obj[method];
-      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      m() ? this.pass() : 
-      this.fail(message + ": method returned false"); }
-    catch(e) { this.error(e); }
-  },
-  assertReturnsFalse: function(method, obj) {
-    var message = arguments[2] || 'assertReturnsFalse';
-    try {
-      var m = obj[method];
-      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      !m() ? this.pass() : 
-      this.fail(message + ": method returned true"); }
-    catch(e) { this.error(e); }
-  },
-  assertRaise: function(exceptionName, method) {
-    var message = arguments[2] || 'assertRaise';
-    try { 
-      method();
-      this.fail(message + ": exception expected but none was raised"); }
-    catch(e) {
-      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); 
-    }
-  },
-  assertElementsMatch: function() {
-    var expressions = $A(arguments), elements = $A(expressions.shift());
-    if (elements.length != expressions.length) {
-      this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions');
-      return false;
-    }
-    elements.zip(expressions).all(function(pair, index) {
-      var element = $(pair.first()), expression = pair.last();
-      if (element.match(expression)) return true;
-      this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect());
-    }.bind(this)) && this.pass();
-  },
-  assertElementMatches: function(element, expression) {
-    this.assertElementsMatch([element], expression);
-  },
-  benchmark: function(operation, iterations) {
-    var startAt = new Date();
-    (iterations || 1).times(operation);
-    var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
-       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
-    return timeTaken;
-  },
-  _isVisible: function(element) {
-    element = $(element);
-    if(!element.parentNode) return true;
-    this.assertNotNull(element);
-    if(element.style && Element.getStyle(element, 'display') == 'none')
-      return false;
-    
-    return this._isVisible(element.parentNode);
-  },
-  assertNotVisible: function(element) {
-    this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1]));
-  },
-  assertVisible: function(element) {
-    this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1]));
-  },
-  benchmark: function(operation, iterations) {
-    var startAt = new Date();
-    (iterations || 1).times(operation);
-    var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
-       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
-    return timeTaken;
-  }
-}
-
-Test.Unit.Testcase = Class.create();
-Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), {
-  initialize: function(name, test, setup, teardown) {
-    Test.Unit.Assertions.prototype.initialize.bind(this)();
-    this.name           = name;
-    
-    if(typeof test == 'string') {
-      test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
-      test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
-      this.test = function() {
-        eval('with(this){'+test+'}');
-      }
-    } else {
-      this.test = test || function() {};
-    }
-    
-    this.setup          = setup || function() {};
-    this.teardown       = teardown || function() {};
-    this.isWaiting      = false;
-    this.timeToWait     = 1000;
-  },
-  wait: function(time, nextPart) {
-    this.isWaiting = true;
-    this.test = nextPart;
-    this.timeToWait = time;
-  },
-  run: function() {
-    try {
-      try {
-        if (!this.isWaiting) this.setup.bind(this)();
-        this.isWaiting = false;
-        this.test.bind(this)();
-      } finally {
-        if(!this.isWaiting) {
-          this.teardown.bind(this)();
-        }
-      }
-    }
-    catch(e) { this.error(e); }
-  }
-});
-
-// *EXPERIMENTAL* BDD-style testing to please non-technical folk
-// This draws many ideas from RSpec http://rspec.rubyforge.org/
-
-Test.setupBDDExtensionMethods = function(){
-  var METHODMAP = {
-    shouldEqual:     'assertEqual',
-    shouldNotEqual:  'assertNotEqual',
-    shouldEqualEnum: 'assertEnumEqual',
-    shouldBeA:       'assertType',
-    shouldNotBeA:    'assertNotOfType',
-    shouldBeAn:      'assertType',
-    shouldNotBeAn:   'assertNotOfType',
-    shouldBeNull:    'assertNull',
-    shouldNotBeNull: 'assertNotNull',
-    
-    shouldBe:        'assertReturnsTrue',
-    shouldNotBe:     'assertReturnsFalse',
-    shouldRespondTo: 'assertRespondsTo'
-  };
-  var makeAssertion = function(assertion, args, object) { 
-   	this[assertion].apply(this,(args || []).concat([object]));
-  }
-  
-  Test.BDDMethods = {};   
-  $H(METHODMAP).each(function(pair) { 
-    Test.BDDMethods[pair.key] = function() { 
-       var args = $A(arguments); 
-       var scope = args.shift(); 
-       makeAssertion.apply(scope, [pair.value, args, this]); }; 
-  });
-  
-  [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each(
-    function(p){ Object.extend(p, Test.BDDMethods) }
-  );
-}
-
-Test.context = function(name, spec, log){
-  Test.setupBDDExtensionMethods();
-  
-  var compiledSpec = {};
-  var titles = {};
-  for(specName in spec) {
-    switch(specName){
-      case "setup":
-      case "teardown":
-        compiledSpec[specName] = spec[specName];
-        break;
-      default:
-        var testName = 'test'+specName.gsub(/\s+/,'-').camelize();
-        var body = spec[specName].toString().split('\n').slice(1);
-        if(/^\{/.test(body[0])) body = body.slice(1);
-        body.pop();
-        body = body.map(function(statement){ 
-          return statement.strip()
-        });
-        compiledSpec[testName] = body.join('\n');
-        titles[testName] = specName;
-    }
-  }
-  new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
-};
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/scriptaculous/wp-scriptaculous.js b/mp-wp/wp-includes/js/scriptaculous/wp-scriptaculous.js
--- a/mp-wp/wp-includes/js/scriptaculous/wp-scriptaculous.js 2ed0c1640c8e9c909b1f23e60cc43c506107061838d2cae362b7eb4ffc4a55320bb74c1d55881ae42863d91a3dd2225fa9709f63a20d06f0551c70579bbb11ae
+++ b/mp-wp/wp-includes/js/scriptaculous/wp-scriptaculous.js false
@@ -1,59 +0,0 @@
-// script.aculo.us scriptaculous.js v1.7.1_beta3, Fri May 25 17:19:41 +0200 2007
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Scriptaculous = {
-  Version: '1.8.0',
-  require: function(libraryName) {
-    // inserting via DOM fails in Safari 2.0, so brute force approach
-    document.write('<script type="text/javascript" src="'+libraryName+'"></script>');
-  },
-  REQUIRED_PROTOTYPE: '1.6',
-  load: function() {
-    function convertVersionString(versionString){
-      var r = versionString.split('.');
-      return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]);
-    }
- 
-    if((typeof Prototype=='undefined') || 
-       (typeof Element == 'undefined') || 
-       (typeof Element.Methods=='undefined') ||
-       (convertVersionString(Prototype.Version) < 
-        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
-       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
-        Scriptaculous.REQUIRED_PROTOTYPE);
-    
-    $A(document.getElementsByTagName("script")).findAll( function(s) {
-      return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
-    }).each( function(s) {
-      var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
-      var includes = s.src.match(/\?.*load=([a-z,]*)/);
-      if ( includes )
-       includes[1].split(',').each(
-       function(include) { Scriptaculous.require(path+include+'.js') });
-    });
-  }
-}
-
-Scriptaculous.load();
diff -uNr a/mp-wp/wp-includes/js/swfupload/handlers.js b/mp-wp/wp-includes/js/swfupload/handlers.js
--- a/mp-wp/wp-includes/js/swfupload/handlers.js fc72ca2e9f5c2e47c6633759bd86ecc5bf71a9dd8b3fde34e54eb0d5075f36294b929f1b9749c0e32aaada6aa78e57ff19b85a87604c49e46874bc04f50b007c
+++ b/mp-wp/wp-includes/js/swfupload/handlers.js false
@@ -1,287 +0,0 @@
-function fileDialogStart() {
-	jQuery("#media-upload-error").empty();
-}
-
-// progress and success handlers for media multi uploads
-function fileQueued(fileObj) {
-	// Get rid of unused form
-	jQuery('.media-blank').remove();
-	// Collapse a single item
-	if ( jQuery('.type-form #media-items>*').length == 1 && jQuery('#media-items .hidden').length > 0 ) {
-		jQuery('.toggle').toggle();
-		jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');
-	}
-	// Create a progress bar containing the filename
-	jQuery('#media-items').append('<div id="media-item-' + fileObj.id + '" class="media-item child-of-' + post_id + '"><div class="progress"><div class="bar"></div></div><div class="filename original">' + fileObj.name + '</div></div>');
-	// Display the progress div
-	jQuery('#media-item-' + fileObj.id + ' .progress').show();
-
-	// Disable the submit button
-	jQuery('#insert-gallery').attr('disabled', 'disabled');
-}
-
-function uploadStart(fileObj) { return true; }
-
-function uploadProgress(fileObj, bytesDone, bytesTotal) {
-	// Lengthen the progress bar
-	jQuery('#media-item-' + fileObj.id + ' .bar').width(620*bytesDone/bytesTotal);
-
-	if ( bytesDone == bytesTotal )
-		jQuery('#media-item-' + fileObj.id + ' .bar').html('<strong class="crunching">' + swfuploadL10n.crunching + '</strong>');
-}
-
-function prepareMediaItem(fileObj, serverData) {
-	// Move the progress bar to 100%
-	jQuery('#media-item-' + fileObj.id + ' .bar').remove();
-	jQuery('#media-item-' + fileObj.id + ' .progress').hide();
-
-	var f = ( typeof shortform == 'undefined' ) ? 1 : 2;
-	// Old style: Append the HTML returned by the server -- thumbnail and form inputs
-	if ( isNaN(serverData) || !serverData ) {
-		jQuery('#media-item-' + fileObj.id).append(serverData);
-		prepareMediaItemInit(fileObj);
-	}
-	// New style: server data is just the attachment ID, fetch the thumbnail and form html from the server
-	else {
-		jQuery('#media-item-' + fileObj.id).load('async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit(fileObj);updateMediaForm()});
-	}
-}
-		
-function prepareMediaItemInit(fileObj) {
-
-	// Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename
-	jQuery('#media-item-' + fileObj.id + ' .thumbnail').clone().attr('className', 'pinkynail toggle').prependTo('#media-item-' + fileObj.id);
-
-	// Replace the original filename with the new (unique) one assigned during upload
-	jQuery('#media-item-' + fileObj.id + ' .filename.original').replaceWith(jQuery('#media-item-' + fileObj.id + ' .filename.new'));
-
-	// Also bind toggle to the links
-	jQuery('#media-item-' + fileObj.id + ' a.toggle').bind('click', function(){jQuery(this).siblings('.slidetoggle').slideToggle(150, function(){var o=jQuery(this).offset();window.scrollTo(0,o.top-36);});jQuery(this).parent().eq(0).children('.toggle').toggle();jQuery(this).siblings('a.toggle').focus();return false;});
-
-	// Bind AJAX to the new Delete button
-	jQuery('#media-item-' + fileObj.id + ' a.delete').bind('click',function(){
-		// Tell the server to delete it. TODO: handle exceptions
-		jQuery.ajax({url:'admin-ajax.php',type:'post',success:deleteSuccess,error:deleteError,id:fileObj.id,data:{
-			id : this.id.replace(/[^0-9]/g,''),
-			action : 'delete-post',
-			_ajax_nonce : this.href.replace(/^.*wpnonce=/,'')}
-			});
-		return false;
-	});
-
-	// Open this item if it says to start open (e.g. to display an error)
-	jQuery('#media-item-' + fileObj.id + '.startopen')
-		.removeClass('startopen')
-		.slideToggle(500)
-		.parent().eq(0).children('.toggle').toggle();
-}
-
-function itemAjaxError(id, html) {
-	var error = jQuery('#media-item-error' + id);
-
-	error.html('<div class="file-error"><button type="button" id="dismiss-'+id+'" class="button dismiss">'+swfuploadL10n.dismiss+'</button>'+html+'</div>');
-	jQuery('#dismiss-'+id).click(function(){jQuery(this).parents('.file-error').slideUp(200, function(){jQuery(this).empty();})});
-}
-
-function deleteSuccess(data, textStatus) {
-	if ( data == '-1' )
-		return itemAjaxError(this.id, 'You do not have permission. Has your session expired?');
-	if ( data == '0' )
-		return itemAjaxError(this.id, 'Could not be deleted. Has it been deleted already?');
-
-	var item = jQuery('#media-item-' + this.id);
-
-	// Decrement the counters.
-	if ( type = jQuery('#type-of-' + this.id).val() )
-		jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-1);
-	if ( item.hasClass('child-of-'+post_id) )
-		jQuery('#attachments-count').text(jQuery('#attachments-count').text()-1);
-
-	if ( jQuery('.type-form #media-items>*').length == 1 && jQuery('#media-items .hidden').length > 0 ) {
-		jQuery('.toggle').toggle();
-		jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');
-	}
-
-	// Vanish it.
-	jQuery('#media-item-' + this.id + ' .filename:empty').remove();
-	jQuery('#media-item-' + this.id + ' .filename').append(' <span class="file-error">'+swfuploadL10n.deleted+'</span>').siblings('a.toggle').remove();
-	jQuery('#media-item-' + this.id).children('.describe').css({backgroundColor:'#fff'}).end()
-			.animate({backgroundColor:'#ffc0c0'}, {queue:false,duration:50})
-			.animate({minHeight:0,height:36}, 400, null, function(){jQuery(this).children('.describe').remove()})
-			.animate({backgroundColor:'#fff'}, 400)
-			.animate({height:0}, 800, null, function(){jQuery(this).remove();updateMediaForm();});
-
-	return;
-}
-
-function deleteError(X, textStatus, errorThrown) {
-	// TODO
-}
-
-function updateMediaForm() {
-	storeState();
-	// Just one file, no need for collapsible part
-	if ( jQuery('.type-form #media-items>*').length == 1 ) {
-		jQuery('#media-items .slidetoggle').slideDown(500).parent().eq(0).children('.toggle').toggle();
-		jQuery('.type-form .slidetoggle').siblings().addClass('hidden');
-	}
-
-	// Only show Save buttons when there is at least one file.
-	if ( jQuery('#media-items>*').not('.media-blank').length > 0 )
-		jQuery('.savebutton').show();
-	else
-		jQuery('.savebutton').hide();
-
-	// Only show Gallery button when there are at least two files.
-	if ( jQuery('#media-items>*').length > 1 )
-		jQuery('.insert-gallery').show();
-	else
-		jQuery('.insert-gallery').hide();
-}
-
-function uploadSuccess(fileObj, serverData) {
-	// if async-upload returned an error message, place it in the media item div and return
-	if ( serverData.match('media-upload-error') ) {
-		jQuery('#media-item-' + fileObj.id).html(serverData);
-		return;
-	}
-
-	prepareMediaItem(fileObj, serverData);
-	updateMediaForm();
-
-	// Increment the counter.
-	if ( jQuery('#media-item-' + fileObj.id).hasClass('child-of-' + post_id) )
-		jQuery('#attachments-count').text(1 * jQuery('#attachments-count').text() + 1);
-}
-
-function uploadComplete(fileObj) {
-	// If no more uploads queued, enable the submit button
-	if ( swfu.getStats().files_queued == 0 )
-		jQuery('#insert-gallery').attr('disabled', '');
-}
-
-
-// wp-specific error handlers
-
-// generic message
-function wpQueueError(message) {
-	jQuery('#media-upload-error').show().text(message);
-}
-
-// file-specific message
-function wpFileError(fileObj, message) {
-	jQuery('#media-item-' + fileObj.id + ' .filename').after('<div class="file-error"><button type="button" id="dismiss-' + fileObj.id + '" class="button dismiss">'+swfuploadL10n.dismiss+'</button>'+message+'</div>').siblings('.toggle').remove();
-	jQuery('#dismiss-' + fileObj.id).click(function(){jQuery(this).parents('.media-item').slideUp(200, function(){jQuery(this).remove();})});
-}
-
-function fileQueueError(fileObj, error_code, message)  {
-	// Handle this error separately because we don't want to create a FileProgress element for it.
-	if ( error_code == SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED ) {
-		wpQueueError(swfuploadL10n.queue_limit_exceeded);
-	}
-	else if ( error_code == SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT ) {
-		fileQueued(fileObj);
-		wpFileError(fileObj, swfuploadL10n.file_exceeds_size_limit);
-	}
-	else if ( error_code == SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE ) {
-		fileQueued(fileObj);
-		wpFileError(fileObj, swfuploadL10n.zero_byte_file);
-	}
-	else if ( error_code == SWFUpload.QUEUE_ERROR.INVALID_FILETYPE ) {
-		fileQueued(fileObj);
-		wpFileError(fileObj, swfuploadL10n.invalid_filetype);
-	}
-	else {
-		wpQueueError(swfuploadL10n.default_error);
-	}
-}
-
-function fileDialogComplete(num_files_queued) {
-	try {
-		if (num_files_queued > 0) {
-			this.startUpload();
-		}
-	} catch (ex) {
-		this.debug(ex);
-	}
-}
-
-function swfuploadPreLoad() {
-	var swfupload_element = jQuery('#'+swfu.customSettings.swfupload_element_id).get(0);
-	jQuery('#' + swfu.customSettings.degraded_element_id).hide();
-	// Doing this directly because jQuery().show() seems to have timing problems
-	if ( swfupload_element && ! swfupload_element.style.display )
-			swfupload_element.style.display = 'block';
-}
-
-function swfuploadLoadFailed() {
-	jQuery('#' + swfu.customSettings.swfupload_element_id).hide();
-	jQuery('#' + swfu.customSettings.degraded_element_id).show();
-}
-
-function uploadError(fileObj, error_code, message) {
-	// first the file specific error
-	if ( error_code == SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL ) {
-		wpFileError(fileObj, swfuploadL10n.missing_upload_url);
-	}
-	else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED ) {
-		wpFileError(fileObj, swfuploadL10n.upload_limit_exceeded);
-	}
-	else {
-		wpFileError(fileObj, swfuploadL10n.default_error);
-	}
-
-	// now the general upload status
-	if ( error_code == SWFUpload.UPLOAD_ERROR.HTTP_ERROR ) {
-		wpQueueError(swfuploadL10n.http_error);
-	}
-	else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED ) {
-		wpQueueError(swfuploadL10n.upload_failed);
-	}
-	else if ( error_code == SWFUpload.UPLOAD_ERROR.IO_ERROR ) {
-		wpQueueError(swfuploadL10n.io_error);
-	}
-	else if ( error_code == SWFUpload.UPLOAD_ERROR.SECURITY_ERROR ) {
-		wpQueueError(swfuploadL10n.security_error);
-	}
-	else if ( error_code == SWFUpload.UPLOAD_ERROR.FILE_CANCELLED ) {
-		wpQueueError(swfuploadL10n.security_error);
-	}
-}
-
-// remember the last used image size, alignment and url
-var storeState;
-(function($){
-
-storeState = function(){
-	var align = getUserSetting('align') || '', imgsize = getUserSetting('imgsize') || '';
-
-	$('tr.align input[type="radio"]').click(function(){
-		setUserSetting('align', $(this).val());
-	}).filter(function(){
-		if ( $(this).val() == align )
-			return true;
-		return false;
-	}).attr('checked','checked');
-
-	$('tr.image-size input[type="radio"]').click(function(){
-		setUserSetting('imgsize', $(this).val());
-	}).filter(function(){
-		if ( $(this).attr('disabled') || $(this).val() != imgsize )
-			return false;
-		return true;
-	}).attr('checked','checked');
-
-	$('tr.url button').click(function(){
-		var c = this.className || '';
-		c = c.replace(/.*?(url[^ '"]+).*/, '$1');
-		if (c) setUserSetting('urlbutton', c);
-		$(this).siblings('.urlfield').val( $(this).attr('title') );
-	});
-
-	$('tr.url .urlfield').each(function(){
-		var b = getUserSetting('urlbutton');
-		$(this).val( $(this).siblings('button.'+b).attr('title') );
-	});
-}
-})(jQuery);
diff -uNr a/mp-wp/wp-includes/js/swfupload/plugins/swfupload.cookies.js b/mp-wp/wp-includes/js/swfupload/plugins/swfupload.cookies.js
--- a/mp-wp/wp-includes/js/swfupload/plugins/swfupload.cookies.js 659e33480372c2127d72abb078045fc9d398fd7ffe89e9fa4a7fa5b972d47674e055403d278a5cf9d116c1e66cefdb4b17fb68ab62d2024a7b2ff7497ef39b03
+++ b/mp-wp/wp-includes/js/swfupload/plugins/swfupload.cookies.js false
@@ -1,53 +0,0 @@
-/*
-	Cookie Plug-in
-	
-	This plug in automatically gets all the cookies for this site and adds them to the post_params.
-	Cookies are loaded only on initialization.  The refreshCookies function can be called to update the post_params.
-	The cookies will override any other post params with the same name.
-*/
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-	SWFUpload.prototype.initSettings = function (oldInitSettings) {
-		return function () {
-			if (typeof(oldInitSettings) === "function") {
-				oldInitSettings.call(this);
-			}
-			
-			this.refreshCookies(false);	// The false parameter must be sent since SWFUpload has not initialzed at this point
-		};
-	}(SWFUpload.prototype.initSettings);
-	
-	// refreshes the post_params and updates SWFUpload.  The sendToFlash parameters is optional and defaults to True
-	SWFUpload.prototype.refreshCookies = function (sendToFlash) {
-		if (sendToFlash === undefined) {
-			sendToFlash = true;
-		}
-		sendToFlash = !!sendToFlash;
-		
-		// Get the post_params object
-		var postParams = this.settings.post_params;
-		
-		// Get the cookies
-		var i, cookieArray = document.cookie.split(';'), caLength = cookieArray.length, c, eqIndex, name, value;
-		for (i = 0; i < caLength; i++) {
-			c = cookieArray[i];
-			
-			// Left Trim spaces
-			while (c.charAt(0) === " ") {
-				c = c.substring(1, c.length);
-			}
-			eqIndex = c.indexOf("=");
-			if (eqIndex > 0) {
-				name = c.substring(0, eqIndex);
-				value = c.substring(eqIndex + 1);
-				postParams[name] = value;
-			}
-		}
-		
-		if (sendToFlash) {
-			this.setPostParams(postParams);
-		}
-	};
-
-}
diff -uNr a/mp-wp/wp-includes/js/swfupload/plugins/swfupload.documentready.js b/mp-wp/wp-includes/js/swfupload/plugins/swfupload.documentready.js
--- a/mp-wp/wp-includes/js/swfupload/plugins/swfupload.documentready.js b1d705f33297ec5be97856650570926f221976bcb892d53f15dcd769c1281a45d6fca1cddf6bc249facbe63b0ac5d4aa8a6f82d8165cb0ef9033dbfb1f0a7e15
+++ b/mp-wp/wp-includes/js/swfupload/plugins/swfupload.documentready.js false
@@ -1,102 +0,0 @@
-/*
-	DocumentReady Plug-in
-	
-	This plugin loads SWFUpload as soon as the document is ready.  You should not load SWFUpload inside window.onload using this plugin.
-	You can also chain other functions by calling SWFUpload.DocumentReady(your function).
-	
-	Warning: Embedded Ads or other scripts that overwrite window.onload or use their own document ready functions may interfer with this plugin.  You
-		should not set window.onload when using this plugin.
-	
-	Usage Example:
-	
-	var swfu = new SWFUpload(your settings object);
-	SWFUpload.DocumentReady(function () { alert('Document Ready!'; });
-	
-*/
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-	// Override iniSWFUpload so SWFUpload gets inited when the document is ready rather than immediately
-	SWFUpload.prototype.initSWFUpload = function (old_initSWFUpload) {
-		return function (init_settings) {
-			var self = this;
-			if  (typeof(old_initSWFUpload) === "function") {
-				SWFUpload.DocumentReady(function () {
-					old_initSWFUpload.call(self, init_settings);
-				});
-			}
-		}
-		
-	}(SWFUpload.prototype.initSWFUpload);
-
-	
-	// The DocumentReady function adds the passed in function to
-	// the functions that will be executed when the document is ready/loaded
-	SWFUpload.DocumentReady = function (fn) {
-		// Add the function to the chain
-		SWFUpload.DocumentReady.InternalOnloadChain = function (previous_link_fn) {
-			return function () {
-				if (typeof(previous_link_fn) === "function") {
-					previous_link_fn();
-				}
-				fn();
-			};
-		}(SWFUpload.DocumentReady.InternalOnloadChain);
-	};
-	SWFUpload.DocumentReady.InternalOnloadChain = null;
-	SWFUpload.DocumentReady.Onload = function () {
-		// Execute the onload function chain
-		if (typeof(SWFUpload.DocumentReady.InternalOnloadChain) === "function") {
-			SWFUpload.DocumentReady.InternalOnloadChain();
-		}
-	};
-	SWFUpload.DocumentReady.SetupComplete = false;
-
-
-	/* ********************************************
-		This portion of the code gets executed as soon it is loaded.
-		It binds the proper event for executing JavaScript is
-		early as possible.  This is a per browser function and so
-		some browser sniffing is used.
-		
-		This solution still has the "exposed" issue (See the Global Delegation section at http://peter.michaux.ca/article/553 )
-		
-		Base solution from http://dean.edwards.name/weblog/2006/06/again/ and http://dean.edwards.name/weblog/2005/09/busted/
-	******************************************** */
-	if (!SWFUpload.DocumentReady.SetupComplete) {
-		// for Internet Explorer (using conditional comments)
-		/*@cc_on @*/
-		/*@if (@_win32)
-		document.write("<script id=__ie_onload defer src=javascript:void(0)><\/script>");
-		var script = document.getElementById("__ie_onload");
-		script.onreadystatechange = function() {
-			if (this.readyState == "complete") {
-				SWFUpload.DocumentReady.Onload(); // call the onload handler
-			}
-		};
-		SWFUpload.DocumentReady.SetupComplete = true;
-		/*@end @*/
-	}
-
-	if (!SWFUpload.DocumentReady.SetupComplete && /WebKit/i.test(navigator.userAgent)) { // sniff
-		var _timer = setInterval(function() {
-			if (/loaded|complete/.test(document.readyState)) {
-				clearInterval(_timer);
-				SWFUpload.DocumentReady.Onload(); // call the onload handler
-			}
-		}, 10);
-		SWFUpload.DocumentReady.SetupComplete = true;
-	}
-
-	/* for Mozilla */
-	if (!SWFUpload.DocumentReady.SetupComplete && document.addEventListener) {
-		document.addEventListener("DOMContentLoaded", SWFUpload.DocumentReady.Onload, false);
-		SWFUpload.DocumentReady.SetupComplete = true;
-	}
-
-	/* for other browsers */
-	if (!SWFUpload.DocumentReady.SetupComplete) {
-		window.onload = SWFUpload.DocumentReady.Onload;
-		SWFUpload.DocumentReady.SetupComplete = true;
-	}
-}
diff -uNr a/mp-wp/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js b/mp-wp/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js
--- a/mp-wp/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js de097902bb921302c51bada6b3c2a5051fef277b8abd38664e267d6bc16499a5b96dafcc48c599c56c83cac43d663416f9ff000aa3e6a8b1ce4e6a789fe7dd24
+++ b/mp-wp/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js false
@@ -1,64 +0,0 @@
-/* 
-	SWFUpload Graceful Degradation Plug-in
-
-	This plugin allows SWFUpload to display only if it is loaded successfully.  Otherwise a default form is left displayed.
-	
-	Usage:
-	
-	To use this plugin create two HTML containers. Each should have an ID defined.  One container should hold the SWFUpload UI.  The other should hold the degraded UI.
-	
-	The SWFUpload container should have its CSS "display" property set to "none".
-	
-	If SWFUpload loads successfully the SWFUpload container will be displayed ("display" set to "block") and the
-	degraded container will be hidden ("display" set to "none").
-	
-	Use the settings "swfupload_element_id" and "degraded_element_id" to indicate your container IDs.  The default values are "swfupload_container" and "degraded_container".
-	
-*/
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-	SWFUpload.gracefulDegradation = {};
-	SWFUpload.prototype.initSettings = function (old_initSettings) {
-		return function (init_settings) {
-			if (typeof(old_initSettings) === "function") {
-				old_initSettings.call(this, init_settings);
-			}
-			
-			this.addSetting("swfupload_element_id",		  		init_settings.swfupload_element_id,				"swfupload_container");
-			this.addSetting("degraded_element_id",		  		init_settings.degraded_element_id,				"degraded_container");
-			this.addSetting("user_swfUploadLoaded_handler",		init_settings.swfupload_loaded_handler,			SWFUpload.swfUploadLoaded);
-
-			this.swfUploadLoaded_handler = SWFUpload.gracefulDegradation.swfUploadLoaded;
-		};
-	}(SWFUpload.prototype.initSettings);
-
-	SWFUpload.gracefulDegradation.swfUploadLoaded = function () {
-		var swfupload_container_id, swfupload_container, degraded_container_id, degraded_container, user_swfUploadLoaded_handler;
-		try {
-			if (uploadDegradeOptions.is_lighttpd_before_150) throw "Lighttpd versions earlier than 1.5.0 aren't supported!";
-			swfupload_element_id = this.getSetting("swfupload_element_id");
-			degraded_element_id = this.getSetting("degraded_element_id");
-			
-			// Show the UI container
-			swfupload_container = document.getElementById(swfupload_element_id);
-			if (swfupload_container !== null) {
-				swfupload_container.style.display = "block";
-
-				// Now take care of hiding the degraded UI
-				degraded_container = document.getElementById(degraded_element_id);
-				if (degraded_container !== null) {
-					degraded_container.style.display = "none";
-				}
-			}
-		} catch (ex) {
-			this.debug(ex);
-		}
-		
-		user_swfUploadLoaded_handler = this.getSetting("user_swfUploadLoaded_handler");
-		if (typeof(user_swfUploadLoaded_handler) === "function") {
-			user_swfUploadLoaded_handler.apply(this);
-		}
-	};
-
-}
diff -uNr a/mp-wp/wp-includes/js/swfupload/plugins/swfupload.queue.js b/mp-wp/wp-includes/js/swfupload/plugins/swfupload.queue.js
--- a/mp-wp/wp-includes/js/swfupload/plugins/swfupload.queue.js cb2d7496eec5266c55565537e016793825ef736bfe7aaf87ba26f997c95fbbadf4e2e5cba7649de9f20f482839cf8518a6f82529b2fc9c89fc454fad01d0340c
+++ b/mp-wp/wp-includes/js/swfupload/plugins/swfupload.queue.js false
@@ -1,77 +0,0 @@
-/*
-	Queue Plug-in
-	
-	Features:
-		*Adds a cancelQueue() method for cancelling the entire queue.
-		*All queued files are uploaded when startUpload() is called.
-		*If false is returned from uploadComplete then the queue upload is stopped.
-		 If false is not returned (strict comparison) then the queue upload is continued.
-		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
-		 Set the event handler with the queue_complete_handler setting.
-		
-	*/
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-	SWFUpload.queue = {};
-	
-	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-		return function () {
-			if (typeof(oldInitSettings) === "function") {
-				oldInitSettings.call(this);
-			}
-			
-			this.customSettings.queue_cancelled_flag = false;
-			this.customSettings.queue_upload_count = 0;
-			
-			this.settings.user_upload_complete_handler = this.settings.upload_complete_handler;
-			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
-			
-			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
-		};
-	})(SWFUpload.prototype.initSettings);
-
-	SWFUpload.prototype.startUpload = function (fileID) {
-		this.customSettings.queue_cancelled_flag = false;
-		this.callFlash("StartUpload", false, [fileID]);
-	};
-
-	SWFUpload.prototype.cancelQueue = function () {
-		this.customSettings.queue_cancelled_flag = true;
-		this.stopUpload();
-		
-		var stats = this.getStats();
-		while (stats.files_queued > 0) {
-			this.cancelUpload();
-			stats = this.getStats();
-		}
-	};
-	
-	SWFUpload.queue.uploadCompleteHandler = function (file) {
-		var user_upload_complete_handler = this.settings.user_upload_complete_handler;
-		var continueUpload;
-		
-		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
-			this.customSettings.queue_upload_count++;
-		}
-
-		if (typeof(user_upload_complete_handler) === "function") {
-			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
-		} else {
-			continueUpload = true;
-		}
-		
-		if (continueUpload) {
-			var stats = this.getStats();
-			if (stats.files_queued > 0 && this.customSettings.queue_cancelled_flag === false) {
-				this.startUpload();
-			} else if (this.customSettings.queue_cancelled_flag === false) {
-				this.queueEvent("queue_complete_handler", [this.customSettings.queue_upload_count]);
-				this.customSettings.queue_upload_count = 0;
-			} else {
-				this.customSettings.queue_cancelled_flag = false;
-				this.customSettings.queue_upload_count = 0;
-			}
-		}
-	};
-}
\ No newline at end of file
diff -uNr a/mp-wp/wp-includes/js/swfupload/plugins/swfupload.swfobject.js b/mp-wp/wp-includes/js/swfupload/plugins/swfupload.swfobject.js
--- a/mp-wp/wp-includes/js/swfupload/plugins/swfupload.swfobject.js 7d86c59ea059f890cf0a82bc86ab4c3c0ba71ce05e5b5ba855f38e98281d20d33db8dfb4977c417f92c03e0803f3cf86713f14c0c5ceba67a2618adefa6d8e6e
+++ b/mp-wp/wp-includes/js/swfupload/plugins/swfupload.swfobject.js false
@@ -1,110 +0,0 @@
-/*
-	SWFUpload.SWFObject Plugin
-
-	Summary:
-		This plugin uses SWFObject to embed SWFUpload dynamically in the page.  SWFObject provides accurate Flash Player detection and DOM Ready loading.
-		This plugin replaces the Graceful Degradation plugin.
-
-	Features:
-		* swfupload_load_failed_hander event
-		* swfupload_pre_load_handler event
-		* minimum_flash_version setting (default: "9.0.28")
-		* SWFUpload.onload event for early loading
-
-	Usage:
-		Provide handlers and settings as needed.  When using the SWFUpload.SWFObject plugin you should initialize SWFUploading
-		in SWFUpload.onload rather than in window.onload.  When initialized this way SWFUpload can load earlier preventing the UI flicker
-		that was seen using the Graceful Degradation plugin.
-
-		<script type="text/javascript">
-			var swfu;
-			SWFUpload.onload = function () {
-				swfu = new SWFUpload({
-					minimum_flash_version: "9.0.28",
-					swfupload_pre_load_handler: swfuploadPreLoad,
-					swfupload_load_failed_handler: swfuploadLoadFailed
-				});
-			};
-		</script>
-		
-	Notes:
-		You must provide set minimum_flash_version setting to "8" if you are using SWFUpload for Flash Player 8.
-		The swfuploadLoadFailed event is only fired if the minimum version of Flash Player is not met.  Other issues such as missing SWF files, browser bugs
-		 or corrupt Flash Player installations will not trigger this event.
-		The swfuploadPreLoad event is fired as soon as the minimum version of Flash Player is found.  It does not wait for SWFUpload to load and can
-		 be used to prepare the SWFUploadUI and hide alternate content.
-		swfobject's onDomReady event is cross-browser safe but will default to the window.onload event when DOMReady is not supported by the browser.
-		 Early DOM Loading is supported in major modern browsers but cannot be guaranteed for every browser ever made.
-*/
-
-
-/*	SWFObject v2.0 rc4 <http://code.google.com/p/swfobject/>
-	Copyright (c) 2007 Geoff Stearns, Michael Williams, and Bobby van der Sluis
-	This software is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
-*/
-var swfobject=function(){var X="undefined",P="object",a="visibility:visible",e="visibility:hidden",B="Shockwave Flash",h="ShockwaveFlash.ShockwaveFlash",V="application/x-shockwave-flash",K="SWFObjectExprInst",G=window,g=document,N=navigator,f=[],H=[],Q=null,L=null,S=false,C=false;var Y=function(){var l=typeof g.getElementById!=X&&typeof g.getElementsByTagName!=X&&typeof g.createElement!=X&&typeof g.appendChild!=X&&typeof g.replaceChild!=X&&typeof g.removeChild!=X&&typeof g.cloneNode!=X,t=[0,0,0],n=null;if(typeof N.plugins!=X&&typeof N.plugins[B]==P){n=N.plugins[B].description;if(n){n=n.replace(/^.*\s+(\S+\s+\S+$)/,"$1");t[0]=parseInt(n.replace(/^(.*)\..*$/,"$1"),10);t[1]=parseInt(n.replace(/^.*\.(.*)\s.*$/,"$1"),10);t[2]=/r/.test(n)?parseInt(n.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof G.ActiveXObject!=X){var o=null,s=false;try{o=new ActiveXObject(h+".7")}catch(k){try{o=new ActiveXObject(h+".6");t=[6,0,21];o.AllowScriptAccess="always"}catch(k){if(t[0]==6){s=true}}if(!s){try{o=new ActiveXObject(h)}catch(k){}}}if(!s&&o){try{n=o.GetVariable("$version");if(n){n=n.split(" ")[1].split(",");t=[parseInt(n[0],10),parseInt(n[1],10),parseInt(n[2],10)]}}catch(k){}}}}var v=N.userAgent.toLowerCase(),j=N.platform.toLowerCase(),r=/webkit/.test(v)?parseFloat(v.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,i=false,q=j?/win/.test(j):/win/.test(v),m=j?/mac/.test(j):/mac/.test(v);/*@cc_on i=true;@if(@_win32)q=true;@elif(@_mac)m=true;@end@*/return{w3cdom:l,pv:t,webkit:r,ie:i,win:q,mac:m}}();var d=function(){if(!Y.w3cdom){return }J(I);if(Y.ie&&Y.win){try{g.write("<script id=__ie_ondomload defer=true src=//:><\/script>");var i=b("__ie_ondomload");if(i){i.onreadystatechange=function(){if(this.readyState=="complete"){this.parentNode.removeChild(this);U()}}}}catch(j){}}if(Y.webkit&&typeof g.readyState!=X){Q=setInterval(function(){if(/loaded|complete/.test(g.readyState)){U()}},10)}if(typeof g.addEventListener!=X){g.addEventListener("DOMContentLoaded",U,null)}M(U)}();function U(){if(S){return }if(Y.ie&&Y.win){var m=W("span");try{var l=g.getElementsByTagName("body")[0].appendChild(m);l.parentNode.removeChild(l)}catch(n){return }}S=true;if(Q){clearInterval(Q);Q=null}var j=f.length;for(var k=0;k<j;k++){f[k]()}}function J(i){if(S){i()}else{f[f.length]=i}}function M(j){if(typeof G.addEventListener!=X){G.addEventListener("load",j,false)}else{if(typeof g.addEventListener!=X){g.addEventListener("load",j,false)}else{if(typeof G.attachEvent!=X){G.attachEvent("onload",j)}else{if(typeof G.onload=="function"){var i=G.onload;G.onload=function(){i();j()}}else{G.onload=j}}}}}function I(){var l=H.length;for(var j=0;j<l;j++){var m=H[j].id;if(Y.pv[0]>0){var k=b(m);if(k){H[j].width=k.getAttribute("width")?k.getAttribute("width"):"0";H[j].height=k.getAttribute("height")?k.getAttribute("height"):"0";if(O(H[j].swfVersion)){if(Y.webkit&&Y.webkit<312){T(k)}}else{if(H[j].expressInstall&&!C&&O("6.0.65")&&(Y.win||Y.mac)){D(H[j])}else{c(k)}}}}A("#"+m,a)}}function T(m){var k=m.getElementsByTagName(P)[0];if(k){var p=W("embed"),r=k.attributes;if(r){var o=r.length;for(var n=0;n<o;n++){if(r[n].nodeName.toLowerCase()=="data"){p.setAttribute("src",r[n].nodeValue)}else{p.setAttribute(r[n].nodeName,r[n].nodeValue)}}}var q=k.childNodes;if(q){var s=q.length;for(var l=0;l<s;l++){if(q[l].nodeType==1&&q[l].nodeName.toLowerCase()=="param"){p.setAttribute(q[l].getAttribute("name"),q[l].getAttribute("value"))}}}m.parentNode.replaceChild(p,m)}}function F(i){if(Y.ie&&Y.win&&O("8.0.0")){G.attachEvent("onunload",function(){var k=b(i);for(var j in k){if(typeof k[j]=="function"){k[j]=function(){}}}k.parentNode.removeChild(k)})}}function D(j){C=true;var o=b(j.id);if(o){if(j.altContentId){var l=b(j.altContentId);if(l){L=l}}else{L=Z(o)}if(!(/%$/.test(j.width))&&parseInt(j.width,10)<310){j.width="310"}if(!(/%$/.test(j.height))&&parseInt(j.height,10)<137){j.height="137"}g.title=g.title.slice(0,47)+" - Flash Player Installation";var n=Y.ie&&Y.win?"ActiveX":"PlugIn",k=g.title,m="MMredirectURL="+G.location+"&MMplayerType="+n+"&MMdoctitle="+k,p=j.id;if(Y.ie&&Y.win&&o.readyState!=4){var i=W("div");p+="SWFObjectNew";i.setAttribute("id",p);o.parentNode.insertBefore(i,o);o.style.display="none";G.attachEvent("onload",function(){o.parentNode.removeChild(o)})}R({data:j.expressInstall,id:K,width:j.width,height:j.height},{flashvars:m},p)}}function c(j){if(Y.ie&&Y.win&&j.readyState!=4){var i=W("div");j.parentNode.insertBefore(i,j);i.parentNode.replaceChild(Z(j),i);j.style.display="none";G.attachEvent("onload",function(){j.parentNode.removeChild(j)})}else{j.parentNode.replaceChild(Z(j),j)}}function Z(n){var m=W("div");if(Y.win&&Y.ie){m.innerHTML=n.innerHTML}else{var k=n.getElementsByTagName(P)[0];if(k){var o=k.childNodes;if(o){var j=o.length;for(var l=0;l<j;l++){if(!(o[l].nodeType==1&&o[l].nodeName.toLowerCase()=="param")&&!(o[l].nodeType==8)){m.appendChild(o[l].cloneNode(true))}}}}}return m}function R(AE,AC,q){var p,t=b(q);if(typeof AE.id==X){AE.id=q}if(Y.ie&&Y.win){var AD="";for(var z in AE){if(AE[z]!=Object.prototype[z]){if(z=="data"){AC.movie=AE[z]}else{if(z.toLowerCase()=="styleclass"){AD+=' class="'+AE[z]+'"'}else{if(z!="classid"){AD+=" "+z+'="'+AE[z]+'"'}}}}}var AB="";for(var y in AC){if(AC[y]!=Object.prototype[y]){AB+='<param name="'+y+'" value="'+AC[y]+'" />'}}t.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+AD+">"+AB+"</object>";F(AE.id);p=b(AE.id)}else{if(Y.webkit&&Y.webkit<312){var AA=W("embed");AA.setAttribute("type",V);for(var x in AE){if(AE[x]!=Object.prototype[x]){if(x=="data"){AA.setAttribute("src",AE[x])}else{if(x.toLowerCase()=="styleclass"){AA.setAttribute("class",AE[x])}else{if(x!="classid"){AA.setAttribute(x,AE[x])}}}}}for(var w in AC){if(AC[w]!=Object.prototype[w]){if(w!="movie"){AA.setAttribute(w,AC[w])}}}t.parentNode.replaceChild(AA,t);p=AA}else{var s=W(P);s.setAttribute("type",V);for(var v in AE){if(AE[v]!=Object.prototype[v]){if(v.toLowerCase()=="styleclass"){s.setAttribute("class",AE[v])}else{if(v!="classid"){s.setAttribute(v,AE[v])}}}}for(var u in AC){if(AC[u]!=Object.prototype[u]&&u!="movie"){E(s,u,AC[u])}}t.parentNode.replaceChild(s,t);p=s}}return p}function E(k,i,j){var l=W("param");l.setAttribute("name",i);l.setAttribute("value",j);k.appendChild(l)}function b(i){return g.getElementById(i)}function W(i){return g.createElement(i)}function O(k){var j=Y.pv,i=k.split(".");i[0]=parseInt(i[0],10);i[1]=parseInt(i[1],10);i[2]=parseInt(i[2],10);return(j[0]>i[0]||(j[0]==i[0]&&j[1]>i[1])||(j[0]==i[0]&&j[1]==i[1]&&j[2]>=i[2]))?true:false}function A(m,j){if(Y.ie&&Y.mac){return }var l=g.getElementsByTagName("head")[0],k=W("style");k.setAttribute("type","text/css");k.setAttribute("media","screen");if(!(Y.ie&&Y.win)&&typeof g.createTextNode!=X){k.appendChild(g.createTextNode(m+" {"+j+"}"))}l.appendChild(k);if(Y.ie&&Y.win&&typeof g.styleSheets!=X&&g.styleSheets.length>0){var i=g.styleSheets[g.styleSheets.length-1];if(typeof i.addRule==P){i.addRule(m,j)}}}return{registerObject:function(l,i,k){if(!Y.w3cdom||!l||!i){return }var j={};j.id=l;j.swfVersion=i;j.expressInstall=k?k:false;H[H.length]=j;A("#"+l,e)},getObjectById:function(l){var i=null;if(Y.w3cdom&&S){var j=b(l);if(j){var k=j.getElementsByTagName(P)[0];if(!k||(k&&typeof j.SetVariable!=X)){i=j}else{if(typeof k.SetVariable!=X){i=k}}}}return i},embedSWF:function(n,u,r,t,j,m,k,p,s){if(!Y.w3cdom||!n||!u||!r||!t||!j){return }r+="";t+="";if(O(j)){A("#"+u,e);var q=(typeof s==P)?s:{};q.data=n;q.width=r;q.height=t;var o=(typeof p==P)?p:{};if(typeof k==P){for(var l in k){if(k[l]!=Object.prototype[l]){if(typeof o.flashvars!=X){o.flashvars+="&"+l+"="+k[l]}else{o.flashvars=l+"="+k[l]}}}}J(function(){R(q,o,u);A("#"+u,a)})}else{if(m&&!C&&O("6.0.65")&&(Y.win||Y.mac)){A("#"+u,e);J(function(){var i={};i.id=i.altContentId=u;i.width=r;i.height=t;i.expressInstall=m;D(i);A("#"+u,a)})}}},getFlashPlayerVersion:function(){return{major:Y.pv[0],minor:Y.pv[1],release:Y.pv[2]}},hasFlashPlayerVersion:O,createSWF:function(k,j,i){if(Y.w3cdom&&S){return R(k,j,i)}else{return undefined}},createCSS:function(j,i){if(Y.w3cdom){A(j,i)}},addDomLoadEvent:J,addLoadEvent:M,getQueryParamValue:function(m){var l=g.location.search||g.location.hash;if(m==null){return l}if(l){var k=l.substring(1).split("&");for(var j=0;j<k.length;j++){if(k[j].substring(0,k[j].indexOf("="))==m){return k[j].substring((k[j].indexOf("=")+1))}}}return""},expressInstallCallback:function(){if(C&&L){var i=b(K);if(i){i.parentNode.replaceChild(L,i);L=null;C=false}}}}}();
-
-	
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-	SWFUpload.onload = function () {};
-	
-	swfobject.addDomLoadEvent(function () {
-		if (typeof(SWFUpload.onload) === "function") {
-			SWFUpload.onload.call(window);
-		}
-	});
-	
-	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-		return function () {
-			if (typeof(oldInitSettings) === "function") {
-				oldInitSettings.call(this);
-			}
-
-			this.ensureDefault = function (settingName, defaultValue) {
-				this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
-			};
-
-			this.ensureDefault("minimum_flash_version", "9.0.28");
-			this.ensureDefault("swfupload_pre_load_handler", null);
-			this.ensureDefault("swfupload_load_failed_handler", null);
-
-			delete this.ensureDefault;
-
-		};
-	})(SWFUpload.prototype.initSettings);
-
-
-	SWFUpload.prototype.loadFlash = function (oldLoadFlash) {
-		return function () {
-			var hasFlash = swfobject.hasFlashPlayerVersion(this.settings.minimum_flash_version);
-			
-			if (hasFlash) {
-				this.queueEvent("swfupload_pre_load_handler");
-				if (typeof(oldLoadFlash) === "function") {
-					oldLoadFlash.call(this);
-				}
-			} else {
-				this.queueEvent("swfupload_load_failed_handler");
-			}
-		};
-		
-	}(SWFUpload.prototype.loadFlash);
-			
-	SWFUpload.prototype.displayDebugInfo = function (oldDisplayDebugInfo) {
-		return function () {
-			if (typeof(oldDisplayDebugInfo) === "function") {
-				oldDisplayDebugInfo.call(this);
-			}
-			
-			this.debug(
-				[
-					"SWFUpload.SWFObject Plugin settings:", "\n",
-					"\t", "minimum_flash_version:                      ", this.settings.minimum_flash_version, "\n",
-					"\t", "swfupload_pre_load_handler assigned:     ", (typeof(this.settings.swfupload_pre_load_handler) === "function").toString(), "\n",
-					"\t", "swfupload_load_failed_handler assigned:     ", (typeof(this.settings.swfupload_load_failed_handler) === "function").toString(), "\n",
-				].join("")
-			);
-		};	
-	}(SWFUpload.prototype.displayDebugInfo);
-}
diff -uNr a/mp-wp/wp-includes/js/swfupload/swfupload.js b/mp-wp/wp-includes/js/swfupload/swfupload.js
--- a/mp-wp/wp-includes/js/swfupload/swfupload.js e9770a9bf2e8d9bf9312109e46472d91287db84dad35adfce458109e2e36e5edbff08e9ae3476bee0da64375bbfdc4544541b95400eb58846c050eddd281b9fd
+++ b/mp-wp/wp-includes/js/swfupload/swfupload.js false
@@ -1,927 +0,0 @@
-/**
- * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
- *
- * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
- *
- * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilzen and Mammon Media and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- */
-
-
-/* ******************* */
-/* Constructor & Init  */
-/* ******************* */
-var SWFUpload;
-
-if (SWFUpload == undefined) {
-	SWFUpload = function (settings) {
-		this.initSWFUpload(settings);
-	};
-}
-
-SWFUpload.prototype.initSWFUpload = function (settings) {
-	try {
-		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
-		this.settings = settings;
-		this.eventQueue = [];
-		this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
-		this.movieElement = null;
-
-		// Setup global control tracking
-		SWFUpload.instances[this.movieName] = this;
-
-		// Load the settings.  Load the Flash movie.
-		this.initSettings();
-		this.loadFlash();
-		this.displayDebugInfo();
-	} catch (ex) {
-		delete SWFUpload.instances[this.movieName];
-		throw ex;
-	}
-};
-
-/* *************** */
-/* Static Members  */
-/* *************** */
-SWFUpload.instances = {};
-SWFUpload.movieCount = 0;
-SWFUpload.version = "2.2.0 Beta 2";
-SWFUpload.QUEUE_ERROR = {
-	QUEUE_LIMIT_EXCEEDED	  		: -100,
-	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
-	ZERO_BYTE_FILE			  		: -120,
-	INVALID_FILETYPE		  		: -130
-};
-SWFUpload.UPLOAD_ERROR = {
-	HTTP_ERROR				  		: -200,
-	MISSING_UPLOAD_URL	      		: -210,
-	IO_ERROR				  		: -220,
-	SECURITY_ERROR			  		: -230,
-	UPLOAD_LIMIT_EXCEEDED	  		: -240,
-	UPLOAD_FAILED			  		: -250,
-	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
-	FILE_VALIDATION_FAILED	  		: -270,
-	FILE_CANCELLED			  		: -280,
-	UPLOAD_STOPPED					: -290
-};
-SWFUpload.FILE_STATUS = {
-	QUEUED		 : -1,
-	IN_PROGRESS	 : -2,
-	ERROR		 : -3,
-	COMPLETE	 : -4,
-	CANCELLED	 : -5
-};
-SWFUpload.BUTTON_ACTION = {
-	SELECT_FILE  : -100,
-	SELECT_FILES : -110,
-	START_UPLOAD : -120
-};
-SWFUpload.CURSOR = {
-	ARROW : -1,
-	HAND : -2
-};
-SWFUpload.WINDOW_MODE = {
-	WINDOW : "window",
-	TRANSPARENT : "transparent",
-	OPAQUE : "opaque"
-};
-
-/* ******************** */
-/* Instance Members  */
-/* ******************** */
-
-// Private: initSettings ensures that all the
-// settings are set, getting a default value if one was not assigned.
-SWFUpload.prototype.initSettings = function () {
-	this.ensureDefault = function (settingName, defaultValue) {
-		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
-	};
-	
-	// Upload backend settings
-	this.ensureDefault("upload_url", "");
-	this.ensureDefault("file_post_name", "Filedata");
-	this.ensureDefault("post_params", {});
-	this.ensureDefault("use_query_string", false);
-	this.ensureDefault("requeue_on_error", false);
-	this.ensureDefault("http_success", []);
-	
-	// File Settings
-	this.ensureDefault("file_types", "*.*");
-	this.ensureDefault("file_types_description", "All Files");
-	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
-	this.ensureDefault("file_upload_limit", 0);
-	this.ensureDefault("file_queue_limit", 0);
-
-	// Flash Settings
-	this.ensureDefault("flash_url", "swfupload.swf");
-	this.ensureDefault("prevent_swf_caching", true);
-	
-	// Button Settings
-	this.ensureDefault("button_image_url", "");
-	this.ensureDefault("button_width", 1);
-	this.ensureDefault("button_height", 1);
-	this.ensureDefault("button_text", "");
-	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
-	this.ensureDefault("button_text_top_padding", 0);
-	this.ensureDefault("button_text_left_padding", 0);
-	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
-	this.ensureDefault("button_disabled", false);
-	this.ensureDefault("button_placeholder_id", null);
-	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
-	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
-	
-	// Debug Settings
-	this.ensureDefault("debug", false);
-	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
-	
-	// Event Handlers
-	this.settings.return_upload_start_handler = this.returnUploadStart;
-	this.ensureDefault("swfupload_loaded_handler", null);
-	this.ensureDefault("file_dialog_start_handler", null);
-	this.ensureDefault("file_queued_handler", null);
-	this.ensureDefault("file_queue_error_handler", null);
-	this.ensureDefault("file_dialog_complete_handler", null);
-	
-	this.ensureDefault("upload_start_handler", null);
-	this.ensureDefault("upload_progress_handler", null);
-	this.ensureDefault("upload_error_handler", null);
-	this.ensureDefault("upload_success_handler", null);
-	this.ensureDefault("upload_complete_handler", null);
-	
-	this.ensureDefault("debug_handler", this.debugMessage);
-
-	this.ensureDefault("custom_settings", {});
-
-	// Other settings
-	this.customSettings = this.settings.custom_settings;
-	
-	// Update the flash url if needed
-	if (this.settings.prevent_swf_caching) {
-		this.settings.flash_url = this.settings.flash_url + "?swfuploadrnd=" + Math.floor(Math.random() * 999999999);
-	}
-	
-	delete this.ensureDefault;
-};
-
-SWFUpload.prototype.loadFlash = function () {
-	if (this.settings.button_placeholder_id !== "") {
-		this.replaceWithFlash();
-	} else {
-		this.appendFlash();
-	}
-};
-
-// Private: appendFlash gets the HTML tag for the Flash
-// It then appends the flash to the body
-SWFUpload.prototype.appendFlash = function () {
-	var targetElement, container;
-
-	// Make sure an element with the ID we are going to use doesn't already exist
-	if (document.getElementById(this.movieName) !== null) {
-		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
-	}
-
-	// Get the body tag where we will be adding the flash movie
-	targetElement = document.getElementsByTagName("body")[0];
-
-	if (targetElement == undefined) {
-		throw "Could not find the 'body' element.";
-	}
-
-	// Append the container and load the flash
-	container = document.createElement("div");
-	container.style.width = "1px";
-	container.style.height = "1px";
-	container.style.overflow = "hidden";
-
-	targetElement.appendChild(container);
-	container.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
-};
-
-// Private: replaceWithFlash replaces the button_placeholder element with the flash movie.
-SWFUpload.prototype.replaceWithFlash = function () {
-	var targetElement, tempParent;
-
-	// Make sure an element with the ID we are going to use doesn't already exist
-	if (document.getElementById(this.movieName) !== null) {
-		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
-	}
-
-	// Get the element where we will be placing the flash movie
-	targetElement = document.getElementById(this.settings.button_placeholder_id);
-
-	if (targetElement == undefined) {
-		throw "Could not find the placeholder element.";
-	}
-
-	// Append the container and load the flash
-	tempParent = document.createElement("div");
-	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
-	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
-
-};
-
-// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
-SWFUpload.prototype.getFlashHTML = function () {
-	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
-	return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
-				'<param name="wmode" value="', this.settings.button_window_mode , '" />',
-				'<param name="movie" value="', this.settings.flash_url, '" />',
-				'<param name="quality" value="high" />',
-				'<param name="menu" value="false" />',
-				'<param name="allowScriptAccess" value="always" />',
-				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
-				'</object>'].join("");
-};
-
-// Private: getFlashVars builds the parameter string that will be passed
-// to flash in the flashvars param.
-SWFUpload.prototype.getFlashVars = function () {
-	// Build a string from the post param object
-	var paramString = this.buildParamString();
-	var httpSuccessString = this.settings.http_success.join(",");
-	
-	// Build the parameter string
-	return ["movieName=", encodeURIComponent(this.movieName),
-			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
-			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
-			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
-			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
-			"&amp;params=", encodeURIComponent(paramString),
-			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
-			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
-			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
-			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
-			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
-			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
-			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
-			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
-			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
-			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
-			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
-			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
-			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
-			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
-			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
-			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
-			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
-		].join("");
-};
-
-// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
-// The element is cached after the first lookup
-SWFUpload.prototype.getMovieElement = function () {
-	if (this.movieElement == undefined) {
-		this.movieElement = document.getElementById(this.movieName);
-	}
-
-	if (this.movieElement === null) {
-		throw "Could not find Flash element";
-	}
-	
-	return this.movieElement;
-};
-
-// Private: buildParamString takes the name/value pairs in the post_params setting object
-// and joins them up in to a string formatted "name=value&amp;name=value"
-SWFUpload.prototype.buildParamString = function () {
-	var postParams = this.settings.post_params; 
-	var paramStringPairs = [];
-
-	if (typeof(postParams) === "object") {
-		for (var name in postParams) {
-			if (postParams.hasOwnProperty(name)) {
-				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
-			}
-		}
-	}
-
-	return paramStringPairs.join("&amp;");
-};
-
-// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
-// all references to the SWF, and other objects so memory is properly freed.
-// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
-SWFUpload.prototype.destroy = function () {
-	try {
-		// Make sure Flash is done before we try to remove it
-		this.stopUpload();
-		
-		// Remove the SWFUpload DOM nodes
-		var movieElement = null;
-		try {
-			movieElement = this.getMovieElement();
-		} catch (ex) {
-		}
-		
-		if (movieElement != undefined && movieElement.parentNode != undefined && typeof movieElement.parentNode.removeChild === "function") {
-			var container = movieElement.parentNode;
-			if (container != undefined) {
-				container.removeChild(movieElement);
-				if (container.parentNode != undefined && typeof container.parentNode.removeChild === "function") {
-					container.parentNode.removeChild(container);
-				}
-			}
-		}
-		
-		// Destroy references
-		SWFUpload.instances[this.movieName] = null;
-		delete SWFUpload.instances[this.movieName];
-
-		delete this.movieElement;
-		delete this.settings;
-		delete this.customSettings;
-		delete this.eventQueue;
-		delete this.movieName;
-		
-		delete window[this.movieName];
-		
-		return true;
-	} catch (ex1) {
-		return false;
-	}
-};
-
-// Public: displayDebugInfo prints out settings and configuration
-// information about this SWFUpload instance.
-// This function (and any references to it) can be deleted when placing
-// SWFUpload in production.
-SWFUpload.prototype.displayDebugInfo = function () {
-	this.debug(
-		[
-			"---SWFUpload Instance Info---\n",
-			"Version: ", SWFUpload.version, "\n",
-			"Movie Name: ", this.movieName, "\n",
-			"Settings:\n",
-			"\t", "upload_url:               ", this.settings.upload_url, "\n",
-			"\t", "flash_url:                ", this.settings.flash_url, "\n",
-			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
-			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
-			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
-			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
-			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
-			"\t", "file_types:               ", this.settings.file_types, "\n",
-			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
-			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
-			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
-			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
-			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
-
-			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
-
-			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
-			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
-			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
-			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
-			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
-			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
-			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
-			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
-			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
-			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
-
-			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
-			"Event Handlers:\n",
-			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
-			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
-			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
-			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
-			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
-			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
-			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
-			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
-			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
-			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
-		].join("")
-	);
-};
-
-/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
-	the maintain v2 API compatibility
-*/
-// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
-SWFUpload.prototype.addSetting = function (name, value, default_value) {
-    if (value == undefined) {
-        return (this.settings[name] = default_value);
-    } else {
-        return (this.settings[name] = value);
-	}
-};
-
-// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
-SWFUpload.prototype.getSetting = function (name) {
-    if (this.settings[name] != undefined) {
-        return this.settings[name];
-	}
-
-    return "";
-};
-
-
-
-// Private: callFlash handles function calls made to the Flash element.
-// Calls are made with a setTimeout for some functions to work around
-// bugs in the ExternalInterface library.
-SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
-	argumentArray = argumentArray || [];
-	
-	var movieElement = this.getMovieElement();
-	var returnValue;
-
-	if (typeof movieElement[functionName] === "function") {
-		// We have to go through all this if/else stuff because the Flash functions don't have apply() and only accept the exact number of arguments.
-		if (argumentArray.length === 0) {
-			returnValue = movieElement[functionName]();
-		} else if (argumentArray.length === 1) {
-			returnValue = movieElement[functionName](argumentArray[0]);
-		} else if (argumentArray.length === 2) {
-			returnValue = movieElement[functionName](argumentArray[0], argumentArray[1]);
-		} else if (argumentArray.length === 3) {
-			returnValue = movieElement[functionName](argumentArray[0], argumentArray[1], argumentArray[2]);
-		} else {
-			throw "Too many arguments";
-		}
-		
-		// Unescape file post param values
-		if (returnValue != undefined && typeof returnValue.post === "object") {
-			returnValue = this.unescapeFilePostParams(returnValue);
-		}
-		
-		return returnValue;
-	} else {
-		throw "Invalid function name: " + functionName;
-	}
-};
-
-
-/* *****************************
-	-- Flash control methods --
-	Your UI should use these
-	to operate SWFUpload
-   ***************************** */
-
-// Public: selectFile causes a File Selection Dialog window to appear.  This
-// dialog only allows 1 file to be selected. WARNING: this function does not work in Flash Player 10
-SWFUpload.prototype.selectFile = function () {
-	this.callFlash("SelectFile");
-};
-
-// Public: selectFiles causes a File Selection Dialog window to appear/ This
-// dialog allows the user to select any number of files
-// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
-// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
-// for this bug.  WARNING: this function does not work in Flash Player 10
-SWFUpload.prototype.selectFiles = function () {
-	this.callFlash("SelectFiles");
-};
-
-
-// Public: startUpload starts uploading the first file in the queue unless
-// the optional parameter 'fileID' specifies the ID 
-SWFUpload.prototype.startUpload = function (fileID) {
-	this.callFlash("StartUpload", [fileID]);
-};
-
-// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
-// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
-// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
-SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
-	if (triggerErrorEvent !== false) {
-		triggerErrorEvent = true;
-	}
-	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
-};
-
-// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
-// If nothing is currently uploading then nothing happens.
-SWFUpload.prototype.stopUpload = function () {
-	this.callFlash("StopUpload");
-};
-
-/* ************************
- * Settings methods
- *   These methods change the SWFUpload settings.
- *   SWFUpload settings should not be changed directly on the settings object
- *   since many of the settings need to be passed to Flash in order to take
- *   effect.
- * *********************** */
-
-// Public: getStats gets the file statistics object.
-SWFUpload.prototype.getStats = function () {
-	return this.callFlash("GetStats");
-};
-
-// Public: setStats changes the SWFUpload statistics.  You shouldn't need to 
-// change the statistics but you can.  Changing the statistics does not
-// affect SWFUpload accept for the successful_uploads count which is used
-// by the upload_limit setting to determine how many files the user may upload.
-SWFUpload.prototype.setStats = function (statsObject) {
-	this.callFlash("SetStats", [statsObject]);
-};
-
-// Public: getFile retrieves a File object by ID or Index.  If the file is
-// not found then 'null' is returned.
-SWFUpload.prototype.getFile = function (fileID) {
-	if (typeof(fileID) === "number") {
-		return this.callFlash("GetFileByIndex", [fileID]);
-	} else {
-		return this.callFlash("GetFile", [fileID]);
-	}
-};
-
-// Public: addFileParam sets a name/value pair that will be posted with the
-// file specified by the Files ID.  If the name already exists then the
-// exiting value will be overwritten.
-SWFUpload.prototype.addFileParam = function (fileID, name, value) {
-	return this.callFlash("AddFileParam", [fileID, name, value]);
-};
-
-// Public: removeFileParam removes a previously set (by addFileParam) name/value
-// pair from the specified file.
-SWFUpload.prototype.removeFileParam = function (fileID, name) {
-	this.callFlash("RemoveFileParam", [fileID, name]);
-};
-
-// Public: setUploadUrl changes the upload_url setting.
-SWFUpload.prototype.setUploadURL = function (url) {
-	this.settings.upload_url = url.toString();
-	this.callFlash("SetUploadURL", [url]);
-};
-
-// Public: setPostParams changes the post_params setting
-SWFUpload.prototype.setPostParams = function (paramsObject) {
-	this.settings.post_params = paramsObject;
-	this.callFlash("SetPostParams", [paramsObject]);
-};
-
-// Public: addPostParam adds post name/value pair.  Each name can have only one value.
-SWFUpload.prototype.addPostParam = function (name, value) {
-	this.settings.post_params[name] = value;
-	this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: removePostParam deletes post name/value pair.
-SWFUpload.prototype.removePostParam = function (name) {
-	delete this.settings.post_params[name];
-	this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: setFileTypes changes the file_types setting and the file_types_description setting
-SWFUpload.prototype.setFileTypes = function (types, description) {
-	this.settings.file_types = types;
-	this.settings.file_types_description = description;
-	this.callFlash("SetFileTypes", [types, description]);
-};
-
-// Public: setFileSizeLimit changes the file_size_limit setting
-SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
-	this.settings.file_size_limit = fileSizeLimit;
-	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
-};
-
-// Public: setFileUploadLimit changes the file_upload_limit setting
-SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
-	this.settings.file_upload_limit = fileUploadLimit;
-	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
-};
-
-// Public: setFileQueueLimit changes the file_queue_limit setting
-SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
-	this.settings.file_queue_limit = fileQueueLimit;
-	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
-};
-
-// Public: setFilePostName changes the file_post_name setting
-SWFUpload.prototype.setFilePostName = function (filePostName) {
-	this.settings.file_post_name = filePostName;
-	this.callFlash("SetFilePostName", [filePostName]);
-};
-
-// Public: setUseQueryString changes the use_query_string setting
-SWFUpload.prototype.setUseQueryString = function (useQueryString) {
-	this.settings.use_query_string = useQueryString;
-	this.callFlash("SetUseQueryString", [useQueryString]);
-};
-
-// Public: setRequeueOnError changes the requeue_on_error setting
-SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
-	this.settings.requeue_on_error = requeueOnError;
-	this.callFlash("SetRequeueOnError", [requeueOnError]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
-	if (typeof http_status_codes === "string") {
-		http_status_codes = http_status_codes.replace(" ", "").split(",");
-	}
-	
-	this.settings.http_success = http_status_codes;
-	this.callFlash("SetHTTPSuccess", [http_status_codes]);
-};
-
-
-// Public: setDebugEnabled changes the debug_enabled setting
-SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
-	this.settings.debug_enabled = debugEnabled;
-	this.callFlash("SetDebugEnabled", [debugEnabled]);
-};
-
-// Public: setButtonImageURL loads a button image sprite
-SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
-	if (buttonImageURL == undefined) {
-		buttonImageURL = "";
-	}
-	
-	this.settings.button_image_url = buttonImageURL;
-	this.callFlash("SetButtonImageURL", [buttonImageURL]);
-};
-
-// Public: setButtonDimensions resizes the Flash Movie and button
-SWFUpload.prototype.setButtonDimensions = function (width, height) {
-	this.settings.button_width = width;
-	this.settings.button_height = height;
-	
-	var movie = this.getMovieElement();
-	if (movie != undefined) {
-		movie.style.width = width + "px";
-		movie.style.height = height + "px";
-	}
-	
-	this.callFlash("SetButtonDimensions", [width, height]);
-};
-// Public: setButtonText Changes the text overlaid on the button
-SWFUpload.prototype.setButtonText = function (html) {
-	this.settings.button_text = html;
-	this.callFlash("SetButtonText", [html]);
-};
-// Public: setButtonTextPadding changes the top and left padding of the text overlay
-SWFUpload.prototype.setButtonTextPadding = function (left, top) {
-	this.settings.button_text_top_padding = top;
-	this.settings.button_text_left_padding = left;
-	this.callFlash("SetButtonTextPadding", [left, top]);
-};
-
-// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
-SWFUpload.prototype.setButtonTextStyle = function (css) {
-	this.settings.button_text_style = css;
-	this.callFlash("SetButtonTextStyle", [css]);
-};
-// Public: setButtonDisabled disables/enables the button
-SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
-	this.settings.button_disabled = isDisabled;
-	this.callFlash("SetButtonDisabled", [isDisabled]);
-};
-// Public: setButtonAction sets the action that occurs when the button is clicked
-SWFUpload.prototype.setButtonAction = function (buttonAction) {
-	this.settings.button_action = buttonAction;
-	this.callFlash("SetButtonAction", [buttonAction]);
-};
-
-// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
-SWFUpload.prototype.setButtonCursor = function (cursor) {
-	this.settings.button_cursor = cursor;
-	this.callFlash("SetButtonCursor", [cursor]);
-};
-
-/* *******************************
-	Flash Event Interfaces
-	These functions are used by Flash to trigger the various
-	events.
-	
-	All these functions a Private.
-	
-	Because the ExternalInterface library is buggy the event calls
-	are added to a queue and the queue then executed by a setTimeout.
-	This ensures that events are executed in a determinate order and that
-	the ExternalInterface bugs are avoided.
-******************************* */
-
-SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
-	// Warning: Don't call this.debug inside here or you'll create an infinite loop
-	
-	if (argumentArray == undefined) {
-		argumentArray = [];
-	} else if (!(argumentArray instanceof Array)) {
-		argumentArray = [argumentArray];
-	}
-	
-	var self = this;
-	if (typeof this.settings[handlerName] === "function") {
-		// Queue the event
-		this.eventQueue.push(function () {
-			this.settings[handlerName].apply(this, argumentArray);
-		});
-		
-		// Execute the next queued event
-		setTimeout(function () {
-			self.executeNextEvent();
-		}, 0);
-		
-	} else if (this.settings[handlerName] !== null) {
-		throw "Event handler " + handlerName + " is unknown or is not a function";
-	}
-};
-
-// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
-// we must queue them in order to garentee that they are executed in order.
-SWFUpload.prototype.executeNextEvent = function () {
-	// Warning: Don't call this.debug inside here or you'll create an infinite loop
-
-	var  f = this.eventQueue ? this.eventQueue.shift() : null;
-	if (typeof(f) === "function") {
-		f.apply(this);
-	}
-};
-
-// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
-// properties that contain characters that are not valid for JavaScript identifiers. To work around this
-// the Flash Component escapes the parameter names and we must unescape again before passing them along.
-SWFUpload.prototype.unescapeFilePostParams = function (file) {
-	var reg = /[$]([0-9a-f]{4})/i;
-	var unescapedPost = {};
-	var uk;
-
-	if (file != undefined) {
-		for (var k in file.post) {
-			if (file.post.hasOwnProperty(k)) {
-				uk = k;
-				var match;
-				while ((match = reg.exec(uk)) !== null) {
-					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
-				}
-				unescapedPost[uk] = file.post[k];
-			}
-		}
-
-		file.post = unescapedPost;
-	}
-
-	return file;
-};
-
-SWFUpload.prototype.flashReady = function () {
-	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
-	var movieElement = this.getMovieElement();
-	if (typeof movieElement.StartUpload !== "function") {
-		throw "ExternalInterface methods failed to initialize.";
-	}
-
-	// Fix IE Flash/Form bug
-	if (window[this.movieName] == undefined) {
-		window[this.movieName] = movieElement;
-	}
-	
-	this.queueEvent("swfupload_loaded_handler");
-};
-
-
-/* This is a chance to do something before the browse window opens */
-SWFUpload.prototype.fileDialogStart = function () {
-	this.queueEvent("file_dialog_start_handler");
-};
-
-
-/* Called when a file is successfully added to the queue. */
-SWFUpload.prototype.fileQueued = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("file_queued_handler", file);
-};
-
-
-/* Handle errors that occur when an attempt to queue a file fails. */
-SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
-};
-
-/* Called after the file dialog has closed and the selected files have been queued.
-	You could call startUpload here if you want the queued files to begin uploading immediately. */
-SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued) {
-	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued]);
-};
-
-SWFUpload.prototype.uploadStart = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("return_upload_start_handler", file);
-};
-
-SWFUpload.prototype.returnUploadStart = function (file) {
-	var returnValue;
-	if (typeof this.settings.upload_start_handler === "function") {
-		file = this.unescapeFilePostParams(file);
-		returnValue = this.settings.upload_start_handler.call(this, file);
-	} else if (this.settings.upload_start_handler != undefined) {
-		throw "upload_start_handler must be a function";
-	}
-
-	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
-	// interpretted as 'true'.
-	if (returnValue === undefined) {
-		returnValue = true;
-	}
-	
-	returnValue = !!returnValue;
-	
-	this.callFlash("ReturnUploadStart", [returnValue]);
-};
-
-
-
-SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
-};
-
-SWFUpload.prototype.uploadError = function (file, errorCode, message) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_error_handler", [file, errorCode, message]);
-};
-
-SWFUpload.prototype.uploadSuccess = function (file, serverData) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_success_handler", [file, serverData]);
-};
-
-SWFUpload.prototype.uploadComplete = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_complete_handler", file);
-};
-
-/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
-   internal debug console.  You can override this event and have messages written where you want. */
-SWFUpload.prototype.debug = function (message) {
-	this.queueEvent("debug_handler", message);
-};
-
-
-/* **********************************
-	Debug Console
-	The debug console is a self contained, in page location
-	for debug message to be sent.  The Debug Console adds
-	itself to the body if necessary.
-
-	The console is automatically scrolled as messages appear.
-	
-	If you are using your own debug handler or when you deploy to production and
-	have debug disabled you can remove these functions to reduce the file size
-	and complexity.
-********************************** */
-   
-// Private: debugMessage is the default debug_handler.  If you want to print debug messages
-// call the debug() function.  When overriding the function your own function should
-// check to see if the debug setting is true before outputting debug information.
-SWFUpload.prototype.debugMessage = function (message) {
-	if (this.settings.debug) {
-		var exceptionMessage, exceptionValues = [];
-
-		// Check for an exception object and print it nicely
-		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
-			for (var key in message) {
-				if (message.hasOwnProperty(key)) {
-					exceptionValues.push(key + ": " + message[key]);
-				}
-			}
-			exceptionMessage = exceptionValues.join("\n") || "";
-			exceptionValues = exceptionMessage.split("\n");
-			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
-			SWFUpload.Console.writeLine(exceptionMessage);
-		} else {
-			SWFUpload.Console.writeLine(message);
-		}
-	}
-};
-
-SWFUpload.Console = {};
-SWFUpload.Console.writeLine = function (message) {
-	var console, documentForm;
-
-	try {
-		console = document.getElementById("SWFUpload_Console");
-
-		if (!console) {
-			documentForm = document.createElement("form");
-			document.getElementsByTagName("body")[0].appendChild(documentForm);
-
-			console = document.createElement("textarea");
-			console.id = "SWFUpload_Console";
-			console.style.fontFamily = "monospace";
-			console.setAttribute("wrap", "off");
-			console.wrap = "off";
-			console.style.overflow = "auto";
-			console.style.width = "700px";
-			console.style.height = "350px";
-			console.style.margin = "5px";
-			documentForm.appendChild(console);
-		}
-
-		console.value += message + "\n";
-
-		console.scrollTop = console.scrollHeight - console.clientHeight;
-	} catch (ex) {
-		alert("Exception: " + ex.name + " Message: " + ex.message);
-	}
-};
diff -uNr a/mp-wp/wp-includes/js/thickbox/loadingAnimation.svg b/mp-wp/wp-includes/js/thickbox/loadingAnimation.svg
--- a/mp-wp/wp-includes/js/thickbox/loadingAnimation.svg 98e898a3acdf8208d6f407b5a055302f1fbae38e3654c391e0e0fd0bbc78510d4539185027baf5b384e1007c9e051f16a8058eccd9f8c0edfbf239d3737891ec
+++ b/mp-wp/wp-includes/js/thickbox/loadingAnimation.svg false
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="208px" height="13px" viewBox="0 0 208 13" enable-background="new 0 0 208 13" xml:space="preserve">  <image id="image0" width="208" height="13" x="0" y="0"
-    xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANAAAAANCAAAAAD9b79ZAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
-AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAnRSTlMA/1uRIrUAAAACYktH
-RAD7gOIIpgAAAAd0SU1FB+IBFRMJLt6LNZsAAAHqSURBVEjH3ZbBattAFEWPwxWMQAILYnAhgW6y
-yAfk4/sL7SdkkUUMDVgQQwQe0INmMaORLNmy63YVr8zxee/O6D2EF39+vXu+ysdVT4ufrUEOtA0u
-YF8JAHsfE7YRDMglznVk2nkuizaDNlv8qPZ5gUTdZrQZaJ/dBmn3kQtMjAg2dsDanpRgYlhVcrQP
-mJbzVYdZJeOs4XnMcM/y+3IpCd+WMSP7Hi+9r0bErCQ8JOucRJrkdE/PTlYlYnbXkRWHValzf57U
-eZLlg2PaeZEv5YA6dzKZqNd50De5C3oizypGZFPELRg456uOkEmfzd9kNclBOLkctixBCF+suoWN
-2zBL3AXO/+pziYNAmbBd/A3/YDjA1x1pHsfEP8RJ/yNpHq/rMz2P4cCsXr7GrXzt3ha7tcAOyN2E
-3OIBDYks9vHuFFknkrJSn9POsazxeYZnDhfa+m54rgLQPFldTw6yvnE+ferMd74B+HhLw7uXJOHf
-CsKzaiKhc3zvpNW5yIlfBp2jPJt+1jGfnAKQK7zq6YClMLy0BC+d06RFUT/ykePTwvVOrHqZdE6r
-U/ckOvUFzm6NV8gSuJvqd9E0Ll5Wq3D9rS/iyZTG2b1jXHL6qs7RZAmmnU9XFUeyeidUuSNVUqqq
-q8VX+y/3CV3tk7A6jK5NAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTAxLTIxVDE5OjA5OjQ2LTA3
-OjAwJBfY8QAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wMS0yMVQxOTowOTo0Ni0wNzowMFVKYE0A
-AAAASUVORK5CYII=" />
-</svg>
-
diff -uNr a/mp-wp/wp-includes/js/thickbox/macFFBgHack.svg b/mp-wp/wp-includes/js/thickbox/macFFBgHack.svg
--- a/mp-wp/wp-includes/js/thickbox/macFFBgHack.svg bf1f356aa2f1b1e537b340390ace3d5a638ca7c8c3dec530b4fd6f4f6374bfe191f2d3e01e83ce19b834b4e094230dff9230096d399f542b219c1cbce14d0d12
+++ b/mp-wp/wp-includes/js/thickbox/macFFBgHack.svg false
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="25px" height="25px" viewBox="0 0 25 25" enable-background="new 0 0 25 25" xml:space="preserve">  <image id="image0" width="25" height="25" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
-AAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTM5jWRgMAAAAV
-dEVYdENyZWF0aW9uIFRpbWUANy8xNi8wN1qn/wsAAAAoSURBVEiJ7c1BAQAwCAAhtH+nVVsKf0cB
-Bs+xvQ5KSkpKSkpKSkrAB1nRAPEf/J+FAAAAAElFTkSuQmCC
-" />
-</svg>
diff -uNr a/mp-wp/wp-includes/js/thickbox/tb-close.svg b/mp-wp/wp-includes/js/thickbox/tb-close.svg
--- a/mp-wp/wp-includes/js/thickbox/tb-close.svg 1840bd00a6737a652c4317ee079f85ffc3a641f98d6a84273a76bc42f33e7cff91f64cc16d39d1c49a3981ecd3edefaf233159ea6cfb31b21caf776ae51880c6
+++ b/mp-wp/wp-includes/js/thickbox/tb-close.svg false
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="15px" height="15px" viewBox="0 0 15 15" enable-background="new 0 0 15 15" xml:space="preserve">  <image id="image0" width="15" height="15" x="0" y="0"
-    xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAIAAAC0tAIdAAAACXBIWXMAAAsTAAALEwEAmpwYAAAB
-rElEQVQokXVSS24iUQy0/fy6FWbFDMusAgHOgPjloyTHmonmUlm0EBJn6AUMILgAKIiB6fZnFs2S
-lGrncpVlG1utlqoSEVyDuwOAOapqjJGLokjT9P7+/qqa0EsxZl4sFn9P/6hWqzWbTfwCZla7SaUo
-O51OjJHP54KI3a9aAwCcTqckjSISCKqBreL7+8/Hx7G7mgkzDYf9X++/KURzZGYRCfV6vdFoEJGI
-MPNgMIgxbjabXq/3+vo6nU5Xq5WqAsBut+MqTkRijHmem9nDw4OZjUajLMvyPA8hhBDKsnT3i5qI
-zOx4PK7XaxF5e3v7+PhYLpfn81lEEDFJEjO7rBkRiehwONze3r68vGRZ9vz83G63d7tdVapucvE2
-M0R8enoaj8dZls3nc0QcDoeIOJlMAEBVVfXizcyq2u/3J5PJYrHY7/d5ns9ms6rBzNI0VVW8u7vr
-drvuXiWambuHENzd3YmoLMsYY1EU2+2WOSCCIQKAuxkCIIKbAAAClM5G0YGQuCzLcFP79vl5+P6j
-AYBX6B5DUNXln7m7Y7PVFpGvfhBcmdnMiqJIkuQ/kl34yTdEikIAAAAASUVORK5CYII=
-" />
-</svg>
diff -uNr a/mp-wp/wp-includes/js/thickbox/thickbox.css b/mp-wp/wp-includes/js/thickbox/thickbox.css
--- a/mp-wp/wp-includes/js/thickbox/thickbox.css 92a01eed25150ade51a23869f9d34374e70b6e56b0445afc0cfa6b185fd84a317d2f269ccdc2923ccefb329ffb0a623fd83d1766ae1fc941c27af36f5f892978
+++ b/mp-wp/wp-includes/js/thickbox/thickbox.css false
@@ -1,161 +0,0 @@
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_window {
-	font: 12px "Lucida Grande", Verdana, Arial, sans-serif;
-	color: #333333;
-}
-
-#TB_secondLine {
-	font: 10px "Lucida Grande", Verdana, Arial, sans-serif;
-	color:#666666;
-}
-
-#TB_window a:link {color: #666666;}
-#TB_window a:visited {color: #666666;}
-#TB_window a:hover {color: #000;}
-#TB_window a:active {color: #666666;}
-#TB_window a:focus{color: #666666;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_overlay {
-	position: fixed;
-	z-index:100;
-	top: 0px;
-	left: 0px;
-	height:100%;
-	width:100%;
-}
-
-.TB_overlayMacFFBGHack {background: url(macFFBgHack.svg) repeat;}
-.TB_overlayBG {
-	background-color:#000;
-	filter:alpha(opacity=75);
-	-moz-opacity: 0.75;
-	opacity: 0.75;
-}
-
-* html #TB_overlay { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_window {
-	position: fixed;
-	background: #ffffff;
-	z-index: 102;
-	color:#000000;
-	display:none;
-	text-align:left;
-	top:50%;
-	left:50%;
-	border: 1px solid #555;
-	-moz-box-shadow: rgba(0,0,0,1) 0 4px 30px;
-	-webkit-box-shadow: rgba(0,0,0,1) 0 4px 30px;
-	-khtml-box-shadow: rgba(0,0,0,1) 0 4px 30px;
-	box-shadow: rgba(0,0,0,1) 0 4px 30px;
-}
-
-* html #TB_window { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_window img#TB_Image {
-	display:block;
-	margin: 15px 0 0 15px;
-	border-right: 1px solid #ccc;
-	border-bottom: 1px solid #ccc;
-	border-top: 1px solid #666;
-	border-left: 1px solid #666;
-}
-
-#TB_caption{
-	height:25px;
-	padding:7px 30px 10px 25px;
-	float:left;
-}
-
-#TB_closeWindow{
-	height:25px;
-	padding:11px 25px 10px 0;
-	float:right;
-}
-
-#TB_closeAjaxWindow{
-	padding:6px 10px 0;
-	text-align:right;
-	float:right;
-}
-
-#TB_ajaxWindowTitle{
-	float:left;
-	padding:6px 10px 0;
-}
-
-#TB_title{
-	background-color:#e8e8e8;
-	height:27px;
-}
-
-#TB_ajaxContent{
-	clear:both;
-	padding:2px 15px 15px 15px;
-	overflow:auto;
-	text-align:left;
-	line-height:1.4em;
-}
-
-#TB_ajaxContent.TB_modal{
-	padding:15px;
-}
-
-#TB_ajaxContent p{
-	padding:5px 0px 5px 0px;
-}
-
-#TB_load{
-	position: fixed;
-	display:none;
-	z-index:103;
-	top: 50%;
-	left: 50%;
-	background-color: #E8E8E8;
-	border: 1px solid #555;
-	margin: -45px 0pt 0pt -125px;
-	padding: 40px 15px 15px;
-}
-
-* html #TB_load { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_HideSelect{
-	z-index:99;
-	position:fixed;
-	top: 0;
-	left: 0;
-	background-color:#fff;
-	border:none;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-	height:100%;
-	width:100%;
-}
-
-* html #TB_HideSelect { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_iframeContent{
-	clear:both;
-	border:none;
-	margin-bottom:-1px;
-	_margin-bottom:1px;
-}
diff -uNr a/mp-wp/wp-includes/js/thickbox/thickbox.js b/mp-wp/wp-includes/js/thickbox/thickbox.js
--- a/mp-wp/wp-includes/js/thickbox/thickbox.js 754717592c87404f385937c7a3c9ee07521533f8819bf3c61bb760acbfb75e96fdb66b2750ef200a9788d825b59cc5509d66b63d7bc10c51dc710392e8a29357
+++ b/mp-wp/wp-includes/js/thickbox/thickbox.js false
@@ -1,320 +0,0 @@
-/*
- * Thickbox 3.1 - One Box To Rule Them All.
- * By Cody Lindley (http://www.codylindley.com)
- * Copyright (c) 2007 cody lindley
- * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
-*/
-		  
-var tb_pathToImage = "../wp-includes/js/thickbox/loadingAnimation.svg";
-var tb_closeImage = "../wp-includes/js/thickbox/tb-close.svg";
-
-/*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/
-
-//on page load call tb_init
-jQuery(document).ready(function(){   
-	tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
-	imgLoader = new Image();// preload image
-	imgLoader.src = tb_pathToImage;
-});
-
-//add thickbox to href & area elements that have a class of .thickbox
-function tb_init(domChunk){
-	jQuery(domChunk).click(function(){
-	var t = this.title || this.name || null;
-	var a = this.href || this.alt;
-	var g = this.rel || false;
-	tb_show(t,a,g);
-	this.blur();
-	return false;
-	});
-}
-
-function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link
-
-	try {
-		if (typeof document.body.style.maxHeight === "undefined") {//if IE 6
-			jQuery("body","html").css({height: "100%", width: "100%"});
-			jQuery("html").css("overflow","hidden");
-			if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
-				jQuery("body").append("<iframe id='TB_HideSelect'></iframe><div id='TB_overlay'></div><div id='TB_window'></div>");
-				jQuery("#TB_overlay").click(tb_remove);
-			}
-		}else{//all others
-			if(document.getElementById("TB_overlay") === null){
-				jQuery("body").append("<div id='TB_overlay'></div><div id='TB_window'></div>");
-				jQuery("#TB_overlay").click(tb_remove);
-			}
-		}
-		
-		if(tb_detectMacXFF()){
-			jQuery("#TB_overlay").addClass("TB_overlayMacFFBGHack");//use png overlay so hide flash
-		}else{
-			jQuery("#TB_overlay").addClass("TB_overlayBG");//use background and opacity
-		}
-		
-		if(caption===null){caption="";}
-		jQuery("body").append("<div id='TB_load'><img src='"+imgLoader.src+"' /></div>");//add loader to the page
-		jQuery('#TB_load').show();//show loader
-		
-		var baseURL;
-	   if(url.indexOf("?")!==-1){ //ff there is a query string involved
-			baseURL = url.substr(0, url.indexOf("?"));
-	   }else{ 
-	   		baseURL = url;
-	   }
-	   
-	   var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/;
-	   var urlType = baseURL.toLowerCase().match(urlString);
-
-		if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images
-				
-			TB_PrevCaption = "";
-			TB_PrevURL = "";
-			TB_PrevHTML = "";
-			TB_NextCaption = "";
-			TB_NextURL = "";
-			TB_NextHTML = "";
-			TB_imageCount = "";
-			TB_FoundURL = false;
-			if(imageGroup){
-				TB_TempArray = jQuery("a[@rel="+imageGroup+"]").get();
-				for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) {
-					var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString);
-						if (!(TB_TempArray[TB_Counter].href == url)) {						
-							if (TB_FoundURL) {
-								TB_NextCaption = TB_TempArray[TB_Counter].title;
-								TB_NextURL = TB_TempArray[TB_Counter].href;
-								TB_NextHTML = "<span id='TB_next'>&nbsp;&nbsp;<a href='#'>Next &gt;</a></span>";
-							} else {
-								TB_PrevCaption = TB_TempArray[TB_Counter].title;
-								TB_PrevURL = TB_TempArray[TB_Counter].href;
-								TB_PrevHTML = "<span id='TB_prev'>&nbsp;&nbsp;<a href='#'>&lt; Prev</a></span>";
-							}
-						} else {
-							TB_FoundURL = true;
-							TB_imageCount = "Image " + (TB_Counter + 1) +" of "+ (TB_TempArray.length);											
-						}
-				}
-			}
-
-			imgPreloader = new Image();
-			imgPreloader.onload = function(){		
-			imgPreloader.onload = null;
-				
-			// Resizing large images - orginal by Christian Montoya edited by me.
-			var pagesize = tb_getPageSize();
-			var x = pagesize[0] - 150;
-			var y = pagesize[1] - 150;
-			var imageWidth = imgPreloader.width;
-			var imageHeight = imgPreloader.height;
-			if (imageWidth > x) {
-				imageHeight = imageHeight * (x / imageWidth); 
-				imageWidth = x; 
-				if (imageHeight > y) { 
-					imageWidth = imageWidth * (y / imageHeight); 
-					imageHeight = y; 
-				}
-			} else if (imageHeight > y) { 
-				imageWidth = imageWidth * (y / imageHeight); 
-				imageHeight = y; 
-				if (imageWidth > x) { 
-					imageHeight = imageHeight * (x / imageWidth); 
-					imageWidth = x;
-				}
-			}
-			// End Resizing
-			
-			TB_WIDTH = imageWidth + 30;
-			TB_HEIGHT = imageHeight + 60;
-			jQuery("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'><img src='" + tb_closeImage + "' /></a></div>"); 		
-			
-			jQuery("#TB_closeWindowButton").click(tb_remove);
-			
-			if (!(TB_PrevHTML === "")) {
-				function goPrev(){
-					if(jQuery(document).unbind("click",goPrev)){jQuery(document).unbind("click",goPrev);}
-					jQuery("#TB_window").remove();
-					jQuery("body").append("<div id='TB_window'></div>");
-					tb_show(TB_PrevCaption, TB_PrevURL, imageGroup);
-					return false;	
-				}
-				jQuery("#TB_prev").click(goPrev);
-			}
-			
-			if (!(TB_NextHTML === "")) {		
-				function goNext(){
-					jQuery("#TB_window").remove();
-					jQuery("body").append("<div id='TB_window'></div>");
-					tb_show(TB_NextCaption, TB_NextURL, imageGroup);				
-					return false;	
-				}
-				jQuery("#TB_next").click(goNext);
-				
-			}
-
-			document.onkeydown = function(e){ 	
-				if (e == null) { // ie
-					keycode = event.keyCode;
-				} else { // mozilla
-					keycode = e.which;
-				}
-				if(keycode == 27){ // close
-					tb_remove();
-				} else if(keycode == 190){ // display previous image
-					if(!(TB_NextHTML == "")){
-						document.onkeydown = "";
-						goNext();
-					}
-				} else if(keycode == 188){ // display next image
-					if(!(TB_PrevHTML == "")){
-						document.onkeydown = "";
-						goPrev();
-					}
-				}	
-			};
-			
-			tb_position();
-			jQuery("#TB_load").remove();
-			jQuery("#TB_ImageOff").click(tb_remove);
-			jQuery("#TB_window").css({display:"block"}); //for safari using css instead of show
-			};
-			
-			imgPreloader.src = url;
-		}else{//code to show html
-			
-			var queryString = url.replace(/^[^\?]+\??/,'');
-			var params = tb_parseQuery( queryString );
-
-			TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL
-			TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL
-			ajaxContentW = TB_WIDTH - 30;
-			ajaxContentH = TB_HEIGHT - 45;
-			
-			if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window		
-					urlNoQuery = url.split('TB_');
-					jQuery("#TB_iframeContent").remove();
-					if(params['modal'] != "true"){//iframe no modal
-						jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='Close'><img src='" + tb_closeImage + "' /></a></div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' > </iframe>");
-					}else{//iframe modal
-					jQuery("#TB_overlay").unbind();
-						jQuery("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'> </iframe>");
-					}
-			}else{// not an iframe, ajax
-					if(jQuery("#TB_window").css("display") != "block"){
-						if(params['modal'] != "true"){//ajax no modal
-						jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'><img src='" + tb_closeImage + "' /></a></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
-						}else{//ajax modal
-						jQuery("#TB_overlay").unbind();
-						jQuery("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");	
-						}
-					}else{//this means the window is already up, we are just loading new content via ajax
-						jQuery("#TB_ajaxContent")[0].style.width = ajaxContentW +"px";
-						jQuery("#TB_ajaxContent")[0].style.height = ajaxContentH +"px";
-						jQuery("#TB_ajaxContent")[0].scrollTop = 0;
-						jQuery("#TB_ajaxWindowTitle").html(caption);
-					}
-			}
-					
-			jQuery("#TB_closeWindowButton").click(tb_remove);
-			
-				if(url.indexOf('TB_inline') != -1){	
-					jQuery("#TB_ajaxContent").append(jQuery('#' + params['inlineId']).children());
-					jQuery("#TB_window").unload(function () {
-						jQuery('#' + params['inlineId']).append( jQuery("#TB_ajaxContent").children() ); // move elements back when you're finished
-					});
-					tb_position();
-					jQuery("#TB_load").remove();
-					jQuery("#TB_window").css({display:"block"}); 
-				}else if(url.indexOf('TB_iframe') != -1){
-					tb_position();
-					if($.browser.safari){//safari needs help because it will not fire iframe onload
-						jQuery("#TB_load").remove();
-						jQuery("#TB_window").css({display:"block"});
-					}
-				}else{
-					jQuery("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method
-						tb_position();
-						jQuery("#TB_load").remove();
-						tb_init("#TB_ajaxContent a.thickbox");
-						jQuery("#TB_window").css({display:"block"});
-					});
-				}
-			
-		}
-
-		if(!params['modal']){
-			document.onkeyup = function(e){ 	
-				if (e == null) { // ie
-					keycode = event.keyCode;
-				} else { // mozilla
-					keycode = e.which;
-				}
-				if(keycode == 27){ // close
-					tb_remove();
-				}	
-			};
-		}
-		
-	} catch(e) {
-		//nothing here
-	}
-}
-
-//helper functions below
-function tb_showIframe(){
-	jQuery("#TB_load").remove();
-	jQuery("#TB_window").css({display:"block"});
-}
-
-function tb_remove() {
- 	jQuery("#TB_imageOff").unbind("click");
-	jQuery("#TB_closeWindowButton").unbind("click");
-	jQuery("#TB_window").fadeOut("fast",function(){jQuery('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();});
-	jQuery("#TB_load").remove();
-	if (typeof document.body.style.maxHeight == "undefined") {//if IE 6
-		jQuery("body","html").css({height: "auto", width: "auto"});
-		jQuery("html").css("overflow","");
-	}
-	document.onkeydown = "";
-	document.onkeyup = "";
-	return false;
-}
-
-function tb_position() {
-jQuery("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'});
-	if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) { // take away IE6
-		jQuery("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'});
-	}
-}
-
-function tb_parseQuery ( query ) {
-   var Params = {};
-   if ( ! query ) {return Params;}// return empty object
-   var Pairs = query.split(/[;&]/);
-   for ( var i = 0; i < Pairs.length; i++ ) {
-      var KeyVal = Pairs[i].split('=');
-      if ( ! KeyVal || KeyVal.length != 2 ) {continue;}
-      var key = unescape( KeyVal[0] );
-      var val = unescape( KeyVal[1] );
-      val = val.replace(/\+/g, ' ');
-      Params[key] = val;
-   }
-   return Params;
-}
-
-function tb_getPageSize(){
-	var de = document.documentElement;
-	var w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth;
-	var h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight;
-	arrayPageSize = [w,h];
-	return arrayPageSize;
-}
-
-function tb_detectMacXFF() {
-  var userAgent = navigator.userAgent.toLowerCase();
-  if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox')!=-1) {
-    return true;
-  }
-}
-
-
diff -uNr a/mp-wp/wp-includes/js/tw-sack.js b/mp-wp/wp-includes/js/tw-sack.js
--- a/mp-wp/wp-includes/js/tw-sack.js 9117a060918d0c15ccf22ead20623eb72b734770ff5117591a4842d1714e0faeef2a0e1abbef66a493a1fe1a6b8322ae1ed06d406002e8d2c62de6a5fb96fbce
+++ b/mp-wp/wp-includes/js/tw-sack.js false
@@ -1,192 +0,0 @@
-/* Simple AJAX Code-Kit (SACK) v1.6.1 */
-/* www.twilightuniverse.com */
-/* Software licenced under a modified X11 licence,
-   see documentation or authors website for more details */
-
-function sack(file) {
-	this.xmlhttp = null;
-
-	this.resetData = function() {
-		this.method = "POST";
-  		this.queryStringSeparator = "?";
-		this.argumentSeparator = "&";
-		this.URLString = "";
-		this.encodeURIString = true;
-  		this.execute = false;
-  		this.element = null;
-		this.elementObj = null;
-		this.requestFile = file;
-		this.vars = new Object();
-		this.responseStatus = new Array(2);
-  	};
-
-	this.resetFunctions = function() {
-  		this.onLoading = function() { };
-  		this.onLoaded = function() { };
-  		this.onInteractive = function() { };
-  		this.onCompletion = function() { };
-  		this.onError = function() { };
-		this.onFail = function() { };
-	};
-
-	this.reset = function() {
-		this.resetFunctions();
-		this.resetData();
-	};
-
-	this.createAJAX = function() {
-		try {
-			this.xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-		} catch (e1) {
-			try {
-				this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-			} catch (e2) {
-				this.xmlhttp = null;
-			}
-		}
-
-		if (! this.xmlhttp) {
-			if (typeof XMLHttpRequest != "undefined") {
-				this.xmlhttp = new XMLHttpRequest();
-			} else {
-				this.failed = true;
-			}
-		}
-	};
-
-	this.setVar = function(name, value){
-		this.vars[name] = Array(value, false);
-	};
-
-	this.encVar = function(name, value, returnvars) {
-		if (true == returnvars) {
-			return Array(encodeURIComponent(name), encodeURIComponent(value));
-		} else {
-			this.vars[encodeURIComponent(name)] = Array(encodeURIComponent(value), true);
-		}
-	}
-
-	this.processURLString = function(string, encode) {
-		encoded = encodeURIComponent(this.argumentSeparator);
-		regexp = new RegExp(this.argumentSeparator + "|" + encoded);
-		varArray = string.split(regexp);
-		for (i = 0; i < varArray.length; i++){
-			urlVars = varArray[i].split("=");
-			if (true == encode){
-				this.encVar(urlVars[0], urlVars[1]);
-			} else {
-				this.setVar(urlVars[0], urlVars[1]);
-			}
-		}
-	}
-
-	this.createURLString = function(urlstring) {
-		if (this.encodeURIString && this.URLString.length) {
-			this.processURLString(this.URLString, true);
-		}
-
-		if (urlstring) {
-			if (this.URLString.length) {
-				this.URLString += this.argumentSeparator + urlstring;
-			} else {
-				this.URLString = urlstring;
-			}
-		}
-
-		// prevents caching of URLString
-		this.setVar("rndval", new Date().getTime());
-
-		urlstringtemp = new Array();
-		for (key in this.vars) {
-			if (false == this.vars[key][1] && true == this.encodeURIString) {
-				encoded = this.encVar(key, this.vars[key][0], true);
-				delete this.vars[key];
-				this.vars[encoded[0]] = Array(encoded[1], true);
-				key = encoded[0];
-			}
-
-			urlstringtemp[urlstringtemp.length] = key + "=" + this.vars[key][0];
-		}
-		if (urlstring){
-			this.URLString += this.argumentSeparator + urlstringtemp.join(this.argumentSeparator);
-		} else {
-			this.URLString += urlstringtemp.join(this.argumentSeparator);
-		}
-	}
-
-	this.runResponse = function() {
-		eval(this.response);
-	}
-
-	this.runAJAX = function(urlstring) {
-		if (this.failed) {
-			this.onFail();
-		} else {
-			this.createURLString(urlstring);
-			if (this.element) {
-				this.elementObj = document.getElementById(this.element);
-			}
-			if (this.xmlhttp) {
-				var self = this;
-				if (this.method == "GET") {
-					totalurlstring = this.requestFile + this.queryStringSeparator + this.URLString;
-					this.xmlhttp.open(this.method, totalurlstring, true);
-				} else {
-					this.xmlhttp.open(this.method, this.requestFile, true);
-					try {
-						this.xmlhttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
-					} catch (e) { }
-				}
-
-				this.xmlhttp.onreadystatechange = function() {
-					switch (self.xmlhttp.readyState) {
-						case 1:
-							self.onLoading();
-							break;
-						case 2:
-							self.onLoaded();
-							break;
-						case 3:
-							self.onInteractive();
-							break;
-						case 4:
-							self.response = self.xmlhttp.responseText;
-							self.responseXML = self.xmlhttp.responseXML;
-							self.responseStatus[0] = self.xmlhttp.status;
-							self.responseStatus[1] = self.xmlhttp.statusText;
-
-							if (self.execute) {
-								self.runResponse();
-							}
-
-							if (self.elementObj) {
-								elemNodeName = self.elementObj.nodeName;
-								elemNodeName.toLowerCase();
-								if (elemNodeName == "input"
-								|| elemNodeName == "select"
-								|| elemNodeName == "option"
-								|| elemNodeName == "textarea") {
-									self.elementObj.value = self.response;
-								} else {
-									self.elementObj.innerHTML = self.response;
-								}
-							}
-							if (self.responseStatus[0] == "200") {
-								self.onCompletion();
-							} else {
-								self.onError();
-							}
-
-							self.URLString = "";
-							break;
-					}
-				};
-
-				this.xmlhttp.send(this.URLString);
-			}
-		}
-	};
-
-	this.reset();
-	this.createAJAX();
-}
diff -uNr a/mp-wp/wp-includes/js/wp-ajax-response.js b/mp-wp/wp-includes/js/wp-ajax-response.js
--- a/mp-wp/wp-includes/js/wp-ajax-response.js a4af82d8bd6e716e5180b9164e6d688fa382a5722e0a1298fb1e081f305a447a70a3119e645e7e2f578d511a743f7b46a9352913fe4f0f5524a4588a2e98a85a
+++ b/mp-wp/wp-includes/js/wp-ajax-response.js false
@@ -1,60 +0,0 @@
-wpAjax = jQuery.extend( {
-	unserialize: function( s ) {
-		var r = {}; if ( !s ) { return r; }
-		var q = s.split('?'); if ( q[1] ) { s = q[1]; }
-		var pp = s.split('&');
-		for ( var i in pp ) {
-			if ( jQuery.isFunction(pp.hasOwnProperty) && !pp.hasOwnProperty(i) ) { continue; }
-			var p = pp[i].split('=');
-			r[p[0]] = p[1];
-		}
-		return r;
-	},
-	parseAjaxResponse: function( x, r, e ) { // 1 = good, 0 = strange (bad data?), -1 = you lack permission
-		var parsed = {};
-		var re = jQuery('#' + r).html('');
-		if ( x && typeof x == 'object' && x.getElementsByTagName('wp_ajax') ) {
-			parsed.responses = [];
-			parsed.errors = false;
-			var err = '';
-			jQuery('response', x).each( function() {
-				var th = jQuery(this);
-				var child = jQuery(this.firstChild);
-				var response = { action: th.attr('action'), what: child.get(0).nodeName, id: child.attr('id'), oldId: child.attr('old_id'), position: child.attr('position') };
-				response.data = jQuery( 'response_data', child ).text();
-				response.supplemental = {};
-				if ( !jQuery( 'supplemental', child ).children().each( function() {
-					response.supplemental[this.nodeName] = jQuery(this).text();
-				} ).size() ) { response.supplemental = false }
-				response.errors = [];
-				if ( !jQuery('wp_error', child).each( function() {
-					var code = jQuery(this).attr('code');
-					var anError = { code: code, message: this.firstChild.nodeValue, data: false };
-					var errorData = jQuery('wp_error_data[code="' + code + '"]', x);
-					if ( errorData ) { anError.data = errorData.get(); }
-					var formField = jQuery( 'form-field', errorData ).text();
-					if ( formField ) { code = formField; }
-					if ( e ) { wpAjax.invalidateForm( jQuery('#' + e + ' :input[name="' + code + '"]' ).parents('.form-field:first') ); }
-					err += '<p>' + anError.message + '</p>';
-					response.errors.push( anError );
-					parsed.errors = true;
-				} ).size() ) { response.errors = false; }
-				parsed.responses.push( response );
-			} );
-			if ( err.length ) { re.html( '<div class="error">' + err + '</div>' ); }
-			return parsed;
-		}
-		if ( isNaN(x) ) { return !re.html('<div class="error"><p>' + x + '</p></div>'); }
-		x = parseInt(x,10);
-		if ( -1 == x ) { return !re.html('<div class="error"><p>' + wpAjax.noPerm + '</p></div>'); }
-		else if ( 0 === x ) { return !re.html('<div class="error"><p>' + wpAjax.broken  + '</p></div>'); }
-		return true;
-	},
-	invalidateForm: function ( selector ) {
-		return jQuery( selector ).addClass( 'form-invalid' ).change( function() { jQuery(this).removeClass( 'form-invalid' ); } );
-	},
-	validateForm: function( selector ) {
-		selector = jQuery( selector );
-		return !wpAjax.invalidateForm( selector.find('.form-required').andSelf().filter('.form-required:has(:input[value=""]), .form-required:input[value=""]') ).size();
-	}
-}, wpAjax || { noPerm: 'You do not have permission to do that.', broken: 'An unidentified error has occurred.' } );
diff -uNr a/mp-wp/wp-includes/js/wp-lists.js b/mp-wp/wp-includes/js/wp-lists.js
--- a/mp-wp/wp-includes/js/wp-lists.js b6d2c77e8ac7c340e71a84d1f859d81ed20fba8770e195c959d8f9bb7791db5b7d711c853607afd41d06f0e93ad787bac9c473cb028acd2347a2b9bee074db9e
+++ b/mp-wp/wp-includes/js/wp-lists.js false
@@ -1,374 +0,0 @@
-(function($) {
-var currentFormEl = false;
-var fs = {add:'ajaxAdd',del:'ajaxDel',dim:'ajaxDim',process:'process',recolor:'recolor'};
-
-var wpList = {
-	settings: {
-		url: wpListL10n.url, type: 'POST',
-		response: 'ajax-response',
-
-		what: '',
-		alt: 'alternate', altOffset: 0,
-		addColor: null, delColor: null, dimAddColor: null, dimDelColor: null,
-
-		confirm: null,
-		addBefore: null, addAfter: null,
-		delBefore: null, delAfter: null,
-		dimBefore: null, dimAfter: null
-	},
-
-	nonce: function(e,s) {
-		var url = wpAjax.unserialize(e.attr('href'));
-		return s.nonce || url._ajax_nonce || $('#' + s.element + ' input[name=_ajax_nonce]').val() || url._wpnonce || $('#' + s.element + ' input[name=_wpnonce]').val() || 0;
-	},
-
-	parseClass: function(e,t) {
-		var c = [], cl;
-		try {
-			cl = $(e).attr('class') || '';
-			cl = cl.match(new RegExp(t+':[\\S]+'));
-			if ( cl ) { c = cl[0].split(':'); }
-		} catch(r) {}
-		return c;
-	},
-
-	pre: function(e,s,a) {
-		var bg; var r;
-		s = $.extend( {}, this.wpList.settings, {
-			element: null,
-			nonce: 0,
-			target: e.get(0)
-		}, s || {} );
-		if ( $.isFunction( s.confirm ) ) {
-			if ( 'add' != a ) {
-				bg = $('#' + s.element).css('backgroundColor');
-				$('#' + s.element).css('backgroundColor', '#FF9966');
-			}
-			r = s.confirm.call(this,e,s,a,bg);
-			if ( 'add' != a ) { $('#' + s.element).css('backgroundColor', bg ); }
-			if ( !r ) { return false; }
-		}
-		return s;
-	},
-
-	ajaxAdd: function( e, s ) {
-		var list = this; e = $(e); s = s || {};
-		var cls = wpList.parseClass(e,'add');
-		s = wpList.pre.call( list, e, s, 'add' );
-
-		s.element = cls[2] || e.attr( 'id' ) || s.element || null;
-		if ( cls[3] ) { s.addColor = '#' + cls[3]; }
-		else { s.addColor = s.addColor || '#FFFF33'; }
-
-		if ( !s ) { return false; }
-
-		if ( !e.is("[class^=add:" + list.id + ":]") ) { return !wpList.add.call( list, e, s ); }
-
-		if ( !s.element ) { return true; }
-
-		s.action = 'add-' + s.what;
-
-		s.nonce = wpList.nonce(e,s);
-
-		var es = $('#' + s.element + ' :input').not('[name=_ajax_nonce], [name=_wpnonce], [name=action]');
-		var valid = wpAjax.validateForm( '#' + s.element );
-		if ( !valid ) { return false; }
-
-		s.data = $.param( $.extend( { _ajax_nonce: s.nonce, action: s.action }, wpAjax.unserialize( cls[4] || '' ) ) );
-		var formData = $.isFunction(es.fieldSerialize) ? es.fieldSerialize() : es.serialize();
-		if ( formData ) { s.data += '&' + formData; }
-
-		if ( $.isFunction(s.addBefore) ) {
-			s = s.addBefore( s );
-			if ( !s ) { return true; }
-		}
-		if ( !s.data.match(/_ajax_nonce=[a-f0-9]+/) ) { return true; }
-
-		s.success = function(r) {
-			var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
-			if ( !res || res.errors ) { return false; }
-
-			if ( true === res ) { return true; }
-
-			jQuery.each( res.responses, function() {
-				wpList.add.call( list, this.data, $.extend( {}, s, { // this.firstChild.nodevalue
-					pos: this.position || 0,
-					id: this.id || 0,
-					oldId: this.oldId || null
-				} ) );
-			} );
-
-			if ( $.isFunction(s.addAfter) ) {
-				var o = this.complete;
-				this.complete = function(x,st) {
-					var _s = $.extend( { xml: x, status: st, parsed: res }, s );
-					s.addAfter( r, _s );
-					if ( $.isFunction(o) ) { o(x,st); }
-				};
-			}
-			list.wpList.recolor();
-			wpList.clear.call(list,'#' + s.element);
-		};
-
-		$.ajax( s );
-		return false;
-	},
-
-	ajaxDel: function( e, s ) {
-		var list = this; e = $(e); s = s || {};
-		var cls = wpList.parseClass(e,'delete');
-		s = wpList.pre.call( list, e, s, 'delete' );
-
-		s.element = cls[2] || s.element || null;
-		if ( cls[3] ) { s.delColor = '#' + cls[3]; }
-		else { s.delColor = s.delColor || '#FF3333'; }
-
-		if ( !s || !s.element ) { return false; }
-
-		s.action = 'delete-' + s.what;
-
-		s.nonce = wpList.nonce(e,s);
-
-		s.data = $.extend(
-			{ action: s.action, id: s.element.split('-').pop(), _ajax_nonce: s.nonce },
-			wpAjax.unserialize( cls[4] || '' )
-		);
-
-		if ( $.isFunction(s.delBefore) ) {
-			s = s.delBefore( s );
-			if ( !s ) { return true; }
-		}
-		if ( !s.data._ajax_nonce ) { return true; }
-
-		var element = $('#' + s.element);
-
-		if ( 'none' != s.delColor ) {
-			var anim = 'slideUp';
-			if ( element.css( 'display' ).match(/table/) )
-				anim = 'fadeOut'; // Can't slideup table rows and other table elements.  Known jQuery bug
-			element
-				.animate( { backgroundColor: s.delColor }, 'fast'  )[anim]( 'fast' )
-				.queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
-		} else {
-			list.wpList.recolor();
-		}
-
-		s.success = function(r) {
-			var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
-			if ( !res || res.errors ) {
-				element.stop().stop().css( 'backgroundColor', '#FF3333' ).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
-				return false;
-			}
-			if ( $.isFunction(s.delAfter) ) {
-				var o = this.complete;
-				this.complete = function(x,st) {
-					element.queue( function() {
-						var _s = $.extend( { xml: x, status: st, parsed: res }, s );
-						s.delAfter( r, _s );
-						if ( $.isFunction(o) ) { o(x,st); }
-					} ).dequeue();
-				};
-			}
-		};
-		$.ajax( s );
-		return false;
-	},
-
-	ajaxDim: function( e, s ) {
-		if ( $(e).parent().css('display') == 'none' ) // Prevent hidden links from being clicked by hotkeys
-			return false;
-		var list = this; e = $(e); s = s || {};
-		var cls = wpList.parseClass(e,'dim');
-		s = wpList.pre.call( list, e, s, 'dim' );
-
-		s.element = cls[2] || s.element || null;
-		s.dimClass =  cls[3] || s.dimClass || null;
-		if ( cls[4] ) { s.dimAddColor = '#' + cls[4]; }
-		else { s.dimAddColor = s.dimAddColor || '#FFFF33'; }
-		if ( cls[5] ) { s.dimDelColor = '#' + cls[5]; }
-		else { s.dimDelColor = s.dimDelColor || '#FF3333'; }
-
-		if ( !s || !s.element || !s.dimClass ) { return true; }
-
-		s.action = 'dim-' + s.what;
-
-		s.nonce = wpList.nonce(e,s);
-
-		s.data = $.extend(
-			{ action: s.action, id: s.element.split('-').pop(), dimClass: s.dimClass, _ajax_nonce : s.nonce },
-			wpAjax.unserialize( cls[6] || '' )
-		);
-
-		if ( $.isFunction(s.dimBefore) ) {
-			s = s.dimBefore( s );
-			if ( !s ) { return true; }
-		}
-
-		var element = $('#' + s.element);
-		var isClass = element.toggleClass(s.dimClass).is('.' + s.dimClass);
-		var color = wpList.getColor( element );
-		element.toggleClass( s.dimClass )
-		var dimColor = isClass ? s.dimAddColor : s.dimDelColor;
-		if ( 'none' != dimColor ) {
-			element
-				.animate( { backgroundColor: dimColor }, 'fast' )
-				.queue( function() { element.toggleClass(s.dimClass); $(this).dequeue(); } )
-				.animate( { backgroundColor: color }, { complete: function() { $(this).css( 'backgroundColor', '' ); } } );
-		}
-
-		if ( !s.data._ajax_nonce ) { return true; }
-
-		s.success = function(r) {
-			var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
-			if ( !res || res.errors ) {
-				element.stop().stop().css( 'backgroundColor', '#FF3333' )[isClass?'removeClass':'addClass'](s.dimClass).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
-				return false;
-			}
-			if ( $.isFunction(s.dimAfter) ) {
-				var o = this.complete;
-				this.complete = function(x,st) {
-					element.queue( function() {
-						var _s = $.extend( { xml: x, status: st, parsed: res }, s );
-						s.dimAfter( r, _s );
-						if ( $.isFunction(o) ) { o(x,st); }
-					} ).dequeue();
-				};
-			}
-		};
-
-		$.ajax( s );
-		return false;
-	},
-
-	// From jquery.color.js: jQuery Color Animation by John Resig
-	getColor: function( el ) {
-		if ( el.constructor == Object )
-			el = el.get(0);
-		var elem = el, color, rgbaTrans = new RegExp( "rgba\\(\\s*0,\\s*0,\\s*0,\\s*0\\s*\\)", "i" );
-		do {
-			color = jQuery.curCSS(elem, 'backgroundColor');
-			if ( color != '' && color != 'transparent' && !color.match(rgbaTrans) || jQuery.nodeName(elem, "body") )
-				break;
-		} while ( elem = elem.parentNode );
-		return color || '#ffffff';
-	},
-
-	add: function( e, s ) {
-		var list = $(this);
-		e = $(e);
-
-		var old = false;
-		var _s = { pos: 0, id: 0, oldId: null };
-		if ( 'string' == typeof s ) { s = { what: s }; }
-		s = $.extend(_s, this.wpList.settings, s);
-		if ( !e.size() || !s.what ) { return false; }
-		if ( s.oldId ) { old = $('#' + s.what + '-' + s.oldId); }
-		if ( s.id && ( s.id != s.oldId || !old || !old.size() ) ) { $('#' + s.what + '-' + s.id).remove(); }
-
-		if ( old && old.size() ) {
-			old.replaceWith(e);
-		} else if ( isNaN(s.pos) ) {
-			var ba = 'after';
-			if ( '-' == s.pos.substr(0,1) ) {
-				s.pos = s.pos.substr(1);
-				ba = 'before';
-			}
-			var ref = list.find( '#' + s.pos );
-			if ( 1 === ref.size() ) { ref[ba](e); }
-			else { list.append(e); }
-		} else if ( s.pos < 0 ) {
-			list.prepend(e);
-		} else {
-			list.append(e);
-		}
-
-		if ( s.alt ) {
-			if ( ( list.children(':visible').index( e[0] ) + s.altOffset ) % 2 ) { e.removeClass( s.alt ); }
-			else { e.addClass( s.alt ); }
-		}
-
-		if ( 'none' != s.addColor ) {
-			var color = wpList.getColor( e );
-			e.css( 'backgroundColor', s.addColor ).animate( { backgroundColor: color }, { complete: function() { $(this).css( 'backgroundColor', '' ); } } );
-		}
-		list.each( function() { this.wpList.process( e ); } );
-		return e;
-	},
-
-	clear: function(e) {
-		var list = this;
-		e = $(e);
-		if ( list.wpList && e.parents( '#' + list.id ).size() ) { return; }
-		e.find(':input').each( function() {
-			if ( $(this).parents('.form-no-clear').size() )
-				return;
-			var t = this.type.toLowerCase(); var tag = this.tagName.toLowerCase();
-			if ( 'text' == t || 'password' == t || 'textarea' == tag ) { this.value = ''; }
-			else if ( 'checkbox' == t || 'radio' == t ) { this.checked = false; }
-			else if ( 'select' == tag ) { this.selectedIndex = null; }
-		});
-	},
-
-	process: function(el) {
-		var list = this;
-		$("[class^=add:" + list.id + ":]", el || null)
-			.filter('form').submit( function() { return list.wpList.add(this); } ).end()
-			.not('form').click( function() { return list.wpList.add(this); } ).each( function() {
-				var addEl = this;
-				var c = wpList.parseClass(this,'add')[2] || addEl.id;
-				if ( !c ) { return; }
-				var forms = []; var ins = []; // this is all really inefficient
-				$('#' + c + ' :input').focus( function() { currentFormEl = this; } ).blur( function() { currentFormEl = false; } ).each( function() {
-					ins.push(this);
-					var f = $(this).parents('form:first').get(0);
-					if ( $.inArray(f,forms) < 0 ) { forms.push(f); }
-				} );
-				$(forms).submit( function() {
-					if ( 0 <= $.inArray(currentFormEl,ins) ) {
-						$(addEl).trigger( 'click' );
-						$(currentFormEl).focus();
-						return false;
-					}
-				} );
-			} );
-		$("[class^=delete:" + list.id + ":]", el || null).click( function() { return list.wpList.del(this); } );
-		$("[class^=dim:" + list.id + ":]", el || null).click( function() { return list.wpList.dim(this); } );
-	},
-
-	recolor: function() {
-		var list = this;
-		if ( !list.wpList.settings.alt ) { return; }
-		var items = $('.list-item:visible', list);
-		if ( !items.size() ) { items = $(list).children(':visible'); }
-		var eo = [':even',':odd'];
-		if ( list.wpList.settings.altOffset % 2 ) { eo.reverse(); }
-		items.filter(eo[0]).addClass(list.wpList.settings.alt).end().filter(eo[1]).removeClass(list.wpList.settings.alt);
-	},
-
-	init: function() {
-		var lists = this;
-		lists.wpList.process = function(a) {
-			lists.each( function() {
-				this.wpList.process(a);
-			} );
-		};
-		lists.wpList.recolor = function() {
-			lists.each( function() {
-				this.wpList.recolor();
-			} );
-		};
-	}
-};
-
-$.fn.wpList = function( settings ) {
-	this.each( function() {
-		var _this = this;
-		this.wpList = { settings: $.extend( {}, wpList.settings, { what: wpList.parseClass(this,'list')[1] || '' }, settings ) };
-		$.each( fs, function(i,f) { _this.wpList[i] = function( e, s ) { return wpList[f].call( _this, e, s ); }; } );
-	} );
-	wpList.init.call(this);
-	this.wpList.process();
-	return this;
-};
-
-})(jQuery);
diff -uNr a/mp-wp/wp-includes/post.php b/mp-wp/wp-includes/post.php
--- a/mp-wp/wp-includes/post.php 33dab904b28c92d0f01d1334f6e5c63fa61e39b97a29247e2b5a4cf28ee08c51da8623f93ad54bae74bceb19645cdfb148ce09a7f688d1787810ba53a6c810f9
+++ b/mp-wp/wp-includes/post.php 5329128019887ce2f16f29e86179f1caf8b32b71e4c551784e2c696065dce76e952407465848dec82c0ab7097d370dbdf6d37faa3ad83f4da4edb5e59d40c6d7
@@ -1484,8 +1484,12 @@
 		$where = array( 'ID' => $post_ID );
 	}
 
-	if ( empty($post_name) && !in_array( $post_status, array( 'draft', 'pending' ) ) ) {
-		$post_name = sanitize_title($post_title, $post_ID);
+	if ( !in_array($post_status, array('draft', 'pending')) ) {
+		if ( empty($post_name) ) {
+			$post_name = sanitize_title($post_title, $post_ID);
+		} else {
+			$post_name = sanitize_title($post_name, $post_ID);
+		}
 		$wpdb->update( $wpdb->posts, compact( 'post_name' ), $where );
 	}
 
diff -uNr a/mp-wp/wp-includes/query.php b/mp-wp/wp-includes/query.php
--- a/mp-wp/wp-includes/query.php 5fffd9a4edb5c0ff99f2202e253cdade9e59486dd577bf2d951485d53c7d91246e38e3003f586ab6946d970f90616daea8196e77ca6cb9aff7538d6665786b0f
+++ b/mp-wp/wp-includes/query.php 200f692f958f13872a3ad227fe472e77a08328ae8c9714bd626fa830aa0862d4f406626bcff3ff7eabb827967e6f4bd6db69a3d899c17dacd5c418bb4aef5c55
@@ -1602,6 +1602,9 @@
 			$q['showposts'] = (int) $q['showposts'];
 			$q['posts_per_page'] = $q['showposts'];
 		}
+		if ( get_option('posts_per_archive_page') && ($this->is_archive) ) {
+			$q['posts_per_page'] = get_option('posts_per_archive_page');
+		}
 		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
 			$q['posts_per_page'] = $q['posts_per_archive_page'];
 		if ( !isset($q['nopaging']) ) {
diff -uNr a/mp-wp/wp-includes/script-loader.php b/mp-wp/wp-includes/script-loader.php
--- a/mp-wp/wp-includes/script-loader.php 7ebc84453be6f3e9ed61ae71ebd5e33c48f3e17eb29a3905ca8542b28b380415c45307ba1cd76ecfcb3f48bacb6c0826834c03b46e110a2c0158acd549bb9e23
+++ b/mp-wp/wp-includes/script-loader.php 9ef4447fc6dc27266918ae9001daacbb59d804d6ea101ec8f98d91dc883562f2ecf9711b52d86319846316e68f709595a7ba4d1e8cddf161602df44bdca6813d
@@ -13,12 +13,6 @@
 /** BackPress: WordPress Dependencies Class */
 require( ABSPATH . WPINC . '/class.wp-dependencies.php' );
 
-/** BackPress: WordPress Scripts Class */
-require( ABSPATH . WPINC . '/class.wp-scripts.php' );
-
-/** BackPress: WordPress Scripts Functions */
-require( ABSPATH . WPINC . '/functions.wp-scripts.php' );
-
 /** BackPress: WordPress Styles Class */
 require( ABSPATH . WPINC . '/class.wp-styles.php' );
 
@@ -26,257 +20,6 @@
 require( ABSPATH . WPINC . '/functions.wp-styles.php' );
 
 /**
- * Setup WordPress scripts to load by default for Administration Panels.
- *
- * Localizes a few of the scripts.
- *
- * @since 2.6.0
- *
- * @param object $scripts WP_Scripts object.
- */
-function wp_default_scripts( &$scripts ) {
-	if (!$guessurl = site_url())
-		$guessurl = wp_guess_url();
-
-	$scripts->base_url = $guessurl;
-	$scripts->default_version = get_bloginfo( 'version' );
-
-	$scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'hoverIntent'), '20081210' );
-	$scripts->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );
-
-	$scripts->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '20081210' );
-	$scripts->localize( 'quicktags', 'quicktagsL10n', array(
-		'quickLinks' => __('(Quick Links)'),
-		'wordLookup' => __('Enter a word to look up:'),
-		'dictionaryLookup' => attribute_escape(__('Dictionary lookup')),
-		'lookup' => attribute_escape(__('lookup')),
-		'closeAllOpenTags' => attribute_escape(__('Close all open tags')),
-		'closeTags' => attribute_escape(__('close tags')),
-		'enterURL' => __('Enter the URL'),
-		'enterImageURL' => __('Enter the URL of the image'),
-		'enterImageDescription' => __('Enter a description of the image'),
-		'l10n_print_after' => 'try{convertEntities(quicktagsL10n);}catch(e){};'
-	) );
-
-	$scripts->add( 'colorpicker', '/wp-includes/js/colorpicker.js', array('prototype'), '3517' );
-
-	$scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');
-
-	$scripts->add( 'wp-ajax-response', '/wp-includes/js/wp-ajax-response.js', array('jquery'), '20081210' );
-	$scripts->localize( 'wp-ajax-response', 'wpAjax', array(
-		'noPerm' => __('You do not have permission to do that.'),
-		'broken' => __('An unidentified error has occurred.'),
-		'l10n_print_after' => 'try{convertEntities(wpAjax);}catch(e){};'
-	) );
-
-	$scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20081210' );
-
-	$scripts->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('wp-ajax-response'), '20081210' );
-	$scripts->localize( 'wp-lists', 'wpListL10n', array(
-		'url' => admin_url('admin-ajax.php')
-	) );
-
-	$scripts->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.8.0');
-	$scripts->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.8.0');
-	$scripts->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.8.0');
-	$scripts->add( 'scriptaculous-effects', '/wp-includes/js/scriptaculous/effects.js', array('scriptaculous-root'), '1.8.0');
-	$scripts->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.8.0');
-	$scripts->add( 'scriptaculous-sound', '/wp-includes/js/scriptaculous/sound.js', array( 'scriptaculous-root' ), '1.8.0' );
-	$scripts->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.8.0');
-	$scripts->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.8.0');
-
-	$scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118');
-
-	$scripts->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.2.6');
-	$scripts->add( 'jquery-form', '/wp-includes/js/jquery/jquery.form.js', array('jquery'), '2.02');
-	$scripts->add( 'jquery-color', '/wp-includes/js/jquery/jquery.color.js', array('jquery'), '2.0-4561');
-	$scripts->add( 'interface', '/wp-includes/js/jquery/interface.js', array('jquery'), '1.2' );
-	$scripts->add( 'suggest', '/wp-includes/js/jquery/suggest.js', array('jquery'), '1.1b');
-	$scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20');
-	$scripts->add( 'jquery-hotkeys', '/wp-includes/js/jquery/jquery.hotkeys.js', array('jquery'), '0.0.2' );
-	$scripts->add( 'jquery-table-hotkeys', '/wp-includes/js/jquery/jquery.table-hotkeys.js', array('jquery', 'jquery-hotkeys'), '20081128' );
-	$scripts->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array('jquery'), '3.1-20080430');
-	$scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.2.0-20081031');
-	$scripts->add( 'swfupload-degrade', '/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js', array('swfupload'), '2.2.0-20081031');
-	$scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload'), '2.2.0-20081031');
-	$scripts->localize( 'swfupload-degrade', 'uploadDegradeOptions', array(
-		'is_lighttpd_before_150' => is_lighttpd_before_150(),
-	) );
-	$scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.2.0-20081031');
-	$scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.2.0-20081201');
-	// these error messages came from the sample swfupload js, they might need changing.
-	$scripts->localize( 'swfupload-handlers', 'swfuploadL10n', array(
-			'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
-			'file_exceeds_size_limit' => sprintf(__('This file is too big. Your php.ini upload_max_filesize is %s.'), @ini_get('upload_max_filesize')),
-			'zero_byte_file' => __('This file is empty. Please try another.'),
-			'invalid_filetype' => __('This file type is not allowed. Please try another.'),
-			'default_error' => __('An error occurred in the upload. Please try again later.'),
-			'missing_upload_url' => __('There was a configuration error. Please contact the server administrator.'),
-			'upload_limit_exceeded' => __('You may only upload 1 file.'),
-			'http_error' => __('HTTP error.'),
-			'upload_failed' => __('Upload failed.'),
-			'io_error' => __('IO error.'),
-			'security_error' => __('Security error.'),
-			'file_cancelled' => __('File cancelled.'),
-			'upload_stopped' => __('Upload stopped.'),
-			'dismiss' => __('Dismiss'),
-			'crunching' => __('Crunching&hellip;'),
-			'deleted' => __('Deleted'),
-			'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};'
-	) );
-
-	$scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui.core.js', array('jquery'), '1.5.2' );
-	$scripts->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui.tabs.js', array('jquery-ui-core'), '1.5.2' );
-	$scripts->add( 'jquery-ui-sortable', '/wp-includes/js/jquery/ui.sortable.js', array('jquery-ui-core'), '1.5.2c' );
-	$scripts->add( 'jquery-ui-draggable', '/wp-includes/js/jquery/ui.draggable.js', array('jquery-ui-core'), '1.5.2' );
-	$scripts->add( 'jquery-ui-resizable', '/wp-includes/js/jquery/ui.resizable.js', array('jquery-ui-core'), '1.5.2' );
-	$scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui.dialog.js', array('jquery-ui-resizable', 'jquery-ui-draggable'), '1.5.2' );
-
-	$scripts->add( 'comment-reply', '/wp-includes/js/comment-reply.js', false, '20081210');
-
-	if ( is_admin() ) {
-		$scripts->add( 'ajaxcat', '/wp-admin/js/cat.js', array( 'wp-lists' ), '20081210' );
-		$scripts->localize( 'ajaxcat', 'catL10n', array(
-			'add' => attribute_escape(__('Add')),
-			'how' => __('Separate multiple categories with commas.'),
-			'l10n_print_after' => 'try{convertEntities(catL10n);}catch(e){};'
-		) );
-		$scripts->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '20081210' );
-		$scripts->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists'), '20081210' );
-		$scripts->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('wp-lists'), '20081210' );
-		$scripts->add( 'password-strength-meter', '/wp-admin/js/password-strength-meter.js', array('jquery'), '20081210' );
-		$scripts->localize( 'password-strength-meter', 'pwsL10n', array(
-			'empty' => __('Strength indicator'),
-			'short' => __('Very weak'),
-			'bad' => __('Weak'),
-			'good' => _c('Medium|password strength'),
-			'strong' => __('Strong'),
-			'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
-		) );
-		$scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081210' );
-		$scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
-			'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
-			'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last'])
-		) );
-		$scripts->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20081210' );
-		$scripts->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
-		$scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20081210' );
-		$scripts->localize( 'postbox', 'postboxL10n', array(
-			'requestFile' => admin_url('admin-ajax.php')
-		) );
-		$scripts->add( 'slug', '/wp-admin/js/slug.js', array('jquery'), '20081210' );
-		$scripts->localize( 'slug', 'slugL10n', array(
-			'requestFile' => admin_url('admin-ajax.php'),
-			'save' => __('Save'),
-			'cancel' => __('Cancel'),
-			'l10n_print_after' => 'try{convertEntities(slugL10n);}catch(e){};'
-		) );
-		$scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20081210' );
-		$scripts->localize( 'post', 'postL10n', array(
-			'tagsUsed' =>  __('Tags used on this post:'),
-			'add' => attribute_escape(__('Add')),
-			'addTag' => attribute_escape(__('Add new tag')),
-			'separate' => __('Separate tags with commas'),
-			'cancel' => __('Cancel'),
-			'edit' => __('Edit'),
-			'publishOn' => __('Publish on:'),
-			'publishOnFuture' =>  __('Schedule for:'),
-			'publishOnPast' => __('Published on:'),
-			'showcomm' => __('Show more comments'),
-			'endcomm' => __('No more comments found.'),
-			'publish' => __('Publish'),
-			'schedule' => __('Schedule'),
-			'update' => __('Update Post'),
-			'savePending' => __('Save as Pending'),
-			'saveDraft' => __('Save Draft'),
-			'private' => __('Private'),
-			'public' => __('Public'),
-			'publicSticky' => __('Public, Sticky'),
-			'password' => __('Password Protected'),
-			'privatelyPublished' => __('Privately Published'),
-			'published' => __('Published'),
-			'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};'
-		) );
-		$scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'wp-lists', 'postbox'), '20081210' );
-		$scripts->localize( 'page', 'postL10n', array(
-			'cancel' => __('Cancel'),
-			'edit' => __('Edit'),
-			'publishOn' => __('Publish on:'),
-			'publishOnFuture' =>  __('Schedule for:'),
-			'publishOnPast' => __('Published on:'),
-			'showcomm' => __('Show more comments'),
-			'endcomm' => __('No more comments found.'),
-			'publish' => __('Publish'),
-			'schedule' => __('Schedule'),
-			'update' => __('Update Page'),
-			'savePending' => __('Save as Pending'),
-			'saveDraft' => __('Save Draft'),
-			'private' => __('Private'),
-			'public' => __('Public'),
-			'password' => __('Password Protected'),
-			'privatelyPublished' => __('Privately Published'),
-			'published' => __('Published'),
-			'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};'
-		) );
-		$scripts->add( 'link', '/wp-admin/js/link.js', array('jquery-ui-tabs', 'wp-lists', 'postbox'), '20081210' );
-		$scripts->add( 'comment', '/wp-admin/js/comment.js', array('jquery'), '20081210' );
-		$scripts->localize( 'comment', 'commentL10n', array(
-			'cancel' => __('Cancel'),
-			'edit' => __('Edit'),
-			'submittedOn' => __('Submitted on:'),
-			'l10n_print_after' => 'try{convertEntities(commentL10n);}catch(e){};'
-		) );
-		$scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20081210' );
-		$scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20081210' );
-
-		$scripts->add( 'admin-widgets', '/wp-admin/js/widgets.js', array( 'interface' ), '20081210' );
-		$scripts->localize( 'admin-widgets', 'widgetsL10n', array(
-			'add' => __('Add'),
-			'edit' => __('Edit'),
-			'cancel' => __('Cancel'),
-			'lameReminder' => __('Remember to click the "Save Changes" button at the bottom of the Current Widgets column after you\'re all done!'),
-			'lamerReminder' => __("You're about to leave without having saved your changes!"),
-			'l10n_print_after' => 'try{convertEntities(widgetsL10n);}catch(e){};'
-		));
-
-		$scripts->add( 'word-count', '/wp-admin/js/word-count.js', array( 'jquery' ), '20081210' );
-		$scripts->localize( 'word-count', 'wordCountL10n', array(
-			'count' => __('Word count: %d'),
-			'l10n_print_after' => 'try{convertEntities(wordCountL10n);}catch(e){};'
-		));
-
-		$scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20081210' );
-
-		$scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081210' );
-		$scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
-			'error' => __('Error while saving the changes.'),
-			'ntdeltitle' => __('Remove From Bulk Edit'),
-			'notitle' => __('(no title)'),
-			'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
-		) );
-
-		$scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081210' );
-		$scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
-			'error' => __('Error while saving the changes.'),
-			'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
-		) );
-
-		$scripts->add( 'plugin-install', '/wp-admin/js/plugin-install.js', array( 'thickbox', 'jquery' ), '20081210' );
-		$scripts->localize( 'plugin-install', 'plugininstallL10n', array(
-			'plugin_information' => __('Plugin Information:'),
-			'l10n_print_after' => 'try{convertEntities(plugininstallL10n);}catch(e){};'
-		) );
-
-		$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
-
-		$scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox' ), '20081210' );
-
-		$scripts->add( 'hoverIntent', '/wp-includes/js/hoverIntent.js', array('jquery'), '20081210' );
-
-	}
-}
-
-/**
  * Assign default styles to $styles object.
  *
  * Nothing is returned, because the $styles parameter is passed by reference.
@@ -298,21 +41,12 @@
 		$guessurl = wp_guess_url();
 	$styles->base_url = $guessurl;
 	$styles->default_version = get_bloginfo( 'version' );
-	$styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr';
 
-	$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'plugin-install', 'farbtastic' );
-
-	$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081210' );
-	$styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
-
-	$styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20081210' );
-	$styles->add_data( 'ie', 'conditional', 'gte IE 6' );
+	$styles->add( 'wp-admin', '/wp-admin/css/wp-admin.css', array(), '20081210' );
 
 	$styles->add( 'colors', true, array(), '20081210' ); // Register "meta" stylesheet for admin colors
 	$styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081210'); // for login.php.  Is there a better way?
-	$styles->add_data( 'colors-fresh', 'rtl', true );
 	$styles->add( 'colors-classic', '/wp-admin/css/colors-classic.css', array(), '20081210');
-	$styles->add_data( 'colors-classic', 'rtl', true );
 
 	$styles->add( 'global', '/wp-admin/css/global.css', array(), '20081210' );
 	$styles->add( 'media', '/wp-admin/css/media.css', array(), '20081210' );
@@ -320,112 +54,9 @@
 	$styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081210' );
 	$styles->add( 'install', '/wp-admin/css/install.css', array(), '20081210' );
 	$styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css', array(), '20081210' );
-	$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20081210' );
 	$styles->add( 'login', '/wp-admin/css/login.css', array(), '20081210' );
 	$styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css', array(), '20081210' );
 	$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' );
-
-	foreach ( $rtl_styles as $rtl_style )
-		$styles->add_data( $rtl_style, 'rtl', true );
-}
-
-/**
- * Reorder JavaScript scripts array to place prototype before jQuery.
- *
- * @since 2.3.1
- *
- * @param array $js_array JavaScript scripst array
- * @return array Reordered array, if needed.
- */
-function wp_prototype_before_jquery( $js_array ) {
-	if ( false === $jquery = array_search( 'jquery', $js_array ) )
-		return $js_array;
-
-	if ( false === $prototype = array_search( 'prototype', $js_array ) )
-		return $js_array;
-
-	if ( $prototype < $jquery )
-		return $js_array;
-
-	unset($js_array[$prototype]);
-
-	array_splice( $js_array, $jquery, 0, 'prototype' );
-
-	return $js_array;
 }
 
-/**
- * Load localized script just in time for MCE.
- *
- * These localizations require information that may not be loaded even by init.
- *
- * @since 2.5.0
- */
-function wp_just_in_time_script_localization() {
-	global $current_user;
-
-	wp_localize_script( 'autosave', 'autosaveL10n', array(
-		'autosaveInterval' => AUTOSAVE_INTERVAL,
-		'previewPageText' => __('Preview this Page'),
-		'previewPostText' => __('Preview this Post'),
-		'requestFile' => admin_url('admin-ajax.php'),
-		'savingText' => __('Saving Draft&#8230;'),
-		'l10n_print_after' => 'try{convertEntities(autosaveL10n);}catch(e){};'
-	) );
-
-	$userid = isset($current_user) ? $current_user->ID : 0;
-	wp_localize_script( 'common', 'userSettings', array(
-		'url' => SITECOOKIEPATH,
-		'uid' => $userid,
-		'time' => time()
-	) );
-}
-
-/**
- * Administration Panel CSS for changing the styles.
- *
- * If installing the 'wp-admin/' directory will be replaced with './'.
- *
- * The $_wp_admin_css_colors global manages the Administration Panels CSS
- * stylesheet that is loaded. The option that is set is 'admin_color' and is the
- * color and key for the array. The value for the color key is an object with
- * a 'url' parameter that has the URL path to the CSS file.
- *
- * The query from $src parameter will be appended to the URL that is given from
- * the $_wp_admin_css_colors array value URL.
- *
- * @since 2.6.0
- * @uses $_wp_admin_css_colors
- *
- * @param string $src Source URL.
- * @param string $handle Either 'colors' or 'colors-rtl'.
- * @return string URL path to CSS stylesheet for Administration Panels.
- */
-function wp_style_loader_src( $src, $handle ) {
-	if ( defined('WP_INSTALLING') )
-		return preg_replace( '#^wp-admin/#', './', $src );
-
-	if ( 'colors' == $handle || 'colors-rtl' == $handle ) {
-		global $_wp_admin_css_colors;
-		$color = get_user_option('admin_color');
-		if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
-			$color = 'fresh';
-		$color = $_wp_admin_css_colors[$color];
-		$parsed = parse_url( $src );
-		$url = $color->url;
-		if ( isset($parsed['query']) && $parsed['query'] ) {
-			wp_parse_str( $parsed['query'], $qv );
-			$url = add_query_arg( $qv, $url );
-		}
-		return $url;
-	}
-
-	return $src;
-}
-
-add_action( 'wp_default_scripts', 'wp_default_scripts' );
-add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
-add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
-
 add_action( 'wp_default_styles', 'wp_default_styles' );
-add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
diff -uNr a/mp-wp/wp-includes/template-loader.php b/mp-wp/wp-includes/template-loader.php
--- a/mp-wp/wp-includes/template-loader.php 712890941eefa363601a5dfac4fd1f6fad031195f30c7d4ef91cc4fb3a274827328f5dfb678ab245dd446a0d7c34a064eb3d55ef24f5a4f56352b3ae7f18d745
+++ b/mp-wp/wp-includes/template-loader.php b3a873f50a225536fd51861f24ef516682a0d1033dd5e0a3b20108814dcb71cd8b09f1ee1ebae632c4f8b97dd222c4488cd4b8d76a521a2213493271495acc4b
@@ -51,9 +51,6 @@
 	} else if ( is_archive() && $template = get_archive_template() ) {
 		include($template);
 		return;
-	} else if ( is_comments_popup() && $template = get_comments_popup_template() ) {
-		include($template);
-		return;
 	} else if ( is_paged() && $template = get_paged_template() ) {
 		include($template);
 		return;
@@ -75,4 +72,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff -uNr a/mp-wp/wp-includes/theme.php b/mp-wp/wp-includes/theme.php
--- a/mp-wp/wp-includes/theme.php bcb7b01f1cd40807e89b56f51c67af3033f96861a3ad803172f770cfb3f6162fc9380e0a76ab401d97ea593238d09abcc1184890256ad64107a1d0f21158add4
+++ b/mp-wp/wp-includes/theme.php 30dbdd3cc179adafc8d8e25a4a06c577d6d29d8ea1fa536fa57fcaced37c6df3f9bc34c2a4723c884989750ce8cf1c1a03ba0d52b7ca1a1bb5f4d3567c5020aa
@@ -210,7 +210,7 @@
 
 	$name = $theme = wp_kses( trim( $theme_name[1] ), $themes_allowed_tags );
 	$theme_uri = clean_url( trim( $theme_uri[1] ) );
-	$description = wptexturize( wp_kses( trim( $description[1] ), $themes_allowed_tags ) );
+	$description = wp_kses( trim( $description[1] ), $themes_allowed_tags );
 
 	if ( preg_match( '|Author:(.*)$|mi', $theme_data, $author_name ) ) {
 		if ( empty( $author_uri ) ) {
@@ -314,7 +314,7 @@
 
 		$name        = $theme_data['Name'];
 		$title       = $theme_data['Title'];
-		$description = wptexturize($theme_data['Description']);
+		$description = $theme_data['Description'];
 		$version     = $theme_data['Version'];
 		$author      = $theme_data['Author'];
 		$template    = $theme_data['Template'];
@@ -749,27 +749,6 @@
 }
 
 /**
- * Retrieve path of comment popup template in current or parent template.
- *
- * Checks for comment popup template in current template, if it exists or in the
- * parent template. If it doesn't exist, then it retrieves the comment-popup.php
- * file from the default theme. The default theme must then exist for it to
- * work.
- *
- * @since 1.5.0
- * @uses apply_filters() Calls 'comments_popup_template' filter on path.
- *
- * @return string
- */
-function get_comments_popup_template() {
-	$template = locate_template(array("comments-popup.php"));
-	if ('' == $template)
-		$template = get_theme_root() . '/default/comments-popup.php';
-
-	return apply_filters('comments_popup_template', $template);
-}
-
-/**
  * Retrieve the name of the highest priority template file that exists.
  *
  * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which
@@ -1043,71 +1022,4 @@
 	delete_option("mods_$theme");
 }
 
-/**
- * Retrieve text color for custom header.
- *
- * @since 2.1.0
- * @uses HEADER_TEXTCOLOR
- *
- * @return string
- */
-function get_header_textcolor() {
-	return get_theme_mod('header_textcolor', HEADER_TEXTCOLOR);
-}
-
-/**
- * Display text color for custom header.
- *
- * @since 2.1.0
- */
-function header_textcolor() {
-	echo get_header_textcolor();
-}
-
-/**
- * Retrieve header image for custom header.
- *
- * @since 2.1.0
- * @uses HEADER_IMAGE
- *
- * @return string
- */
-function get_header_image() {
-	return get_theme_mod('header_image', HEADER_IMAGE);
-}
-
-/**
- * Display header image path.
- *
- * @since 2.1.0
- */
-function header_image() {
-	echo get_header_image();
-}
-
-/**
- * Add callbacks for image header display.
- *
- * The parameter $header_callback callback will be required to display the
- * content for the 'wp_head' action. The parameter $admin_header_callback
- * callback will be added to Custom_Image_Header class and that will be added
- * to the 'admin_menu' action.
- *
- * @since 2.1.0
- * @uses Custom_Image_Header Sets up for $admin_header_callback for administration panel display.
- *
- * @param callback $header_callback Call on 'wp_head' action.
- * @param callback $admin_header_callback Call on administration panels.
- */
-function add_custom_image_header($header_callback, $admin_header_callback) {
-	if ( ! empty($header_callback) )
-		add_action('wp_head', $header_callback);
-
-	if ( ! is_admin() )
-		return;
-	require_once(ABSPATH . 'wp-admin/custom-header.php');
-	$GLOBALS['custom_image_header'] = new Custom_Image_Header($admin_header_callback);
-	add_action('admin_menu', array(&$GLOBALS['custom_image_header'], 'init'));
-}
-
 ?>
diff -uNr a/mp-wp/wp-includes/widgets.php b/mp-wp/wp-includes/widgets.php
--- a/mp-wp/wp-includes/widgets.php aaf95ae9fed522ef1163401ca36ceb5da98707e5db79498c9fe64a3c1ca17421837f9f0bc00c132eee1d059d35e921a9840a141e19ada93401febc9e3043b132
+++ b/mp-wp/wp-includes/widgets.php 62c39ec438f154555d4a5e4d318977f49ce07bef3385a406c7ea2f42978e2f2017b1051b0d67204d7161db749163143d3e4d4518aa89630ad9b3c197f631a015
@@ -1092,21 +1092,6 @@
 	if ( $d ) {
 		$cat_args['show_option_none'] = __('Select Category');
 		wp_dropdown_categories($cat_args);
-?>
-
-<script type='text/javascript'>
-/* <![CDATA[ */
-	var dropdown = document.getElementById("cat");
-	function onCatChange() {
-		if ( dropdown.options[dropdown.selectedIndex].value > 0 ) {
-			location.href = "<?php echo get_option('home'); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value;
-		}
-	}
-	dropdown.onchange = onCatChange;
-/* ]]> */
-</script>
-
-<?php
 	} else {
 ?>
 		<ul>
diff -uNr a/mp-wp/wp-login.php b/mp-wp/wp-login.php
--- a/mp-wp/wp-login.php 5e5c1e016d3a7b1bfd2cf6ab94eba8e84b1c9947496a2bc8fa6a6f7bcdeeff58a10d1dce6706028c6f0a796bfe468007fcce74a14d4d524d8e858538a075f6d4
+++ b/mp-wp/wp-login.php bb410ee4f18dad69714fa6e7980e6f4f8c66315cf8f85851b7f6f441cbc97422e2b90a08d0b33313161f1c2ba2dbfb5d36a3f5a3efd4377c939f14d898948f1d
@@ -56,7 +56,7 @@
 </head>
 <body class="login">
 
-<div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', 'http://wordpress.org/'); ?>" title="<?php echo apply_filters('login_headertitle', __('Powered by WordPress')); ?>"><?php bloginfo('name'); ?></a></h1>
+<div id="login"><h1>MP-WP</h1>
 <?php
 	if ( !empty( $message ) ) echo apply_filters('login_message', $message) . "\n";
 
@@ -309,7 +309,7 @@
 		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo attribute_escape($user_login); ?>" size="20" tabindex="10" /></label>
 	</p>
 <?php do_action('lostpassword_form'); ?>
-	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Get New Password'); ?>" tabindex="100" /></p>
+	<p class="submit"><input type="submit" name="wp-submit" class="button-primary" id="wp-submit" value="<?php _e('Get New Password'); ?>" tabindex="100" /></p>
 </form>
 
 <p id="nav">
@@ -325,9 +325,6 @@
 
 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
-<script type="text/javascript">
-try{document.getElementById('user_login').focus();}catch(e){}
-</script>
 </body>
 </html>
 <?php
@@ -381,7 +378,7 @@
 	</p>
 <?php do_action('register_form'); ?>
 	<p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
-	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Register'); ?>" tabindex="100" /></p>
+	<p class="submit"><input type="submit" name="wp-submit" class="button-primary" id="wp-submit" value="<?php _e('Register'); ?>" tabindex="100" /></p>
 </form>
 
 <p id="nav">
@@ -393,9 +390,6 @@
 
 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
-<script type="text/javascript">
-try{document.getElementById('user_login').focus();}catch(e){}
-</script>
 </body>
 </html>
 <?php
@@ -475,7 +469,7 @@
 <?php do_action('login_form'); ?>
 	<p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> <?php _e('Remember Me'); ?></label></p>
 	<p class="submit">
-		<input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Log In'); ?>" tabindex="100" />
+		<input type="submit" name="wp-submit" class="button-primary" id="wp-submit" value="<?php _e('Log In'); ?>" tabindex="100" />
 		<input type="hidden" name="redirect_to" value="<?php echo attribute_escape($redirect_to); ?>" />
 		<input type="hidden" name="testcookie" value="1" />
 	</p>
@@ -496,18 +490,6 @@
 
 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
-<script type="text/javascript">
-<?php if ( $user_login ) { ?>
-setTimeout( function(){ try{
-d = document.getElementById('user_pass');
-d.value = '';
-d.focus();
-} catch(e){}
-}, 200);
-<?php } else { ?>
-try{document.getElementById('user_login').focus();}catch(e){}
-<?php } ?>
-</script>
 </body>
 </html>
 <?php