stump-cli 0.1.3 → 1.0.0

data/lib/wp/wp-includes/Text/Diff/Renderer.php

@@ -1,235 +0,0 @@
-<?php
-/**
- * A class to render Diffs in different formats.
- *
- * This class renders the diff in classic diff format. It is intended that
- * this class be customized via inheritance, to obtain fancier outputs.
- *
- * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
- *
- * @package Text_Diff
- */
-class Text_Diff_Renderer {
-
-    /**
-     * Number of leading context "lines" to preserve.
-     *
-     * This should be left at zero for this class, but subclasses may want to
-     * set this to other values.
-     */
-    var $_leading_context_lines = 0;
-
-    /**
-     * Number of trailing context "lines" to preserve.
-     *
-     * This should be left at zero for this class, but subclasses may want to
-     * set this to other values.
-     */
-    var $_trailing_context_lines = 0;
-
-    /**
-     * Constructor.
-     */
-    function Text_Diff_Renderer($params = array())
-    {
-        foreach ($params as $param => $value) {
-            $v = '_' . $param;
-            if (isset($this->$v)) {
-                $this->$v = $value;
-            }
-        }
-    }
-
-    /**
-     * Get any renderer parameters.
-     *
-     * @return array  All parameters of this renderer object.
-     */
-    function getParams()
-    {
-        $params = array();
-        foreach (get_object_vars($this) as $k => $v) {
-            if ($k[0] == '_') {
-                $params[substr($k, 1)] = $v;
-            }
-        }
-
-        return $params;
-    }
-
-    /**
-     * Renders a diff.
-     *
-     * @param Text_Diff $diff  A Text_Diff object.
-     *
-     * @return string  The formatted output.
-     */
-    function render($diff)
-    {
-        $xi = $yi = 1;
-        $block = false;
-        $context = array();
-
-        $nlead = $this->_leading_context_lines;
-        $ntrail = $this->_trailing_context_lines;
-
-        $output = $this->_startDiff();
-
-        $diffs = $diff->getDiff();
-        foreach ($diffs as $i => $edit) {
-            /* If these are unchanged (copied) lines, and we want to keep
-             * leading or trailing context lines, extract them from the copy
-             * block. */
-            if (is_a($edit, 'Text_Diff_Op_copy')) {
-                /* Do we have any diff blocks yet? */
-                if (is_array($block)) {
-                    /* How many lines to keep as context from the copy
-                     * block. */
-                    $keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
-                    if (count($edit->orig) <= $keep) {
-                        /* We have less lines in the block than we want for
-                         * context => keep the whole block. */
-                        $block[] = $edit;
-                    } else {
-                        if ($ntrail) {
-                            /* Create a new block with as many lines as we need
-                             * for the trailing context. */
-                            $context = array_slice($edit->orig, 0, $ntrail);
-                            $block[] = new Text_Diff_Op_copy($context);
-                        }
-                        /* @todo */
-                        $output .= $this->_block($x0, $ntrail + $xi - $x0,
-                                                 $y0, $ntrail + $yi - $y0,
-                                                 $block);
-                        $block = false;
-                    }
-                }
-                /* Keep the copy block as the context for the next block. */
-                $context = $edit->orig;
-            } else {
-                /* Don't we have any diff blocks yet? */
-                if (!is_array($block)) {
-                    /* Extract context lines from the preceding copy block. */
-                    $context = array_slice($context, count($context) - $nlead);
-                    $x0 = $xi - count($context);
-                    $y0 = $yi - count($context);
-                    $block = array();
-                    if ($context) {
-                        $block[] = new Text_Diff_Op_copy($context);
-                    }
-                }
-                $block[] = $edit;
-            }
-
-            if ($edit->orig) {
-                $xi += count($edit->orig);
-            }
-            if ($edit->final) {
-                $yi += count($edit->final);
-            }
-        }
-
-        if (is_array($block)) {
-            $output .= $this->_block($x0, $xi - $x0,
-                                     $y0, $yi - $y0,
-                                     $block);
-        }
-
-        return $output . $this->_endDiff();
-    }
-
-    function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
-    {
-        $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
-
-        foreach ($edits as $edit) {
-            switch (strtolower(get_class($edit))) {
-            case 'text_diff_op_copy':
-                $output .= $this->_context($edit->orig);
-                break;
-
-            case 'text_diff_op_add':
-                $output .= $this->_added($edit->final);
-                break;
-
-            case 'text_diff_op_delete':
-                $output .= $this->_deleted($edit->orig);
-                break;
-
-            case 'text_diff_op_change':
-                $output .= $this->_changed($edit->orig, $edit->final);
-                break;
-            }
-        }
-
-        return $output . $this->_endBlock();
-    }
-
-    function _startDiff()
-    {
-        return '';
-    }
-
-    function _endDiff()
-    {
-        return '';
-    }
-
-    function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
-    {
-        if ($xlen > 1) {
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
-        }
-        if ($ylen > 1) {
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
-        }
-
-        // this matches the GNU Diff behaviour
-        if ($xlen && !$ylen) {
-            $ybeg--;
-        } elseif (!$xlen) {
-            $xbeg--;
-        }
-
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
-    }
-
-    function _startBlock($header)
-    {
-        return $header . "\n";
-    }
-
-    function _endBlock()
-    {
-        return '';
-    }
-
-    function _lines($lines, $prefix = ' ')
-    {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
-    }
-
-    function _context($lines)
-    {
-        return $this->_lines($lines, '  ');
-    }
-
-    function _added($lines)
-    {
-        return $this->_lines($lines, '> ');
-    }
-
-    function _deleted($lines)
-    {
-        return $this->_lines($lines, '< ');
-    }
-
-    function _changed($orig, $final)
-    {
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
-    }
-
-}

