<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[12029] trunk/wp-admin: Remove remains from the old bookmarklet code</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12029">12029</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-10-14 05:53:49 +0000 (Wed, 14 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove remains from the old bookmarklet code</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadmineditpageformphp">trunk/wp-admin/edit-page-form.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminpagephp">trunk/wp-admin/page.php</a></li>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (12028 => 12029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2009-10-14 02:30:51 UTC (rev 12028)
+++ trunk/wp-admin/admin.php 2009-10-14 05:53:49 UTC (rev 12029)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> $date_format = get_option('date_format');
</span><span class="cx"> $time_format = get_option('time_format');
</span><span class="cx">
</span><del>-wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
</del><ins>+wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'text', 'trackback', 'pingback'));
</ins><span class="cx">
</span><span class="cx"> wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7'));
</span><span class="cx"> wp_admin_css_color('fresh', __('Gray'), admin_url("css/colors-fresh.css"), array('#464646', '#6D6D6D', '#F1F1F1', '#DFDFDF'));
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (12028 => 12029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2009-10-14 02:30:51 UTC (rev 12028)
+++ trunk/wp-admin/edit-form-advanced.php 2009-10-14 05:53:49 UTC (rev 12029)
</span><span class="lines">@@ -128,10 +128,6 @@
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
-<input type="hidden" name="mode" value="bookmarklet" />
-<?php endif; ?>
-
</del><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span></span></pre></div>
<a id="trunkwpadmineditpageformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-page-form.php (12028 => 12029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-page-form.php 2009-10-14 02:30:51 UTC (rev 12028)
+++ trunk/wp-admin/edit-page-form.php 2009-10-14 05:53:49 UTC (rev 12029)
</span><span class="lines">@@ -109,12 +109,8 @@
</span><span class="cx"> <div id="message" class="updated fade"><p><?php echo $message; ?></p></div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<?php
-wp_nonce_field($nonce_action);
</del><ins>+<?php wp_nonce_field($nonce_action); ?>
</ins><span class="cx">
</span><del>-if (isset($mode) && 'bookmarklet' == $mode)
- echo '<input type="hidden" name="mode" value="bookmarklet" />';
-?>
</del><span class="cx"> <input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
</span><span class="cx"> <input type="hidden" id="hiddenaction" name="action" value='<?php echo esc_attr($form_action) ?>' />
</span><span class="cx"> <input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr($form_action) ?>" />
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (12028 => 12029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2009-10-14 02:30:51 UTC (rev 12028)
+++ trunk/wp-admin/includes/post.php 2009-10-14 05:53:49 UTC (rev 12029)
</span><span class="lines">@@ -326,29 +326,18 @@
</span><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><span class="cx"> function get_default_post_to_edit() {
</span><ins>+
+ $post_title = '';
</ins><span class="cx"> if ( !empty( $_REQUEST['post_title'] ) )
</span><span class="cx"> $post_title = esc_html( stripslashes( $_REQUEST['post_title'] ));
</span><del>- else if ( !empty( $_REQUEST['popuptitle'] ) ) {
- $post_title = esc_html( stripslashes( $_REQUEST['popuptitle'] ));
- $post_title = funky_javascript_fix( $post_title );
- } else {
- $post_title = '';
- }
</del><span class="cx">
</span><span class="cx"> $post_content = '';
</span><span class="cx"> if ( !empty( $_REQUEST['content'] ) )
</span><span class="cx"> $post_content = esc_html( stripslashes( $_REQUEST['content'] ));
</span><del>- else if ( !empty( $post_title ) ) {
- $text = esc_html( stripslashes( urldecode( $_REQUEST['text'] ) ) );
- $text = funky_javascript_fix( $text);
- $popupurl = esc_url($_REQUEST['popupurl']);
- $post_content = '<a href="'.$popupurl.'">'.$post_title.'</a>'."\n$text";
- }
</del><span class="cx">
</span><ins>+ $post_excerpt = '';
</ins><span class="cx"> if ( !empty( $_REQUEST['excerpt'] ) )
</span><span class="cx"> $post_excerpt = esc_html( stripslashes( $_REQUEST['excerpt'] ));
</span><del>- else
- $post_excerpt = '';
</del><span class="cx">
</span><span class="cx"> $post->ID = 0;
</span><span class="cx"> $post->post_name = '';
</span></span></pre></div>
<a id="trunkwpadminpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/page.php (12028 => 12029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/page.php 2009-10-14 02:30:51 UTC (rev 12028)
+++ trunk/wp-admin/page.php 2009-10-14 05:53:49 UTC (rev 12029)
</span><span class="lines">@@ -31,9 +31,7 @@
</span><span class="cx"> }
</span><span class="cx"> $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
</span><span class="cx">
</span><del>- if ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'bookmarklet' == $_POST['mode'] ) {
- $location = $_POST['referredby'];
- } elseif ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
</del><ins>+ if ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
</ins><span class="cx"> $location = 'sidebar.php?a=b';
</span><span class="cx"> } elseif ( isset($_POST['save']) || isset($_POST['publish']) ) {
</span><span class="cx"> $status = get_post_status( $page_ID );
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (12028 => 12029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2009-10-14 02:30:51 UTC (rev 12028)
+++ trunk/wp-admin/post.php 2009-10-14 05:53:49 UTC (rev 12029)
</span><span class="lines">@@ -31,9 +31,7 @@
</span><span class="cx"> }
</span><span class="cx"> $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
</span><span class="cx">
</span><del>- if ( !empty($_POST['mode']) && 'bookmarklet' == $_POST['mode'] ) {
- $location = $_POST['referredby'];
- } elseif ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
</del><ins>+ if ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
</ins><span class="cx"> if ( isset($_POST['saveasdraft']) )
</span><span class="cx"> $location = 'sidebar.php?a=c';
</span><span class="cx"> elseif ( isset($_POST['publish']) )
</span></span></pre>
</div>
</div>
</body>
</html>