<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12954] trunk: Integrate remove_tinymce_media_button() into wp_tiny_mce().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12954">12954</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-04 20:00:18 +0000 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Integrate remove_tinymce_media_button() into wp_tiny_mce(). see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludesmsdefaultfiltersphp">trunk/wp-includes/ms-default-filters.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (12953 => 12954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-02-04 19:56:36 UTC (rev 12953)
+++ trunk/wp-admin/includes/post.php 2010-02-04 20:00:18 UTC (rev 12954)
</span><span class="lines">@@ -1407,7 +1407,10 @@
</span><span class="cx"> $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' ));
</span><span class="cx"> $mce_buttons = implode($mce_buttons, ',');
</span><span class="cx">
</span><del>- $mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ));
</del><ins>+ $mce_buttons_2 = array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' );
+ if ( is_multisite() )
+ unset( $mce_buttons_2[ array_search( 'media', $mce_buttons_2 ) ] );
+ $mce_buttons_2 = apply_filters('mce_buttons_2', $mce_buttons_2);
</ins><span class="cx"> $mce_buttons_2 = implode($mce_buttons_2, ',');
</span><span class="cx">
</span><span class="cx"> $mce_buttons_3 = apply_filters('mce_buttons_3', array());
</span></span></pre></div>
<a id="trunkwpincludesmsdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-default-filters.php (12953 => 12954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-default-filters.php 2010-02-04 19:56:36 UTC (rev 12953)
+++ trunk/wp-includes/ms-default-filters.php 2010-02-04 20:00:18 UTC (rev 12954)
</span><span class="lines">@@ -19,7 +19,6 @@
</span><span class="cx"> add_filter ( 'allowed_redirect_hosts', 'redirect_this_site' );
</span><span class="cx">
</span><span class="cx"> // Administration
</span><del>-add_filter ( 'mce_buttons_2', 'remove_tinymce_media_button' );
</del><span class="cx"> add_filter ( 'term_id_filter', 'global_terms', 10, 2 );
</span><span class="cx"> add_action ( 'publish_post', 'update_posts_count' );
</span><span class="cx"> add_action ( 'delete_post', 'wpmu_update_blogs_date' );
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12953 => 12954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-02-04 19:56:36 UTC (rev 12953)
+++ trunk/wp-includes/ms-functions.php 2010-02-04 20:00:18 UTC (rev 12954)
</span><span class="lines">@@ -1758,11 +1758,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function remove_tinymce_media_button( $buttons ) {
- unset( $buttons[ array_search( 'media', $buttons ) ] );
- return $buttons;
-}
-
</del><span class="cx"> function maybe_add_existing_user_to_blog() {
</span><span class="cx"> if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -1823,7 +1818,7 @@
</span><span class="cx"> update_blog_status( $wpdb->blogid, 'public', (int) $value );
</span><span class="cx"> }
</span><span class="cx"> add_action('update_option_blog_public', 'update_blog_public', 10, 2);
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Redirect all hits to "dashboard" blog to wp-admin/ Dashboard. */
</span><span class="cx"> function redirect_mu_dashboard() {
</span><span class="cx"> global $current_site, $current_blog;
</span></span></pre>
</div>
</div>
</body>
</html>