Changeset 565

Show
Ignore:
Timestamp:
06/16/06 12:00:59 (2 years ago)
Author:
donncha
Message:

WP Merge

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r559 r565  
    6464 
    6565        // Now drop in some default links 
    66         $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 0, 'http://blogs.linux.ie/xeer/feed/', '');"); 
     66        $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://inphotos.org/', 'Donncha', 0, 'http://inphotos.org/feed/', '');"); 
    6767        $wpdb->query( "INSERT INTO $wpdb->link2cat (`link_id`, `category_id`) VALUES (1, 2)" ); 
    6868 

  • trunk/wp-inst/wp-includes/comment-template.php

    r543 r565  
    367367                echo ' class="'.$CSSclass.'"'; 
    368368        } 
    369         echo ' title="' . sprintf( __('Comment on %s'), $post->post_title ) .'">'; 
     369        $title = wp_specialchars(apply_filters('the_title', get_the_title())); 
     370        echo ' title="' . sprintf( __('Comment on %s'), $title ) .'">'; 
    370371        comments_number($zero, $one, $more, $number); 
    371372        echo '</a>'; 

  • trunk/wp-inst/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php

    r549 r565  
    2828 
    2929                $this->tmpfile = tempnam($config['tinypspellshell.tmp'], "tinyspell"); 
    30       $this->cmd = "cat ". $this->tmpfile ." | " . $config['tinypspellshell.aspell'] . " -a --lang=". $this->lang; 
     30              $this->cmd = "cat ". $this->tmpfile ." | " . $config['tinypspellshell.aspell'] . " -a --lang=". $this->lang; 
    3131        } 
    3232 
    …… 
    4545 
    4646                $data = shell_exec($this->cmd); 
     47                @unlink($this->tmpfile); 
    4748                $returnData = array(); 
    4849                $dataArr = preg_split("/\n/", $data, -1, PREG_SPLIT_NO_EMPTY); 
    …… 
    7475 
    7576                $data = shell_exec($this->cmd); 
     77                @unlink($this->tmpfile); 
    7678                $returnData = array(); 
    7779                $dataArr = preg_split("/\n/", $data, -1, PREG_SPLIT_NO_EMPTY); 

  • trunk/wp-inst/wp-includes/pluggable.php

    r559 r565  
    169169        if( $headers == '' ) { 
    170170                $headers = "MIME-Version: 1.0\n" . 
    171                         "From: wordpress@" . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])) . "\n" .  
     171                        "From: " . get_settings('admin_email') . "\n" .  
    172172                        "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n"; 
    173173        } 
    …… 
    395395        $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_settings('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; 
    396396 
    397         $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])); 
     397        $admin_email = get_settings('admin_email'); 
    398398 
    399399        if ( '' == $comment->comment_author ) { 
    400                 $from = "From: \"$blogname\" <$wp_email>"; 
     400                $from = "From: \"$blogname\" <$admin_email>"; 
    401401                if ( '' != $comment->comment_author_email ) 
    402402                        $reply_to = "Reply-To: $comment->comment_author_email"; 
    403403        } else { 
    404                 $from = "From: \"$comment->comment_author\" <$wp_email>"; 
     404                $from = "From: \"$comment->comment_author\" <$admin_email>"; 
    405405                if ( '' != $comment->comment_author_email ) 
    406406                        $reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>"; 

  • trunk/wp-inst/wp-links-opml.php

    r514 r565  
    1 <?php  
    2 $doing_rss = 1; 
     1<?php 
    32 
    4 require('wp-blog-header.php'); 
     3if (empty($wp)) { 
     4        require_once('./wp-config.php'); 
     5        wp(); 
     6} 
     7 
    58header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true); 
    69$link_cat = $_GET['link_cat']; 
    7 if ((empty($link_cat)) || ($link_cat == 'all') || ($link_cat == '0')) { 
    8     $sql_cat = ''; 
     10if ((empty ($link_cat)) || ($link_cat == 'all') || ($link_cat == '0')) { 
     11       $link_cat = ''; 
    912} else { // be safe 
    10     $link_cat = ''.urldecode($link_cat).''; 
    11     $link_cat = addslashes_gpc($link_cat); 
    12     $link_cat = intval($link_cat); 
    13     if ($link_cat != 0) { 
    14         $sql_cat = "AND $wpdb->links.link_category = $link_cat"; 
    15         $cat_name = $wpdb->get_var("SELECT $wpdb->linkcategories.cat_name FROM $wpdb->linkcategories WHERE $wpdb->linkcategories.cat_id = $link_cat"); 
    16         if (!empty($cat_name)) { 
    17             $cat_name = ": category $cat_name"; 
    18         } 
    19     } 
     13        $link_cat = '' . urldecode($link_cat) . ''; 
     14        $link_cat = intval($link_cat); 
    2015} 
    2116?><?php echo '<?xml version="1.0"?'.">\n"; ?> 
    22 <!-- generator="wordpress/<?php echo $wp_version ?>" --> 
     17<!-- generator="wordpress/<?php bloginfo_rss('version') ?>" --> 
    2318<opml version="1.0"> 
    2419    <head> 
    …… 
    2722    </head> 
    2823    <body> 
    29 <?php $sql = "SELECT $wpdb->links.link_url, link_rss, $wpdb->links.link_name, $wpdb->links.link_category, $wpdb->linkcategories.cat_name, link_updated  
    30 FROM $wpdb->links  
    31  JOIN $wpdb->linkcategories on $wpdb->links.link_category = $wpdb->linkcategories.cat_id 
    32  AND $wpdb->links.link_visible = 'Y' 
    33  $sql_cat 
    34  ORDER BY $wpdb->linkcategories.cat_name, $wpdb->links.link_name \n"; 
    35  //echo("<!-- $sql -->"); 
    36  $prev_cat_id = 0; 
    37  $results = $wpdb->get_results($sql); 
    38  if ($results) { 
    39      foreach ($results as $result) { 
    40          if ($result->link_category != $prev_cat_id) { // new category 
    41              if ($prev_cat_id != 0)  { // not first time 
     24<?php 
     25 
     26if (empty ($link_cat)) 
     27        $cats = get_categories("type=link&hierarchical=0"); 
     28else 
     29        $cats = array (get_category($link_cat)); 
     30 
     31foreach ((array) $cats as $cat) { 
    4232?> 
    43         </outline> 
     33<outline type="category" title="<?php echo wp_specialchars($cat->cat_name); ?>"> 
    4434<?php 
    45              } // end if not first time 
     35 
     36        $bookmarks = get_bookmarks("category={$cat->cat_ID}"); 
     37        foreach ((array) $bookmarks as $bookmark) { 
    4638?> 
    47         <outline type="category" title="<?php echo wp_specialchars($result->cat_name); ?>"> 
     39            <outline text="<?php echo wp_specialchars($bookmark->link_name); ?>" type="link" xmlUrl="<?php echo wp_specialchars($bookmark->link_rss); ?>" htmlUrl="<?php echo wp_specialchars($bookmark->link_url); ?>" updated="<?php if ('0000-00-00 00:00:00' != $bookmark->link_updated) echo $bookmark->link_updated; ?>" /> 
    4840<?php 
    49              $prev_cat_id = $result->link_category; 
    50         } // end if new category 
     41 
     42        } 
    5143?> 
    52             <outline text="<?php echo wp_specialchars($result->link_name); ?>" type="link" xmlUrl="<?php echo wp_specialchars($result->link_rss); ?>" htmlUrl="<?php echo wp_specialchars($result->link_url); ?>" updated="<?php if ('0000-00-00 00:00:00' != $result->link_updated) echo $result->link_updated; ?>" /> 
     44</outline> 
    5345<?php 
    54         } // end foreach 
    55 ?> 
    56         </outline> 
    57 <?php 
    58     } // end if 
     46 
     47} 
    5948?> 
    6049</body> 

  • trunk/wp-inst/wp-settings.php

    r559 r565  
    133133require (ABSPATH . WPINC . '/functions.php'); 
    134134require (ABSPATH . WPINC . '/default-filters.php'); 
    135 require_once (ABSPATH . WPINC . '/wp-l10n.php'); 
     135require_once (ABSPATH . WPINC . '/l10n.php'); 
    136136 
    137137$wpdb->hide_errors();