WordPress.org
Get WordPress

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/admin-functions.php

    r5453 r4760  
    2323
    2424    // Check for autosave collisions
    25     $temp_id = false;
    2625    if ( isset($_POST['temp_ID']) ) {
    2726        $temp_id = (int) $_POST['temp_ID'];
    … …  
    3534            $_POST['post_ID'] = $draft_ids[$temp_id];
    3635            unset($_POST['temp_ID']);
     36            relocate_children( $temp_id, $_POST['post_ID'] );
    3737            update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
    3838            return edit_post();
    … …  
    113113
    114114    // Reunite any orphaned attachments with their parent
    115     if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
    116         $draft_ids = array();
    117     if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) )
    118         relocate_children( $draft_temp_id, $post_ID );
    119     if ( $temp_id && $temp_id != $draft_temp_id )
    120         relocate_children( $temp_id, $post_ID );
    121 
    122115    // Update autosave collision detection
    123116    if ( $temp_id ) {
     117        relocate_children( $temp_id, $post_ID );
    124118        $draft_ids[$temp_id] = $post_ID;
    125119        update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
    … …  
    146140    $post = & get_post( $post_ID, ARRAY_A );
    147141
    148     $search = "#<a[^>]+rel=('|\")[^'\"]*attachment[^>]*>#ie";
     142    $search = "#<a[^>]+rel=('|\" )[^'\"]*attachment[^>]*>#ie";
    149143
    150144    // See if we have any rel="attachment" links
    … …  
    153147
    154148    $i = 0;
    155     $search = "#[\s]+rel=(\"|')(.*?)wp-att-(\d+)\\1#i";
     149    $search = "#[\s]+rel=(\"|' )(.*? )wp-att-(\d+ )\\1#i";
    156150    foreach ( $anchor_matches[0] as $anchor ) {
    157151        if ( 0 == preg_match( $search, $anchor, $id_matches ) )
    158152            continue;
    159153
    160         $id = (int) $id_matches[3];
     154        $id = $id_matches[3];
    161155
    162156        // While we have the attachment ID, let's adopt any orphans.
    … …  
    286280    add_meta( $post_ID );
    287281
    288     wp_update_post( $_POST );
    289 
    290     // Reunite any orphaned attachments with their parent
    291     if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
    292         $draft_ids = array();
    293     if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) )
    294         relocate_children( $draft_temp_id, $post_ID );
     282    wp_update_post( $_POST);
    295283
    296284    // Now that we have an ID we can fix any attachment anchor hrefs
    … …  
    371359        $text       = wp_specialchars( stripslashes( urldecode( $_REQUEST['text'] ) ) );
    372360        $text       = funky_javascript_fix( $text);
    373         $popupurl   = clean_url($_REQUEST['popupurl']);
     361        $popupurl   = attribute_escape($_REQUEST['popupurl']);
    374362        $post_content = '<a href="'.$popupurl.'">'.$post_title.'</a>'."\n$text";
    375363    }
    … …  
    430418    $user->user_login   = attribute_escape($user->user_login);
    431419    $user->user_email   = attribute_escape($user->user_email);
    432     $user->user_url     = clean_url($user->user_url);
     420    $user->user_url     = attribute_escape($user->user_url);
    433421    $user->first_name   = attribute_escape($user->first_name);
    434422    $user->last_name    = attribute_escape($user->last_name);
    … …  
    448436    if ( func_num_args() ) { // The hackiest hack that ever did hack
    449437        global $current_user, $wp_roles;
    450         $user_id = (int) func_get_arg( 0 );
     438        $user_id = func_get_arg( 0 );
    451439
    452440        if ( isset( $_POST['role'] ) ) {
    … …  
    466454    if ( $user_id != 0 ) {
    467455        $update = true;
    468         $user->ID = (int) $user_id;
     456        $user->ID = $user_id;
    469457        $userdata = get_userdata( $user_id );
    470458        $user->user_login = $wpdb->escape( $userdata->user_login );
    … …  
    491479        $user->user_email = wp_specialchars( trim( $_POST['email'] ));
    492480    if ( isset( $_POST['url'] ) ) {
    493         $user->user_url = clean_url( trim( $_POST['url'] ));
     481        $user->user_url = wp_specialchars( trim( $_POST['url'] ));
    494482        $user->user_url = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
    495483    }
    … …  
    575563    $link = get_link( $link_id );
    576564
    577     $link->link_url         = clean_url($link->link_url);
     565    $link->link_url         = attribute_escape($link->link_url);
    578566    $link->link_name        = attribute_escape($link->link_name);
    579567    $link->link_image       = attribute_escape($link->link_image);
    580568    $link->link_description = attribute_escape($link->link_description);
    581     $link->link_rss         = clean_url($link->link_rss);
     569    $link->link_rss         = attribute_escape($link->link_rss);
    582570    $link->link_rel         = attribute_escape($link->link_rel);
    583571    $link->link_notes       =  wp_specialchars($link->link_notes);
    … …  
    589577function get_default_link_to_edit() {
    590578    if ( isset( $_GET['linkurl'] ) )
    591         $link->link_url = clean_url( $_GET['linkurl']);
     579        $link->link_url = attribute_escape( $_GET['linkurl']);
    592580    else
    593581        $link->link_url = '';
    … …  
    612600
    613601    $_POST['link_url'] = wp_specialchars( $_POST['link_url'] );
    614     $_POST['link_url'] = clean_url($_POST['link_url']);
     602    $_POST['link_url'] = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $_POST['link_url']) ? $_POST['link_url'] : 'http://' . $_POST['link_url'];
    615603    $_POST['link_name'] = wp_specialchars( $_POST['link_name'] );
    616604    $_POST['link_image'] = wp_specialchars( $_POST['link_image'] );
    617     $_POST['link_rss'] = clean_url($_POST['link_rss']);
     605    $_POST['link_rss'] = wp_specialchars( $_POST['link_rss'] );
    618606    $_POST['link_category'] = $_POST['post_category'];
    619607
    … …  
    682670            // No selected categories, strange
    683671            $checked_categories[] = $default;
    684         }
     672        }   
    685673    } else {
    686674        $checked_categories[] = $default;
    … …  
    706694function write_nested_categories( $categories ) {
    707695    foreach ( $categories as $category ) {
    708         echo '<li id="category-', $category['cat_ID'], '"><label for="in-category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="in-category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : "" ), '/> ', wp_specialchars( apply_filters('the_category', $category['cat_name'] )), "</label></li>";
     696        echo '<li id="category-', $category['cat_ID'], '"><label for="in-category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="in-category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : "" ), '/> ', wp_specialchars( $category['cat_name'] ), "</label></li>";
    709697
    710698        if ( $category['children'] ) {
    … …  
    738726            // No selected categories, strange
    739727            $checked_categories[] = $default;
    740         }
     728        }   
    741729    } else {
    742730        $checked_categories[] = $default;
    … …  
    769757        $categories = get_categories( 'hide_empty=0' );
    770758
    771     $children = _get_category_hierarchy();
    772 
    773759    if ( $categories ) {
    774760        ob_start();
    … …  
    776762            if ( $category->category_parent == $parent) {
    777763                echo "\t" . _cat_row( $category, $level );
    778                 if ( isset($children[$category->cat_ID]) )
    779                     cat_rows( $category->cat_ID, $level +1, $categories );
     764                cat_rows( $category->cat_ID, $level +1, $categories );
    780765            }
    781766        }
    782767        $output = ob_get_contents();
    783768        ob_end_clean();
    784 
     769       
    785770        $output = apply_filters('cat_rows', $output);
    786771
    … …  
    797782    if ( current_user_can( 'manage_categories' ) ) {
    798783        $edit = "<a href='categories.php?action=edit&amp;cat_ID=$category->cat_ID' class='edit'>".__( 'Edit' )."</a></td>";
    799         $default_cat_id = (int) get_option( 'default_category' );
    800         $default_link_cat_id = (int) get_option( 'default_link_category' );
     784        $default_cat_id = get_option( 'default_category' );
     785        $default_link_cat_id = get_option( 'default_link_category' );
    801786
    802787        if ( ($category->cat_ID != $default_cat_id ) && ($category->cat_ID != $default_link_cat_id ) )
    803             $edit .= "<td><a href='" . wp_nonce_url( "categories.php?action=delete&amp;cat_ID=$category->cat_ID", 'delete-category_' . $category->cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll posts that were only assigned to this category will be assigned to the '%s' category.\nAll links that were only assigned to this category will be assigned to the '%s' category.\n'OK' to delete, 'Cancel' to stop." ), $category->cat_name, get_catname( $default_cat_id ), get_catname( $default_link_cat_id ) )) . "' );\" class='delete'>".__( 'Delete' )."</a>";
     788            $edit .= "<td><a href='" . wp_nonce_url( "categories.php?action=delete&amp;cat_ID=$category->cat_ID", 'delete-category_' . $category->cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll of its posts will go into the default category of '%s'\nAll of its bookmarks will go into the default category of '%s'.\n'OK' to delete, 'Cancel' to stop." ), $category->cat_name, get_catname( $default_cat_id ), get_catname( $default_link_cat_id ) )) . "' );\" class='delete'>".__( 'Delete' )."</a>";
    804789        else
    805790            $edit .= "<td style='text-align:center'>".__( "Default" );
    … …  
    837822        $post->post_title = wp_specialchars( $post->post_title );
    838823        $pad = str_repeat( '&#8212; ', $level );
    839         $id = (int) $post->ID;
     824        $id = $post->ID;
    840825        $class = ('alternate' == $class ) ? '' : 'alternate';
    841826?>
    … …  
    846831    </td>
    847832    <td><?php the_author() ?></td>
    848     <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $post->post_modified ); ?></td>
     833    <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( 'Y-m-d g:i a', $post->post_modified ); ?></td>
    849834    <td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e( 'View' ); ?></a></td>
    850835    <td><?php if ( current_user_can( 'edit_page', $id ) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td>
    … …  
    883868    $r .= "</td>\n\t\t<td>";
    884869    if ( current_user_can( 'edit_user', $user_object->ID ) ) {
    885         $edit_link = add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" );
     870        $edit_link = attribute_escape( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), "user-edit.php?user_id=$user_object->ID" ));
    886871        $r .= "<a href='$edit_link' class='edit'>".__( 'Edit' )."</a>";
    887872    }
    888873    $r .= "</td>\n\t</tr>";
    889874    return $r;
    890 }
    891 
    892 function _wp_get_comment_list( $s = false, $start, $num ) {
    893     global $wpdb;
    894 
    895     $start = (int) $start;
    896     $num = (int) $num;
    897 
    898     if ( $s ) {
    899         $s = $wpdb->escape($s);
    900         $comments = $wpdb->get_results("SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE
    901             (comment_author LIKE '%$s%' OR
    902             comment_author_email LIKE '%$s%' OR
    903             comment_author_url LIKE ('%$s%') OR
    904             comment_author_IP LIKE ('%$s%') OR
    905             comment_content LIKE ('%$s%') ) AND
    906             comment_approved != 'spam'
    907             ORDER BY comment_date DESC LIMIT $start, $num");
    908     } else {
    909         $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE comment_approved = '0' OR comment_approved = '1' ORDER BY comment_date DESC LIMIT $start, $num" );
    910     }
    911 
    912     $total = $wpdb->get_var( "SELECT FOUND_ROWS()" );
    913 
    914     return array($comments, $total);
    915 }
    916 
    917 function _wp_comment_list_item( $id, $alt = 0 ) {
    918     global $authordata, $comment, $wpdb;
    919     $id = (int) $id;
    920     $comment =& get_comment( $id );
    921     $class = '';
    922     $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
    923     $comment_status = wp_get_comment_status($comment->comment_ID);
    924     if ( 'unapproved' == $comment_status )
    925         $class .= ' unapproved';
    926     if ( $alt % 2 )
    927         $class .= ' alternate';
    928     echo "<li id='comment-$comment->comment_ID' class='$class'>";
    929 ?>
    930 <p><strong><?php comment_author(); ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
    931 
    932 <?php comment_text() ?>
    933 
    934 <p><?php comment_date(__('M j, g:i A'));  ?> &#8212; [
    935 <?php
    936 if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
    937     echo " <a href='comment.php?action=editcomment&amp;c=".$comment->comment_ID."'>" .  __('Edit') . '</a>';
    938     echo ' | <a href="' . wp_nonce_url('ocomment.php?action=deletecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> ';
    939     if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
    940         echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>';
    941         echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>';
    942     }
    943     echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&amp;dt=spam&amp;p=" . $comment->comment_post_ID . "&amp;c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), $comment->comment_author))  . "', theCommentList );\">" . __('Spam') . "</a> ";
    944 }
    945 $post = get_post($comment->comment_post_ID);
    946 $post_title = wp_specialchars( $post->post_title, 'double' );
    947 $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
    948 ?>
    949  ] &#8212; <a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php echo $post_title; ?></a></p>
    950         </li>
    951 <?php
    952875}
    953876
    … …  
    12091132            $state = true;
    12101133            foreach ( $markerdata as $n => $markerline ) {
    1211                 if (strpos($markerline, '# BEGIN ' . $marker) !== false)
     1134                if ( strstr( $markerline, "# BEGIN {$marker}" ))
    12121135                    $state = false;
    12131136                if ( $state ) {
    … …  
    12171140                        fwrite( $f, "{$markerline}" );
    12181141                }
    1219                 if (strpos($markerline, '# END ' . $marker) !== false) {
     1142                if ( strstr( $markerline, "# END {$marker}" ) ) {
    12201143                    fwrite( $f, "# BEGIN {$marker}\n" );
    12211144                    if ( is_array( $insertion ))
    … …  
    12551178        $state = false;
    12561179        foreach ( $markerdata as $markerline ) {
    1257             if (strpos($markerline, '# END ' . $marker) !== false)
     1180            if ( strstr( $markerline, "# END {$marker}" ))
    12581181                $state = false;
    12591182            if ( $state )
    12601183                $result[] = $markerline;
    1261             if (strpos($markerline, '# BEGIN ' . $marker) !== false)
     1184            if ( strstr( $markerline, "# BEGIN {$marker}" ))
    12621185                $state = true;
    12631186        }
    … …  
    13471270    if ( $items ) {
    13481271        foreach ( $items as $item ) {
    1349             // A page cannot be its own parent.
     1272            // A page cannot be it's own parent.
    13501273            if (!empty ( $post_ID ) ) {
    13511274                if ( $item->ID == $post_ID ) {
    … …  
    13821305    if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
    13831306        return false;
    1384 
     1307   
    13851308    if ( empty( $parent) ) {
    13861309        if ( isset( $_wp_menu_nopriv[$pagenow] ) )
    … …  
    13941317                return false;
    13951318            if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
    1396             return false;
     1319            return false;   
    13971320        }
    13981321        return true;
    … …  
    15161439                    $parent_file = $_wp_real_parent_file[$parent_file];
    15171440            return $parent_file;
    1518         }
     1441        }           
    15191442    }
    15201443
    … …  
    15231446        if ( isset( $_wp_real_parent_file[$parent_file] ) )
    15241447            $parent_file = $_wp_real_parent_file[$parent_file];
    1525         return $parent_file;
     1448        return $parent_file;       
    15261449    }
    15271450
    … …  
    16111534}
    16121535
    1613 function add_users_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
    1614     if ( current_user_can('edit_users') )
    1615         $parent = 'users.php';
    1616     else
    1617         $parent = 'profile.php';
    1618     return add_submenu_page( $parent, $page_title, $menu_title, $access_level, $file, $function );
    1619 }
    1620 
    16211536function validate_file( $file, $allowed_files = '' ) {
    16221537    if ( false !== strpos( $file, './' ))
    … …  
    16881603    elseif ( file_exists( ABSPATH . $file ) && is_file( ABSPATH . $file ) ) {
    16891604        $template_data = implode( '', file( ABSPATH . $file ) );
    1690         if ( preg_match( "|Template Name:(.*)|i", $template_data, $name ))
     1605        if ( preg_match( "|Template Name:(.* )|i", $template_data, $name ))
    16911606            return $name[1];
    16921607    }
    … …  
    17371652    }
    17381653
    1739     return array('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version);
     1654    return array ('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1] );
    17401655}
    17411656
    … …  
    17541669    if ( $plugins_dir ) {
    17551670        while (($file = $plugins_dir->read() ) !== false ) {
    1756             if ( substr($file, 0, 1) == '.' )
     1671            if ( preg_match( '|^\.+$|', $file ))
    17571672                continue;
    17581673            if ( is_dir( $plugin_root.'/'.$file ) ) {
    … …  
    17601675                if ( $plugins_subdir ) {
    17611676                    while (($subfile = $plugins_subdir->read() ) !== false ) {
    1762                         if ( substr($subfile, 0, 1) == '.' )
     1677                        if ( preg_match( '|^\.+$|', $subfile ))
    17631678                            continue;
    1764                         if ( substr($subfile, -4) == '.php' )
     1679                        if ( preg_match( '|\.php$|', $subfile ))
    17651680                            $plugin_files[] = "$file/$subfile";
    17661681                    }
    17671682                }
    17681683            } else {
    1769                 if ( substr($file, -4) == '.php' )
     1684                if ( preg_match( '|\.php$|', $file ))
    17701685                    $plugin_files[] = $file;
    17711686            }
    … …  
    18321747        ';
    18331748}
    1834 
    1835 if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)
     1749if ( strstr( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ))
    18361750    add_action( 'admin_footer', 'browse_happy' );
    18371751
    … …  
    18481762function get_importers() {
    18491763    global $wp_importers;
    1850     uasort($wp_importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
     1764
    18511765    return $wp_importers;
    18521766}
    … …  
    19721886    // Compute the URL
    19731887    $url = $uploads['url'] . "/$filename";
    1974 
     1888   
    19751889    $return = apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ) );
    19761890
    … …  
    19941908    $size = strtolower( ini_get( 'upload_max_filesize' ) );
    19951909    $bytes = 0;
    1996     if (strpos($size, 'k') !== false)
     1910    if ( strstr( $size, 'k' ) )
    19971911        $bytes = $size * 1024;
    1998     if (strpos($size, 'm') !== false)
     1912    if ( strstr( $size, 'm' ) )
    19991913        $bytes = $size * 1024 * 1024;
    2000     if (strpos($size, 'g') !== false)
     1914    if ( strstr( $size, 'g' ) )
    20011915        $bytes = $size * 1024 * 1024 * 1024;
    20021916?>
    2003 <form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo attribute_escape($action) ?>">
     1917<form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo $action ?>">
    20041918<p>
    2005 <?php wp_nonce_field('import-upload'); ?>
    20061919<label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?> )
    20071920<input type="file" id="upload" name="import" size="25" />
    … …  
    21322045    wp_clearcookie();
    21332046    // Set cookies for new paths.
    2134     wp_setcookie( $user_login, $user_pass_md5, true, get_option( 'home' ), get_option( 'siteurl' ));
     2047    wp_setcookie( $user_login, $user_pass_md5, true, get_option( 'home' ), get_option( 'siteurl' ));   
    21352048}
    21362049
    … …  
    21542067    }
    21552068
    2156     if (function_exists('imageantialias'))
    2157         imageantialias( $dst, true );
    2158    
     2069    imageantialias( $dst, true );
    21592070    imagecopyresampled( $dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
    21602071
    … …  
    22762187            // If no filters change the filename, we'll do a default transformation.
    22772188            if ( basename( $file ) == $thumb = apply_filters( 'thumbnail_filename', basename( $file ) ) )
    2278                 $thumb = preg_replace( '!(\.[^.]+)?$!', '.thumbnail' . '$1', basename( $file ), 1 );
     2189                $thumb = preg_replace( '!(\.[^.]+)?$!', __( '.thumbnail' ).'$1', basename( $file ), 1 );
    22792190
    22802191            $thumbpath = str_replace( basename( $file ), $thumb, $file );
    22812192
    2282             // move the thumbnail to its final destination
     2193            // move the thumbnail to it's final destination
    22832194            if ( $type[2] == 1 ) {
    22842195                if (!imagegif( $thumbnail, $thumbpath ) ) {
    … …  
    23052216        return $error;
    23062217    } else {
    2307         return apply_filters( 'wp_create_thumbnail', $thumbpath );
     2218        apply_filters( 'wp_create_thumbnail', $thumbpath );
     2219        return $thumbpath;
    23082220    }
    23092221}
Note: See TracChangeset for help on using the changeset viewer.