data/lib/wp/wp-includes/Text/Diff/Renderer/inline.php

@@ -1,206 +0,0 @@
-<?php
-/**
- * "Inline" diff renderer.
- *
- * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
- *
- * @author  Ciprian Popovici
- * @package Text_Diff
- */
-
-/** Text_Diff_Renderer */
-
-// WP #7391
-require_once dirname(dirname(__FILE__)) . '/Renderer.php';
-
-/**
- * "Inline" diff renderer.
- *
- * This class renders diffs in the Wiki-style "inline" format.
- *
- * @author  Ciprian Popovici
- * @package Text_Diff
- */
-class Text_Diff_Renderer_inline extends Text_Diff_Renderer {
-
-    /**
-     * Number of leading context "lines" to preserve.
-     *
-     * @var integer
-     */
-    var $_leading_context_lines = 10000;
-
-    /**
-     * Number of trailing context "lines" to preserve.
-     *
-     * @var integer
-     */
-    var $_trailing_context_lines = 10000;
-
-    /**
-     * Prefix for inserted text.
-     *
-     * @var string
-     */
-    var $_ins_prefix = '<ins>';
-
-    /**
-     * Suffix for inserted text.
-     *
-     * @var string
-     */
-    var $_ins_suffix = '</ins>';
-
-    /**
-     * Prefix for deleted text.
-     *
-     * @var string
-     */
-    var $_del_prefix = '<del>';
-
-    /**
-     * Suffix for deleted text.
-     *
-     * @var string
-     */
-    var $_del_suffix = '</del>';
-
-    /**
-     * Header for each change block.
-     *
-     * @var string
-     */
-    var $_block_header = '';
-
-    /**
-     * Whether to split down to character-level.
-     *
-     * @var boolean
-     */
-    var $_split_characters = false;
-
-    /**
-     * What are we currently splitting on? Used to recurse to show word-level
-     * or character-level changes.
-     *
-     * @var string
-     */
-    var $_split_level = 'lines';
-
-    function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
-    {
-        return $this->_block_header;
-    }
-
-    function _startBlock($header)
-    {
-        return $header;
-    }
-
-    function _lines($lines, $prefix = ' ', $encode = true)
-    {
-        if ($encode) {
-            array_walk($lines, array(&$this, '_encode'));
-        }
-
-        if ($this->_split_level == 'lines') {
-            return implode("\n", $lines) . "\n";
-        } else {
-            return implode('', $lines);
-        }
-    }
-
-    function _added($lines)
-    {
-        array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_ins_prefix . $lines[0];
-        $lines[count($lines) - 1] .= $this->_ins_suffix;
-        return $this->_lines($lines, ' ', false);
-    }
-
-    function _deleted($lines, $words = false)
-    {
-        array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_del_prefix . $lines[0];
-        $lines[count($lines) - 1] .= $this->_del_suffix;
-        return $this->_lines($lines, ' ', false);
-    }
-
-    function _changed($orig, $final)
-    {
-        /* If we've already split on characters, just display. */
-        if ($this->_split_level == 'characters') {
-            return $this->_deleted($orig)
-                . $this->_added($final);
-        }
-
-        /* If we've already split on words, just display. */
-        if ($this->_split_level == 'words') {
-            $prefix = '';
-            while ($orig[0] !== false && $final[0] !== false &&
-                   substr($orig[0], 0, 1) == ' ' &&
-                   substr($final[0], 0, 1) == ' ') {
-                $prefix .= substr($orig[0], 0, 1);
-                $orig[0] = substr($orig[0], 1);
-                $final[0] = substr($final[0], 1);
-            }
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
-        }
-
-        $text1 = implode("\n", $orig);
-        $text2 = implode("\n", $final);
-
-        /* Non-printing newline marker. */
-        $nl = "\0";
-
-        if ($this->_split_characters) {
-            $diff = new Text_Diff('native',
-                                  array(preg_split('//', $text1),
-                                        preg_split('//', $text2)));
-        } else {
-            /* We want to split on word boundaries, but we need to preserve
-             * whitespace as well. Therefore we split on words, but include
-             * all blocks of whitespace in the wordlist. */
-            $diff = new Text_Diff('native',
-                                  array($this->_splitOnWords($text1, $nl),
-                                        $this->_splitOnWords($text2, $nl)));
-        }
-
-        /* Get the diff in inline format. */
-        $renderer = new Text_Diff_Renderer_inline
-            (array_merge($this->getParams(),
-                         array('split_level' => $this->_split_characters ? 'characters' : 'words')));
-
-        /* Run the diff and get the output. */
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
-    }
-
-    function _splitOnWords($string, $newlineEscape = "\n")
-    {
-        // Ignore \0; otherwise the while loop will never finish.
-        $string = str_replace("\0", '', $string);
-
-        $words = array();
-        $length = strlen($string);
-        $pos = 0;
-
-        while ($pos < $length) {
-            // Eat a word with any preceding whitespace.
-            $spaces = strspn(substr($string, $pos), " \n");
-            $nextpos = strcspn(substr($string, $pos + $spaces), " \n");
-            $words[] = str_replace("\n", $newlineEscape, substr($string, $pos, $spaces + $nextpos));
-            $pos += $spaces + $nextpos;
-        }
-
-        return $words;
-    }
-
-    function _encode(&$string)
-    {
-        $string = htmlspecialchars($string);
-    }
-
-}

