WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2/wp-admin/admin-functions.php

    r5120 r5453  
    2323
    2424    // Check for autosave collisions
     25    $temp_id = false;
    2526    if ( isset($_POST['temp_ID']) ) {
    2627        $temp_id = (int) $_POST['temp_ID'];
     
    3435            $_POST['post_ID'] = $draft_ids[$temp_id];
    3536            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
    115122    // Update autosave collision detection
    116123    if ( $temp_id ) {
    117         relocate_children( $temp_id, $post_ID );
    118124        $draft_ids[$temp_id] = $post_ID;
    119125        update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
     
    280286    add_meta( $post_ID );
    281287
    282     wp_update_post( $_POST);
     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 );
    283295
    284296    // Now that we have an ID we can fix any attachment anchor hrefs
     
    670682            // No selected categories, strange
    671683            $checked_categories[] = $default;
    672         }   
     684        }
    673685    } else {
    674686        $checked_categories[] = $default;
     
    694706function write_nested_categories( $categories ) {
    695707    foreach ( $categories as $category ) {
    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>";
     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>";
    697709
    698710        if ( $category['children'] ) {
     
    726738            // No selected categories, strange
    727739            $checked_categories[] = $default;
    728         }   
     740        }
    729741    } else {
    730742        $checked_categories[] = $default;
     
    757769        $categories = get_categories( 'hide_empty=0' );
    758770
     771    $children = _get_category_hierarchy();
     772
    759773    if ( $categories ) {
    760774        ob_start();
     
    762776            if ( $category->category_parent == $parent) {
    763777                echo "\t" . _cat_row( $category, $level );
    764                 cat_rows( $category->cat_ID, $level +1, $categories );
     778                if ( isset($children[$category->cat_ID]) )
     779                    cat_rows( $category->cat_ID, $level +1, $categories );
    765780            }
    766781        }
    767782        $output = ob_get_contents();
    768783        ob_end_clean();
    769        
     784
    770785        $output = apply_filters('cat_rows', $output);
    771786
     
    786801
    787802        if ( ($category->cat_ID != $default_cat_id ) && ($category->cat_ID != $default_link_cat_id ) )
    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>";
     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>";
    789804        else
    790805            $edit .= "<td style='text-align:center'>".__( "Default" );
     
    873888    $r .= "</td>\n\t</tr>";
    874889    return $r;
     890}
     891
     892function _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
     917function _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
     936if ( 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
    875952}
    876953
     
    11321209            $state = true;
    11331210            foreach ( $markerdata as $n => $markerline ) {
    1134                 if ( strstr( $markerline, "# BEGIN {$marker}" ))
     1211                if (strpos($markerline, '# BEGIN ' . $marker) !== false)
    11351212                    $state = false;
    11361213                if ( $state ) {
     
    11401217                        fwrite( $f, "{$markerline}" );
    11411218                }
    1142                 if ( strstr( $markerline, "# END {$marker}" ) ) {
     1219                if (strpos($markerline, '# END ' . $marker) !== false) {
    11431220                    fwrite( $f, "# BEGIN {$marker}\n" );
    11441221                    if ( is_array( $insertion ))
     
    11781255        $state = false;
    11791256        foreach ( $markerdata as $markerline ) {
    1180             if ( strstr( $markerline, "# END {$marker}" ))
     1257            if (strpos($markerline, '# END ' . $marker) !== false)
    11811258                $state = false;
    11821259            if ( $state )
    11831260                $result[] = $markerline;
    1184             if ( strstr( $markerline, "# BEGIN {$marker}" ))
     1261            if (strpos($markerline, '# BEGIN ' . $marker) !== false)
    11851262                $state = true;
    11861263        }
     
    13051382    if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
    13061383        return false;
    1307    
     1384
    13081385    if ( empty( $parent) ) {
    13091386        if ( isset( $_wp_menu_nopriv[$pagenow] ) )
     
    13171394                return false;
    13181395            if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
    1319             return false;   
     1396            return false;
    13201397        }
    13211398        return true;
     
    14391516                    $parent_file = $_wp_real_parent_file[$parent_file];
    14401517            return $parent_file;
    1441         }           
     1518        }
    14421519    }
    14431520
     
    14461523        if ( isset( $_wp_real_parent_file[$parent_file] ) )
    14471524            $parent_file = $_wp_real_parent_file[$parent_file];
    1448         return $parent_file;       
     1525        return $parent_file;
    14491526    }
    14501527
     
    16601737    }
    16611738
    1662     return array ('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1] );
     1739    return array('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version);
    16631740}
    16641741
     
    16771754    if ( $plugins_dir ) {
    16781755        while (($file = $plugins_dir->read() ) !== false ) {
    1679             if ( preg_match( '|^\.+$|', $file ))
     1756            if ( substr($file, 0, 1) == '.' )
    16801757                continue;
    16811758            if ( is_dir( $plugin_root.'/'.$file ) ) {
     
    16831760                if ( $plugins_subdir ) {
    16841761                    while (($subfile = $plugins_subdir->read() ) !== false ) {
    1685                         if ( preg_match( '|^\.+$|', $subfile ))
     1762                        if ( substr($subfile, 0, 1) == '.' )
    16861763                            continue;
    1687                         if ( preg_match( '|\.php$|', $subfile ))
     1764                        if ( substr($subfile, -4) == '.php' )
    16881765                            $plugin_files[] = "$file/$subfile";
    16891766                    }
    16901767                }
    16911768            } else {
    1692                 if ( preg_match( '|\.php$|', $file ))
     1769                if ( substr($file, -4) == '.php' )
    16931770                    $plugin_files[] = $file;
    16941771            }
     
    17551832        ';
    17561833}
    1757 if ( strstr( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ))
     1834
     1835if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)
    17581836    add_action( 'admin_footer', 'browse_happy' );
    17591837
     
    17701848function get_importers() {
    17711849    global $wp_importers;
    1772 
     1850    uasort($wp_importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
    17731851    return $wp_importers;
    17741852}
     
    18941972    // Compute the URL
    18951973    $url = $uploads['url'] . "/$filename";
    1896    
     1974
    18971975    $return = apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ) );
    18981976
     
    19161994    $size = strtolower( ini_get( 'upload_max_filesize' ) );
    19171995    $bytes = 0;
    1918     if ( strstr( $size, 'k' ) )
     1996    if (strpos($size, 'k') !== false)
    19191997        $bytes = $size * 1024;
    1920     if ( strstr( $size, 'm' ) )
     1998    if (strpos($size, 'm') !== false)
    19211999        $bytes = $size * 1024 * 1024;
    1922     if ( strstr( $size, 'g' ) )
     2000    if (strpos($size, 'g') !== false)
    19232001        $bytes = $size * 1024 * 1024 * 1024;
    19242002?>
    19252003<form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo attribute_escape($action) ?>">
    19262004<p>
     2005<?php wp_nonce_field('import-upload'); ?>
    19272006<label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?> )
    19282007<input type="file" id="upload" name="import" size="25" />
     
    20532132    wp_clearcookie();
    20542133    // Set cookies for new paths.
    2055     wp_setcookie( $user_login, $user_pass_md5, true, get_option( 'home' ), get_option( 'siteurl' ));   
     2134    wp_setcookie( $user_login, $user_pass_md5, true, get_option( 'home' ), get_option( 'siteurl' ));
    20562135}
    20572136
     
    20752154    }
    20762155
    2077     imageantialias( $dst, true );
     2156    if (function_exists('imageantialias'))
     2157        imageantialias( $dst, true );
     2158   
    20782159    imagecopyresampled( $dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
    20792160
     
    21952276            // If no filters change the filename, we'll do a default transformation.
    21962277            if ( basename( $file ) == $thumb = apply_filters( 'thumbnail_filename', basename( $file ) ) )
    2197                 $thumb = preg_replace( '!(\.[^.]+)?$!', __( '.thumbnail' ).'$1', basename( $file ), 1 );
     2278                $thumb = preg_replace( '!(\.[^.]+)?$!', '.thumbnail' . '$1', basename( $file ), 1 );
    21982279
    21992280            $thumbpath = str_replace( basename( $file ), $thumb, $file );
Note: See TracChangeset for help on using the changeset viewer.