Changeset 12029

Timestamp:

10/14/2009 05:53:49 AM (17 years ago)

Author:

azaozz

Message:

Remove remains from the old bookmarklet code

Location:

trunk/wp-admin

Files:

• admin.php (modified) (1 diff)
• edit-form-advanced.php (modified) (1 diff)
• edit-page-form.php (modified) (1 diff)
• includes/post.php (modified) (1 diff)
• page.php (modified) (1 diff)
• post.php (modified) (1 diff)

trunk/wp-admin/admin.php

@@ -49 +49 @@
 $time_format = get_option('time_format');
 
-wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
+wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'text', 'trackback', 'pingback'));
 
 wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7'));

trunk/wp-admin/edit-form-advanced.php

@@ -128 +128 @@
 
 ?>
-
-<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
-<input type="hidden" name="mode" value="bookmarklet" />
-<?php endif; ?>
 
 <div class="wrap">

trunk/wp-admin/edit-page-form.php

@@ -110 +110 @@
 <?php endif; ?>
 
-<?php
-wp_nonce_field($nonce_action);
+<?php wp_nonce_field($nonce_action); ?>
 
-if (isset($mode) && 'bookmarklet' == $mode)
-        echo '<input type="hidden" name="mode" value="bookmarklet" />';
-?>
 <input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
 <input type="hidden" id="hiddenaction" name="action" value='<?php echo esc_attr($form_action) ?>' />

trunk/wp-admin/includes/post.php

@@ -327 +327 @@
  */
 function get_default_post_to_edit() {
+
+        $post_title = '';
         if ( !empty( $_REQUEST['post_title'] ) )
                 $post_title = esc_html( stripslashes( $_REQUEST['post_title'] ));
-        else if ( !empty( $_REQUEST['popuptitle'] ) ) {
-                $post_title = esc_html( stripslashes( $_REQUEST['popuptitle'] ));
-                $post_title = funky_javascript_fix( $post_title );
-        } else {
-                $post_title = '';
-        }
 
         $post_content = '';
         if ( !empty( $_REQUEST['content'] ) )
                 $post_content = esc_html( stripslashes( $_REQUEST['content'] ));
-        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";
-        }
-
+
+        $post_excerpt = '';
         if ( !empty( $_REQUEST['excerpt'] ) )
                 $post_excerpt = esc_html( stripslashes( $_REQUEST['excerpt'] ));
-        else
-                $post_excerpt = '';
 
         $post->ID = 0;

trunk/wp-admin/page.php

@@ -32 +32 @@
         $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
 
-        if ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'bookmarklet' == $_POST['mode'] ) {
-                $location = $_POST['referredby'];
-        } elseif ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
+        if ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
                 $location = 'sidebar.php?a=b';
         } elseif ( isset($_POST['save']) || isset($_POST['publish']) ) {

trunk/wp-admin/post.php

@@ -32 +32 @@
         $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
 
-        if ( !empty($_POST['mode']) && 'bookmarklet' == $_POST['mode'] ) {
-                $location = $_POST['referredby'];
-        } elseif ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
+        if ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
                 if ( isset($_POST['saveasdraft']) )
                         $location = 'sidebar.php?a=c';