data/lib/wp/wp-includes/admin-bar.php

@@ -1,870 +0,0 @@
-<?php
-/**
- * Admin Bar
- *
- * This code handles the building and rendering of the press bar.
- */
-
-/**
- * Instantiate the admin bar object and set it up as a global for access elsewhere.
- *
- * UNHOOKING THIS FUNCTION WILL NOT PROPERLY REMOVE THE ADMIN BAR.
- * For that, use show_admin_bar(false) or the 'show_admin_bar' filter.
- *
- * @since 3.1.0
- * @access private
- * @return bool Whether the admin bar was successfully initialized.
- */
-function _wp_admin_bar_init() {
-	global $wp_admin_bar;
-
-	if ( ! is_admin_bar_showing() )
-		return false;
-
-	/* Load the admin bar class code ready for instantiation */
-	require( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
-
-	/* Instantiate the admin bar */
-
-	/**
-	 * Filter the admin bar class to instantiate.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param string $wp_admin_bar_class Admin bar class to use. Default 'WP_Admin_Bar'.
-	 */
-	$admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
-	if ( class_exists( $admin_bar_class ) )
-		$wp_admin_bar = new $admin_bar_class;
-	else
-		return false;
-
-	$wp_admin_bar->initialize();
-	$wp_admin_bar->add_menus();
-
-	return true;
-}
-// Don't remove. Wrong way to disable.
-add_action( 'template_redirect', '_wp_admin_bar_init', 0 );
-add_action( 'admin_init', '_wp_admin_bar_init' );
-
-/**
- * Render the admin bar to the page based on the $wp_admin_bar->menu member var.
- * This is called very late on the footer actions so that it will render after anything else being
- * added to the footer.
- *
- * It includes the action "admin_bar_menu" which should be used to hook in and
- * add new menus to the admin bar. That way you can be sure that you are adding at most optimal point,
- * right before the admin bar is rendered. This also gives you access to the $post global, among others.
- *
- * @since 3.1.0
- */
-function wp_admin_bar_render() {
-	global $wp_admin_bar;
-
-	if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
-		return false;
-
-	/**
-	 * Load all necessary admin bar items.
-	 *
-	 * This is the hook used to add, remove, or manipulate admin bar items.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference
-	 */
-	do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
-
-	/**
-	 * Fires before the admin bar is rendered.
-	 *
-	 * @since 3.1.0
-	 */
-	do_action( 'wp_before_admin_bar_render' );
-
-	$wp_admin_bar->render();
-
-	/**
-	 * Fires after the admin bar is rendered.
-	 *
-	 * @since 3.1.0
-	 */
-	do_action( 'wp_after_admin_bar_render' );
-}
-add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
-add_action( 'in_admin_header', 'wp_admin_bar_render', 0 );
-
-/**
- * Add the WordPress logo menu.
- *
- * @since 3.3.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_wp_menu( $wp_admin_bar ) {
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'wp-logo',
-		'title' => '<span class="ab-icon"></span>',
-		'href'  => self_admin_url( 'about.php' ),
-		'meta'  => array(
-			'title' => __('About WordPress'),
-		),
-	) );
-
-	if ( is_user_logged_in() ) {
-		// Add "About WordPress" link
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'wp-logo',
-			'id'     => 'about',
-			'title'  => __('About WordPress'),
-			'href'  => self_admin_url( 'about.php' ),
-		) );
-	}
-
-	// Add WordPress.org link
-	$wp_admin_bar->add_menu( array(
-		'parent'    => 'wp-logo-external',
-		'id'        => 'wporg',
-		'title'     => __('WordPress.org'),
-		'href'      => __('https://wordpress.org/'),
-	) );
-
-	// Add codex link
-	$wp_admin_bar->add_menu( array(
-		'parent'    => 'wp-logo-external',
-		'id'        => 'documentation',
-		'title'     => __('Documentation'),
-		'href'      => __('http://codex.wordpress.org/'),
-	) );
-
-	// Add forums link
-	$wp_admin_bar->add_menu( array(
-		'parent'    => 'wp-logo-external',
-		'id'        => 'support-forums',
-		'title'     => __('Support Forums'),
-		'href'      => __('https://wordpress.org/support/'),
-	) );
-
-	// Add feedback link
-	$wp_admin_bar->add_menu( array(
-		'parent'    => 'wp-logo-external',
-		'id'        => 'feedback',
-		'title'     => __('Feedback'),
-		'href'      => __('https://wordpress.org/support/forum/requests-and-feedback'),
-	) );
-}
-
-/**
- * Add the sidebar toggle button.
- *
- * @since 3.8.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
-	if ( is_admin() ) {
-		$wp_admin_bar->add_menu( array(
-			'id'    => 'menu-toggle',
-			'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'Menu' ) . '</span>',
-			'href'  => '#',
-		) );
-	}
-}
-
-/**
- * Add the "My Account" item.
- *
- * @since 3.3.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_my_account_item( $wp_admin_bar ) {
-	$user_id      = get_current_user_id();
-	$current_user = wp_get_current_user();
-	$profile_url  = get_edit_profile_url( $user_id );
-
-	if ( ! $user_id )
-		return;
-
-	$avatar = get_avatar( $user_id, 26 );
-	$howdy  = sprintf( __('Howdy, %1$s'), $current_user->display_name );
-	$class  = empty( $avatar ) ? '' : 'with-avatar';
-
-	$wp_admin_bar->add_menu( array(
-		'id'        => 'my-account',
-		'parent'    => 'top-secondary',
-		'title'     => $howdy . $avatar,
-		'href'      => $profile_url,
-		'meta'      => array(
-			'class'     => $class,
-			'title'     => __('My Account'),
-		),
-	) );
-}
-
-/**
- * Add the "My Account" submenu items.
- *
- * @since 3.1.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
-	$user_id      = get_current_user_id();
-	$current_user = wp_get_current_user();
-	$profile_url  = get_edit_profile_url( $user_id );
-
-	if ( ! $user_id )
-		return;
-
-	$wp_admin_bar->add_group( array(
-		'parent' => 'my-account',
-		'id'     => 'user-actions',
-	) );
-
-	$user_info  = get_avatar( $user_id, 64 );
-	$user_info .= "<span class='display-name'>{$current_user->display_name}</span>";
-
-	if ( $current_user->display_name !== $current_user->user_login )
-		$user_info .= "<span class='username'>{$current_user->user_login}</span>";
-
-	$wp_admin_bar->add_menu( array(
-		'parent' => 'user-actions',
-		'id'     => 'user-info',
-		'title'  => $user_info,
-		'href'   => $profile_url,
-		'meta'   => array(
-			'tabindex' => -1,
-		),
-	) );
-	$wp_admin_bar->add_menu( array(
-		'parent' => 'user-actions',
-		'id'     => 'edit-profile',
-		'title'  => __( 'Edit My Profile' ),
-		'href' => $profile_url,
-	) );
-	$wp_admin_bar->add_menu( array(
-		'parent' => 'user-actions',
-		'id'     => 'logout',
-		'title'  => __( 'Log Out' ),
-		'href'   => wp_logout_url(),
-	) );
-}
-
-/**
- * Add the "Site Name" menu.
- *
- * @since 3.3.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_site_menu( $wp_admin_bar ) {
-	// Don't show for logged out users.
-	if ( ! is_user_logged_in() )
-		return;
-
-	// Show only when the user is a member of this site, or they're a super admin.
-	if ( ! is_user_member_of_blog() && ! is_super_admin() )
-		return;
-
-	$blogname = get_bloginfo('name');
-
-	if ( empty( $blogname ) )
-		$blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
-
-	if ( is_network_admin() ) {
-		$blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) );
-	} elseif ( is_user_admin() ) {
-		$blogname = sprintf( __('Global Dashboard: %s'), esc_html( get_current_site()->site_name ) );
-	}
-
-	$title = wp_html_excerpt( $blogname, 40, '&hellip;' );
-
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'site-name',
-		'title' => $title,
-		'href'  => is_admin() ? home_url( '/' ) : admin_url(),
-	) );
-
-	// Create submenu items.
-
-	if ( is_admin() ) {
-		// Add an option to visit the site.
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'site-name',
-			'id'     => 'view-site',
-			'title'  => __( 'Visit Site' ),
-			'href'   => home_url( '/' ),
-		) );
-
-		if ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => 'site-name',
-				'id'     => 'edit-site',
-				'title'  => __( 'Edit Site' ),
-				'href'   => network_admin_url( 'site-info.php?id=' . get_current_blog_id() ),
-			) );
-		}
-
-	} else {
-		// We're on the front end, link to the Dashboard.
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'site-name',
-			'id'     => 'dashboard',
-			'title'  => __( 'Dashboard' ),
-			'href'   => admin_url(),
-		) );
-
-		// Add the appearance submenu items.
-		wp_admin_bar_appearance_menu( $wp_admin_bar );
-	}
-}
-
-/**
- * Add the "My Sites/[Site Name]" menu and all submenus.
- *
- * @since 3.1.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
-	// Don't show for logged out users or single site mode.
-	if ( ! is_user_logged_in() || ! is_multisite() )
-		return;
-
-	// Show only when the user has at least one site, or they're a super admin.
-	if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() )
-		return;
-
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'my-sites',
-		'title' => __( 'My Sites' ),
-		'href'  => admin_url( 'my-sites.php' ),
-	) );
-
-	if ( is_super_admin() ) {
-		$wp_admin_bar->add_group( array(
-			'parent' => 'my-sites',
-			'id'     => 'my-sites-super-admin',
-		) );
-
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'my-sites-super-admin',
-			'id'     => 'network-admin',
-			'title'  => __('Network Admin'),
-			'href'   => network_admin_url(),
-		) );
-
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'network-admin',
-			'id'     => 'network-admin-d',
-			'title'  => __( 'Dashboard' ),
-			'href'   => network_admin_url(),
-		) );
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'network-admin',
-			'id'     => 'network-admin-s',
-			'title'  => __( 'Sites' ),
-			'href'   => network_admin_url( 'sites.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'network-admin',
-			'id'     => 'network-admin-u',
-			'title'  => __( 'Users' ),
-			'href'   => network_admin_url( 'users.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'network-admin',
-			'id'     => 'network-admin-t',
-			'title'  => __( 'Themes' ),
-			'href'   => network_admin_url( 'themes.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'network-admin',
-			'id'     => 'network-admin-p',
-			'title'  => __( 'Plugins' ),
-			'href'   => network_admin_url( 'plugins.php' ),
-		) );
-	}
-
-	// Add site links
-	$wp_admin_bar->add_group( array(
-		'parent' => 'my-sites',
-		'id'     => 'my-sites-list',
-		'meta'   => array(
-			'class' => is_super_admin() ? 'ab-sub-secondary' : '',
-		),
-	) );
-
-	foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
-		switch_to_blog( $blog->userblog_id );
-
-		$blavatar = '<div class="blavatar"></div>';
-
-		$blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
-		$menu_id  = 'blog-' . $blog->userblog_id;
-
-		$wp_admin_bar->add_menu( array(
-			'parent'    => 'my-sites-list',
-			'id'        => $menu_id,
-			'title'     => $blavatar . $blogname,
-			'href'      => admin_url(),
-		) );
-
-		$wp_admin_bar->add_menu( array(
-			'parent' => $menu_id,
-			'id'     => $menu_id . '-d',
-			'title'  => __( 'Dashboard' ),
-			'href'   => admin_url(),
-		) );
-
-		if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => $menu_id,
-				'id'     => $menu_id . '-n',
-				'title'  => __( 'New Post' ),
-				'href'   => admin_url( 'post-new.php' ),
-			) );
-		}
-
-		if ( current_user_can( 'edit_posts' ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => $menu_id,
-				'id'     => $menu_id . '-c',
-				'title'  => __( 'Manage Comments' ),
-				'href'   => admin_url( 'edit-comments.php' ),
-			) );
-		}
-
-		$wp_admin_bar->add_menu( array(
-			'parent' => $menu_id,
-			'id'     => $menu_id . '-v',
-			'title'  => __( 'Visit Site' ),
-			'href'   => home_url( '/' ),
-		) );
-
-		restore_current_blog();
-	}
-}
-
-/**
- * Provide a shortlink.
- *
- * @since 3.1.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
-	$short = wp_get_shortlink( 0, 'query' );
-	$id = 'get-shortlink';
-
-	if ( empty( $short ) )
-		return;
-
-	$html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />';
-
-	$wp_admin_bar->add_menu( array(
-		'id' => $id,
-		'title' => __( 'Shortlink' ),
-		'href' => $short,
-		'meta' => array( 'html' => $html ),
-	) );
-}
-
-/**
- * Provide an edit link for posts and terms.
- *
- * @since 3.1.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_edit_menu( $wp_admin_bar ) {
-	global $tag, $wp_the_query;
-
-	if ( is_admin() ) {
-		$current_screen = get_current_screen();
-		$post = get_post();
-
-		if ( 'post' == $current_screen->base
-			&& 'add' != $current_screen->action
-			&& ( $post_type_object = get_post_type_object( $post->post_type ) )
-			&& current_user_can( 'read_post', $post->ID )
-			&& ( $post_type_object->public )
-			&& ( $post_type_object->show_in_admin_bar ) )
-		{
-			if( 'draft' == $post->post_status ) {
-				$preview_link = set_url_scheme( get_permalink( $post->ID ) );
-				/** This filter is documented in wp-admin/includes/meta-boxes.php */
-				$preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
-				$wp_admin_bar->add_menu( array(
-					'id' => 'preview',
-					'title' => $post_type_object->labels->view_item,
-					'href' => esc_url( $preview_link ),
-					'meta' => array( 'target' => 'wp-preview-' . $post->ID ),
-				) );
-			} else {
-				$wp_admin_bar->add_menu( array(
-					'id' => 'view',
-					'title' => $post_type_object->labels->view_item,
-					'href' => get_permalink( $post->ID )
-				) );
-			}
-		} elseif ( 'edit-tags' == $current_screen->base
-			&& isset( $tag ) && is_object( $tag )
-			&& ( $tax = get_taxonomy( $tag->taxonomy ) )
-			&& $tax->public )
-		{
-			$wp_admin_bar->add_menu( array(
-				'id' => 'view',
-				'title' => $tax->labels->view_item,
-				'href' => get_term_link( $tag )
-			) );
-		}
-	} else {
-		$current_object = $wp_the_query->get_queried_object();
-
-		if ( empty( $current_object ) )
-			return;
-
-		if ( ! empty( $current_object->post_type )
-			&& ( $post_type_object = get_post_type_object( $current_object->post_type ) )
-			&& current_user_can( 'edit_post', $current_object->ID )
-			&& $post_type_object->show_ui && $post_type_object->show_in_admin_bar
-			&& $edit_post_link = get_edit_post_link( $current_object->ID ) )
-		{
-			$wp_admin_bar->add_menu( array(
-				'id' => 'edit',
-				'title' => $post_type_object->labels->edit_item,
-				'href' => $edit_post_link
-			) );
-		} elseif ( ! empty( $current_object->taxonomy )
-			&& ( $tax = get_taxonomy( $current_object->taxonomy ) )
-			&& current_user_can( $tax->cap->edit_terms )
-			&& $tax->show_ui
-			&& $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) )
-		{
-			$wp_admin_bar->add_menu( array(
-				'id' => 'edit',
-				'title' => $tax->labels->edit_item,
-				'href' => $edit_term_link
-			) );
-		}
-	}
-}
-
-/**
- * Add "Add New" menu.
- *
- * @since 3.1.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
-	$actions = array();
-
-	$cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' );
-
-	if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->create_posts ) )
-		$actions[ 'post-new.php' ] = array( $cpts['post']->labels->name_admin_bar, 'new-post' );
-
-	if ( isset( $cpts['attachment'] ) && current_user_can( 'upload_files' ) )
-		$actions[ 'media-new.php' ] = array( $cpts['attachment']->labels->name_admin_bar, 'new-media' );
-
-	if ( current_user_can( 'manage_links' ) )
-		$actions[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
-
-	if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->create_posts ) )
-		$actions[ 'post-new.php?post_type=page' ] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
-
-	unset( $cpts['post'], $cpts['page'], $cpts['attachment'] );
-
-	// Add any additional custom post types.
-	foreach ( $cpts as $cpt ) {
-		if ( ! current_user_can( $cpt->cap->create_posts ) )
-			continue;
-
-		$key = 'post-new.php?post_type=' . $cpt->name;
-		$actions[ $key ] = array( $cpt->labels->name_admin_bar, 'new-' . $cpt->name );
-	}
-	// Avoid clash with parent node and a 'content' post type.
-	if ( isset( $actions['post-new.php?post_type=content'] ) )
-		$actions['post-new.php?post_type=content'][1] = 'add-new-content';
-
-	if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) )
-		$actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
-
-	if ( ! $actions )
-		return;
-
-	$title = '<span class="ab-icon"></span><span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>';
-
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'new-content',
-		'title' => $title,
-		'href'  => admin_url( current( array_keys( $actions ) ) ),
-		'meta'  => array(
-			'title' => _x( 'Add New', 'admin bar menu group label' ),
-		),
-	) );
-
-	foreach ( $actions as $link => $action ) {
-		list( $title, $id ) = $action;
-
-		$wp_admin_bar->add_menu( array(
-			'parent'    => 'new-content',
-			'id'        => $id,
-			'title'     => $title,
-			'href'      => admin_url( $link )
-		) );
-	}
-}
-
-/**
- * Add edit comments link with awaiting moderation count bubble.
- *
- * @since 3.1.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_comments_menu( $wp_admin_bar ) {
-	if ( !current_user_can('edit_posts') )
-		return;
-
-	$awaiting_mod = wp_count_comments();
-	$awaiting_mod = $awaiting_mod->moderated;
-	$awaiting_title = esc_attr( sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) ) );
-
-	$icon  = '<span class="ab-icon"></span>';
-	$title = '<span id="ab-awaiting-mod" class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '">' . number_format_i18n( $awaiting_mod ) . '</span>';
-
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'comments',
-		'title' => $icon . $title,
-		'href'  => admin_url('edit-comments.php'),
-		'meta'  => array( 'title' => $awaiting_title ),
-	) );
-}
-
-/**
- * Add appearance submenu items to the "Site Name" menu.
- *
- * @since 3.1.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
-	$wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
-
-	if ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'themes', 'title' => __('Themes'), 'href' => admin_url('themes.php') ) );
-
-	if ( ! current_user_can( 'edit_theme_options' ) )
-		return;
-
-	if ( current_user_can( 'customize' ) ) {
-		$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'appearance',
-			'id'     => 'customize',
-			'title'  => __('Customize'),
-			'href'   => add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ),
-			'meta'   => array(
-				'class' => 'hide-if-no-customize',
-			),
-		) );
-		add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
-	}
-
-	if ( current_theme_supports( 'widgets' )  )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) );
-
-	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
-
-	if ( current_theme_supports( 'custom-background' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'background', 'title' => __('Background'), 'href' => admin_url('themes.php?page=custom-background') ) );
-
-	if ( current_theme_supports( 'custom-header' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'header', 'title' => __('Header'), 'href' => admin_url('themes.php?page=custom-header') ) );
-}
-
-/**
- * Provide an update link if theme/plugin/core updates are available.
- *
- * @since 3.1.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_updates_menu( $wp_admin_bar ) {
-
-	$update_data = wp_get_update_data();
-
-	if ( !$update_data['counts']['total'] )
-		return;
-
-	$title = '<span class="ab-icon"></span><span class="ab-label">' . number_format_i18n( $update_data['counts']['total'] ) . '</span>';
-	$title .= '<span class="screen-reader-text">' . $update_data['title'] . '</span>';
-
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'updates',
-		'title' => $title,
-		'href'  => network_admin_url( 'update-core.php' ),
-		'meta'  => array(
-			'title' => $update_data['title'],
-		),
-	) );
-}
-
-/**
- * Add search form.
- *
- * @since 3.3.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_search_menu( $wp_admin_bar ) {
-	if ( is_admin() )
-		return;
-
-	$form  = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
-	$form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
-	$form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';
-	$form .= '</form>';
-
-	$wp_admin_bar->add_menu( array(
-		'parent' => 'top-secondary',
-		'id'     => 'search',
-		'title'  => $form,
-		'meta'   => array(
-			'class'    => 'admin-bar-search',
-			'tabindex' => -1,
-		)
-	) );
-}
-
-/**
- * Add secondary menus.
- *
- * @since 3.3.0
- *
- * @param WP_Admin_Bar $wp_admin_bar
- */
-function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
-	$wp_admin_bar->add_group( array(
-		'id'     => 'top-secondary',
-		'meta'   => array(
-			'class' => 'ab-top-secondary',
-		),
-	) );
-
-	$wp_admin_bar->add_group( array(
-		'parent' => 'wp-logo',
-		'id'     => 'wp-logo-external',
-		'meta'   => array(
-			'class' => 'ab-sub-secondary',
-		),
-	) );
-}
-
-/**
- * Style and scripts for the admin bar.
- *
- * @since 3.1.0
- */
-function wp_admin_bar_header() { ?>
-<style type="text/css" media="print">#wpadminbar { display:none; }</style>
-<?php
-}
-
-/**
- * Default admin bar callback.
- *
- * @since 3.1.0
- */
-function _admin_bar_bump_cb() { ?>
-<style type="text/css" media="screen">
-	html { margin-top: 32px !important; }
-	* html body { margin-top: 32px !important; }
-	@media screen and ( max-width: 782px ) {
-		html { margin-top: 46px !important; }
-		* html body { margin-top: 46px !important; }
-	}
-</style>
-<?php
-}
-
-/**
- * Set the display status of the admin bar.
- *
- * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action.
- *
- * @since 3.1.0
- *
- * @param bool $show Whether to allow the admin bar to show.
- * @return void
- */
-function show_admin_bar( $show ) {
-	global $show_admin_bar;
-	$show_admin_bar = (bool) $show;
-}
-
-/**
- * Determine whether the admin bar should be showing.
- *
- * @since 3.1.0
- *
- * @return bool Whether the admin bar should be showing.
- */
-function is_admin_bar_showing() {
-	global $show_admin_bar, $pagenow;
-
-	// For all these types of requests, we never want an admin bar.
-	if ( defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
-		return false;
-
-	// Integrated into the admin.
-	if ( is_admin() )
-		return true;
-
-	if ( ! isset( $show_admin_bar ) ) {
-		if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
-			$show_admin_bar = false;
-		} else {
-			$show_admin_bar = _get_admin_bar_pref();
-		}
-	}
-
-	/**
-	 * Filter whether to show the admin bar.
-	 *
-	 * Returning false to this hook is the recommended way to hide the admin bar.
-	 * The user's display preference is used for logged in users.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param bool $show_admin_bar Whether the admin bar should be shown. Default false.
-	 */
-	$show_admin_bar = apply_filters( 'show_admin_bar', $show_admin_bar );
-
-	return $show_admin_bar;
-}
-
-/**
- * Retrieve the admin bar display preference of a user.
- *
- * @since 3.1.0
- * @access private
- *
- * @param string $context Context of this preference check. Defaults to 'front'. The 'admin'
- * 	preference is no longer used.
- * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
- * @return bool Whether the admin bar should be showing for this user.
- */
-function _get_admin_bar_pref( $context = 'front', $user = 0 ) {
-	$pref = get_user_option( "show_admin_bar_{$context}", $user );
-	if ( false === $pref )
-		return true;
-
-	return 'true' === $pref;
-}