Make WordPress Core

Changeset 12029


Ignore:
Timestamp:
10/14/2009 05:53:49 AM (16 years ago)
Author:
azaozz
Message:

Remove remains from the old bookmarklet code

Location:
trunk/wp-admin
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin.php

    r11578 r12029  
    4949$time_format = get_option('time_format');
    5050
    51 wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
     51wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'text', 'trackback', 'pingback'));
    5252
    5353wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7'));
  • trunk/wp-admin/edit-form-advanced.php

    r12022 r12029  
    128128
    129129?>
    130 
    131 <?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
    132 <input type="hidden" name="mode" value="bookmarklet" />
    133 <?php endif; ?>
    134130
    135131<div class="wrap">
  • trunk/wp-admin/edit-page-form.php

    r12022 r12029  
    110110<?php endif; ?>
    111111
    112 <?php
    113 wp_nonce_field($nonce_action);
     112<?php wp_nonce_field($nonce_action); ?>
    114113
    115 if (isset($mode) && 'bookmarklet' == $mode)
    116     echo '<input type="hidden" name="mode" value="bookmarklet" />';
    117 ?>
    118114<input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
    119115<input type="hidden" id="hiddenaction" name="action" value='<?php echo esc_attr($form_action) ?>' />
  • trunk/wp-admin/includes/post.php

    r12022 r12029  
    327327 */
    328328function get_default_post_to_edit() {
     329
     330    $post_title = '';
    329331    if ( !empty( $_REQUEST['post_title'] ) )
    330332        $post_title = esc_html( stripslashes( $_REQUEST['post_title'] ));
    331     else if ( !empty( $_REQUEST['popuptitle'] ) ) {
    332         $post_title = esc_html( stripslashes( $_REQUEST['popuptitle'] ));
    333         $post_title = funky_javascript_fix( $post_title );
    334     } else {
    335         $post_title = '';
    336     }
    337333
    338334    $post_content = '';
    339335    if ( !empty( $_REQUEST['content'] ) )
    340336        $post_content = esc_html( stripslashes( $_REQUEST['content'] ));
    341     else if ( !empty( $post_title ) ) {
    342         $text       = esc_html( stripslashes( urldecode( $_REQUEST['text'] ) ) );
    343         $text       = funky_javascript_fix( $text);
    344         $popupurl   = esc_url($_REQUEST['popupurl']);
    345         $post_content = '<a href="'.$popupurl.'">'.$post_title.'</a>'."\n$text";
    346     }
    347 
     337
     338    $post_excerpt = '';
    348339    if ( !empty( $_REQUEST['excerpt'] ) )
    349340        $post_excerpt = esc_html( stripslashes( $_REQUEST['excerpt'] ));
    350     else
    351         $post_excerpt = '';
    352341
    353342    $post->ID = 0;
  • trunk/wp-admin/page.php

    r12022 r12029  
    3232    $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
    3333
    34     if ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'bookmarklet' == $_POST['mode'] ) {
    35         $location = $_POST['referredby'];
    36     } elseif ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
     34    if ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
    3735        $location = 'sidebar.php?a=b';
    3836    } elseif ( isset($_POST['save']) || isset($_POST['publish']) ) {
  • trunk/wp-admin/post.php

    r12020 r12029  
    3232    $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
    3333
    34     if ( !empty($_POST['mode']) && 'bookmarklet' == $_POST['mode'] ) {
    35         $location = $_POST['referredby'];
    36     } elseif ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
     34    if ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
    3735        if ( isset($_POST['saveasdraft']) )
    3836            $location = 'sidebar.php?a=c';
Note: See TracChangeset for help on using the changeset viewer.