<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19577] trunk: Pinking shears</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19577">19577</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-12-08 23:02:33 +0000 (Thu, 08 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadminrtldevcss">trunk/wp-admin/css/wp-admin-rtl.dev.css</a></li>
<li><a href="#trunkwpadminincludesupdatecorephp">trunk/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunkwpadminnetworksitethemesphp">trunk/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
<li><a href="#trunkwpadminnetworkthemesphp">trunk/wp-admin/network/themes.php</a></li>
<li><a href="#trunkwpadminnetworkusernewphp">trunk/wp-admin/network/user-new.php</a></li>
<li><a href="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.php</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpdialogsjspopupdevjs">trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpfullscreencsswpfullscreencss">trunk/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css</a></li>
<li><a href="#trunkwpincludesjstinymcewpmcehelpphp">trunk/wp-includes/js/tinymce/wp-mce-help.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadminrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin-rtl.dev.css (19576 => 19577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin-rtl.dev.css 2011-12-08 22:55:18 UTC (rev 19576)
+++ trunk/wp-admin/css/wp-admin-rtl.dev.css 2011-12-08 23:02:33 UTC (rev 19577)
</span><span class="lines">@@ -1420,7 +1420,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .about-wrap .feature-section .feature-images img {
</span><del>- margin-right: auto;
</del><ins>+ margin-right: auto;
</ins><span class="cx"> margin-left: 5px;
</span><span class="cx"> }
</span><span class="cx"> .about-wrap .feature-section.images-stagger-left .angled-left {
</span></span></pre></div>
<a id="trunkwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update-core.php (19576 => 19577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update-core.php 2011-12-08 22:55:18 UTC (rev 19576)
+++ trunk/wp-admin/includes/update-core.php 2011-12-08 23:02:33 UTC (rev 19577)
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Load the updated default text localization domain for new strings
</span><span class="cx"> load_default_textdomain();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-themes.php (19576 => 19577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-themes.php 2011-12-08 22:55:18 UTC (rev 19576)
+++ trunk/wp-admin/network/site-themes.php 2011-12-08 23:02:33 UTC (rev 19577)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx"> $s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
</span><span class="cx">
</span><span class="cx"> // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
</span><del>-$temp_args = array( 'enabled', 'disabled', 'error' );
-$_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] );
</del><ins>+$temp_args = array( 'enabled', 'disabled', 'error' );
+$_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] );
</ins><span class="cx"> $referer = remove_query_arg( $temp_args, wp_get_referer() );
</span><span class="cx">
</span><span class="cx"> $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> check_admin_referer( 'disable-theme_' . $_GET['theme'] );
</span><span class="cx"> $theme = $_GET['theme'];
</span><span class="cx"> $action = 'disabled';
</span><del>- $n = 1;
</del><ins>+ $n = 1;
</ins><span class="cx"> if ( !$allowed_themes )
</span><span class="cx"> $allowed_themes = array();
</span><span class="cx"> else
</span><span class="lines">@@ -158,13 +158,13 @@
</span><span class="cx"> </h3><?php
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['enabled'] ) ) {
</span><del>- $_GET['enabled'] = absint( $_GET['enabled'] );
- echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>';
-} elseif ( isset( $_GET['disabled'] ) ) {
- $_GET['disabled'] = absint( $_GET['disabled'] );
- echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>';
-} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
- echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>';
</del><ins>+ $_GET['enabled'] = absint( $_GET['enabled'] );
+ echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>';
+} elseif ( isset( $_GET['disabled'] ) ) {
+ $_GET['disabled'] = absint( $_GET['disabled'] );
+ echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>';
+} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
+ echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>';
</ins><span class="cx"> } ?>
</span><span class="cx">
</span><span class="cx"> <p><?php _e( 'Network enabled themes are not shown on this screen.' ) ?></p>
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (19576 => 19577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2011-12-08 22:55:18 UTC (rev 19576)
+++ trunk/wp-admin/network/site-users.php 2011-12-08 23:02:33 UTC (rev 19577)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span><del>-$_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
</del><ins>+$_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
</ins><span class="cx"> $referer = remove_query_arg( 'update', wp_get_referer() );
</span><span class="cx">
</span><span class="cx"> $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $action ) {
</span><span class="cx"> switch_to_blog( $id );
</span><del>-
</del><ins>+
</ins><span class="cx"> switch ( $action ) {
</span><span class="cx"> case 'newuser':
</span><span class="cx"> check_admin_referer( 'add-user', '_wpnonce_add-new-user' );
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> check_admin_referer( 'add-user', '_wpnonce_add-user' );
</span><span class="cx"> if ( !empty( $_POST['newuser'] ) ) {
</span><span class="cx"> $update = 'adduser';
</span><del>- $newuser = $_POST['newuser'];
</del><ins>+ $newuser = $_POST['newuser'];
</ins><span class="cx"> $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) );
</span><span class="cx"> if ( $userid ) {
</span><span class="cx"> $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='{$blog_prefix}capabilities'" );
</span><span class="lines">@@ -106,12 +106,12 @@
</span><span class="cx"> $update = 'err_add_notfound';
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'remove':
</span><span class="cx"> if ( !current_user_can('remove_users') )
</span><span class="cx"> die(__('You can&#8217;t remove users.'));
</span><span class="cx"> check_admin_referer( 'bulk-users' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $update = 'remove';
</span><span class="cx"> if ( isset( $_REQUEST['users'] ) ) {
</span><span class="cx"> $userids = $_REQUEST['users'];
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> restore_current_blog();
</span><span class="cx"> wp_redirect( add_query_arg( 'update', $update, $referer ) );
</span><span class="cx"> exit();
</span></span></pre></div>
<a id="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (19576 => 19577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php 2011-12-08 22:55:18 UTC (rev 19576)
+++ trunk/wp-admin/network/themes.php 2011-12-08 23:02:33 UTC (rev 19577)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> $referer = remove_query_arg( $temp_args, wp_get_referer() );
</span><span class="cx">
</span><span class="cx"> if ( $action ) {
</span><del>- $allowed_themes = get_site_option( 'allowedthemes' );
</del><ins>+ $allowed_themes = get_site_option( 'allowedthemes' );
</ins><span class="cx"> switch ( $action ) {
</span><span class="cx"> case 'enable':
</span><span class="cx"> check_admin_referer('enable-theme_' . $_GET['theme']);
</span><span class="lines">@@ -128,11 +128,11 @@
</span><span class="cx"> if ( $data['Name'] == $main_theme ) {
</span><span class="cx"> unset( $themes[$key] );
</span><span class="cx"> } else {
</span><del>- $files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) );
</del><ins>+ $files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) );
</ins><span class="cx"> $theme_info[ $theme ] = $data;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty( $themes ) ) {
</span><span class="cx"> wp_redirect( add_query_arg( 'error', 'main', $referer ) );
</span><span class="cx"> exit;
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $themes as $theme )
</span><span class="cx"> $delete_result = delete_theme( $theme, esc_url( add_query_arg( array('verify-delete' => 1), $_SERVER['REQUEST_URI'] ) ) );
</span><del>- $paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
</del><ins>+ $paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
</ins><span class="cx"> wp_redirect( network_admin_url( "themes.php?deleted=".count( $themes )."&paged=$paged&s=$s" ) );
</span><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="lines">@@ -228,8 +228,8 @@
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon('themes'); ?>
</span><span class="cx"> <h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
</span><del>-if ( $s )
- printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
</del><ins>+if ( $s )
+ printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
</ins><span class="cx"> </h2>
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminnetworkusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/user-new.php (19576 => 19577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/user-new.php 2011-12-08 22:55:18 UTC (rev 19576)
+++ trunk/wp-admin/network/user-new.php 2011-12-08 23:02:33 UTC (rev 19577)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> $user = $_POST['user'];
</span><span class="cx">
</span><del>- $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
</del><ins>+ $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
</ins><span class="cx"> if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
</span><span class="cx"> $add_user_errors = $user_details[ 'errors' ];
</span><span class="cx"> } else {
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</span><span class="cx"> <?php } ?>
</span><del>- <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">
</del><ins>+ <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">
</ins><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="cx"> <th scope="row"><?php _e( 'Username' ) ?></th>
</span></span></pre></div>
<a id="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (19576 => 19577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2011-12-08 22:55:18 UTC (rev 19576)
+++ trunk/wp-admin/network/users.php 2011-12-08 23:02:33 UTC (rev 19577)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx">
</span><span class="cx"> wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
</span><span class="cx"> exit();
</span><del>- break;
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> if ( current_user_can( 'create_users') ) : ?>
</span><span class="cx"> <a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
</span><span class="cx"> endif;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !empty( $usersearch ) )
</span><span class="cx"> printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpdialogsjspopupdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js (19576 => 19577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js 2011-12-08 22:55:18 UTC (rev 19576)
+++ trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js 2011-12-08 23:02:33 UTC (rev 19577)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * popup.js
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * An altered version of tinyMCEPopup to work in the same window as tinymce.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * ------------------------------------------------------------------
</span><span class="cx"> *
</span><span class="cx"> * Copyright 2009, Moxiecode Systems AB
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> close();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- // Internal functions
</del><ins>+ // Internal functions
</ins><span class="cx">
</span><span class="cx"> _restoreSelection : function() {
</span><span class="cx"> var e = window.event.srcElement;
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpfullscreencsswpfullscreencss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css (19576 => 19577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css 2011-12-08 22:55:18 UTC (rev 19576)
+++ trunk/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css 2011-12-08 23:02:33 UTC (rev 19577)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> Distraction Free Writing mode TinyMCE Styles
</span><span class="cx"> */
</span><del>-
</del><ins>+
</ins><span class="cx"> html, body {
</span><span class="cx"> background: transparent;
</span><span class="cx"> width: auto !important;
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewpmcehelpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-mce-help.php (19576 => 19577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-help.php 2011-12-08 22:55:18 UTC (rev 19576)
+++ trunk/wp-includes/js/tinymce/wp-mce-help.php 2011-12-08 23:02:33 UTC (rev 19577)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> .macwebkit tr.mac {
</span><span class="cx"> display: table-row;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> </style>
</span><span class="cx"> <?php if ( is_rtl() ) : ?>
</span><span class="cx"> <style type="text/css">
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">
</span><span class="cx"> document.getElementById('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
</span><span class="cx"> document.getElementById('date').innerHTML = tinymce.releaseDate;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( win.fullscreen && win.fullscreen.settings.visible ) {
</span><span class="cx"> d('content1').className = 'hidden';
</span><span class="cx"> d('tabs').className = 'hidden';
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> if ( tinymce.isMac )
</span><span class="cx"> document.body.className = 'macos';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( tinymce.isMac && tinymce.isWebKit )
</span><span class="cx"> document.body.className = 'macos macwebkit';
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>