Changeset 1350

Show
Ignore:
Timestamp:
07/04/08 14:37:48 (2 months ago)
Author:
donncha
Message:

WP Merge with revision 8255

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/import/wp-cat2tag.php

    r1336 r1350  
    5353                        echo '<h2>' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '</h2>'; 
    5454                        echo '<div class="narrow">'; 
    55                         echo '<p>' . __('Hey there. Here you can selectively converts existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>'; 
     55                        echo '<p>' . __('Hey there. Here you can selectively convert existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>'; 
    5656                        echo '<p>' . __('Keep in mind that if you convert a category with child categories, the children become top-level orphans.') . '</p></div>'; 
    5757 

  • trunk/wp-admin/includes/class-wp-filesystem-base.php

    r1328 r1350  
    11<?php 
    22class WP_Filesystem_Base{ 
    3         var $verbose = true; 
     3        var $verbose = false; 
    44        var $cache = array(); 
    55         

  • trunk/wp-config-sample.php

    r1345 r1350  
    1111$base = 'BASE'; 
    1212 
    13 // Change SECRET_KEY to a unique phrase.  You won't have to remember it later, 
    14 // so make it long and complicated.  You can visit http://api.wordpress.org/secret-key/1.0/ 
    15 // to get a secret key generated for you, or just make something up. 
     13// Change each KEY to a different unique phrase.  You won't have to remember the phrases later, 
     14// so make them long and complicated.  You can visit http://api.wordpress.org/secret-key/1.1/ 
     15// to get keys generated for you, or just make something up.  Each key should have a different phrase. 
     16define('AUTH_KEY', 'put your unique phrase here'); // Change this to a unique phrase. 
     17define('SECURE_AUTH_KEY', 'put your unique phrase here'); // Change this to a unique phrase. 
     18define('LOGGED_IN_KEY', 'put your unique phrase here'); // Change this to a unique phrase. 
    1619define('SECRET_KEY', 'put your unique phrase here'); // Change these to unique phrases. 
    1720define('SECRET_SALT', 'put your unique phrase here'); 
    18 define('LOGGED_IN_KEY', 'put your unique phrase here'); 
    1921define('LOGGED_IN_SALT', 'put your unique phrase here'); 
    2022 

  • trunk/wp-includes/theme.php

    r1328 r1350  
    487487                return; 
    488488 
    489         $_GET[template] = preg_replace('|[^a-z0-9]|i', '', $_GET[template]); 
     489        $_GET[template] = preg_replace('|[^a-z0-9_-]|i', '', $_GET[template]); 
    490490 
    491491        add_filter('template', create_function('', "return '$_GET[template]';") ); 
    492492 
    493493        if ( isset($_GET['stylesheet']) ) { 
    494                 $_GET[stylesheet] = preg_replace('|[^a-z0-9]|i', '', $_GET[stylesheet]); 
     494                $_GET[stylesheet] = preg_replace('|[^a-z0-9_-]|i', '', $_GET[stylesheet]); 
    495495                add_filter('stylesheet', create_function('', "return '$_GET[stylesheet]';") ); 
    496496        } 

  • trunk/wp-includes/version.php

    r1344 r1350  
    99 * @global string $wp_version 
    1010 */ 
    11 $wp_version = '2.6-beta2'; 
     11$wp_version = '2.6-beta3'; 
    1212 
    1313/** 
    …… 
    1818$wp_db_version = 8201; 
    1919 
    20 $wpmu_version = '2.6.beta2'; 
     20$wpmu_version = '2.6.beta3'; 
    2121?> 

  • trunk/wp-includes/widgets.php

    r1336 r1350  
    462462function wp_widget_search($args) { 
    463463        extract($args); 
    464 ?> 
    465                 <?php echo $before_widget; ?> 
    466                         <form id="searchform" method="get" action="<?php bloginfo('home'); ?>"> 
    467                         <div> 
     464        $searchform_template = get_template_directory() . '/searchform.php'; 
     465         
     466        echo $before_widget; 
     467         
     468        // Use current theme search form if it exists 
     469        if ( file_exists($searchform_template) ) { 
     470                include_once($searchform_template); 
     471        } else { ?> 
     472                <form id="searchform" method="get" action="<?php bloginfo('url'); ?>/"><div> 
    468473                        <label class="hidden" for="s"><?php _e('Search for:'); ?></label> 
    469                         <input type="text" name="s" id="s" size="15" /><br /> 
     474                        <input type="text" name="s" id="s" size="15" value="<?php the_search_query(); ?>" /> 
    470475                        <input type="submit" value="<?php echo attribute_escape(__('Search')); ?>" /> 
    471                        </div> 
    472                        </form> 
    473                <?php echo $after_widget; ?> 
    474 <?php 
     476                </div></form> 
     477        <?php } 
     478         
     479        echo $after_widget; 
    475480} 
    476481