diff options
| -rw-r--r-- | wp-admin/import/wp-cat2tag.php | 2 | ||||
| -rw-r--r-- | wp-admin/includes/class-wp-filesystem-base.php | 4 | ||||
| -rw-r--r-- | wp-config-sample.php | 10 | ||||
| -rw-r--r-- | wp-includes/theme.php | 4 | ||||
| -rw-r--r-- | wp-includes/version.php | 4 | ||||
| -rw-r--r-- | wp-includes/widgets.php | 23 |
6 files changed, 27 insertions, 20 deletions
diff --git a/wp-admin/import/wp-cat2tag.php b/wp-admin/import/wp-cat2tag.php index e2d1a74..885936e 100644 --- a/wp-admin/import/wp-cat2tag.php +++ b/wp-admin/import/wp-cat2tag.php @@ -52,7 +52,7 @@ class WP_Categories_to_Tags { if ( $cat_num > 0 ) { echo '<h2>' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '</h2>'; echo '<div class="narrow">'; - 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>'; + 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>'; echo '<p>' . __('Keep in mind that if you convert a category with child categories, the children become top-level orphans.') . '</p></div>'; $this->categories_form(); diff --git a/wp-admin/includes/class-wp-filesystem-base.php b/wp-admin/includes/class-wp-filesystem-base.php index 7bb6217..820703e 100644 --- a/wp-admin/includes/class-wp-filesystem-base.php +++ b/wp-admin/includes/class-wp-filesystem-base.php @@ -1,6 +1,6 @@ <?php class WP_Filesystem_Base{ - var $verbose = true; + var $verbose = false; var $cache = array(); var $method = ''; @@ -155,4 +155,4 @@ class WP_Filesystem_Base{ return $newmode; } } -?>
\ No newline at end of file +?> diff --git a/wp-config-sample.php b/wp-config-sample.php index 72daf8d..fc75fec 100644 --- a/wp-config-sample.php +++ b/wp-config-sample.php @@ -10,12 +10,14 @@ define('DB_COLLATE', ''); define('VHOST', 'VHOSTSETTING');
$base = 'BASE';
-// Change SECRET_KEY to a unique phrase. You won't have to remember it later,
-// so make it long and complicated. You can visit http://api.wordpress.org/secret-key/1.0/
-// to get a secret key generated for you, or just make something up.
+// Change each KEY to a different unique phrase. You won't have to remember the phrases later,
+// so make them long and complicated. You can visit http://api.wordpress.org/secret-key/1.1/
+// to get keys generated for you, or just make something up. Each key should have a different phrase.
+define('AUTH_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
+define('SECURE_AUTH_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
+define('LOGGED_IN_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
define('SECRET_KEY', 'put your unique phrase here'); // Change these to unique phrases.
define('SECRET_SALT', 'put your unique phrase here');
-define('LOGGED_IN_KEY', 'put your unique phrase here');
define('LOGGED_IN_SALT', 'put your unique phrase here');
// double check $base
diff --git a/wp-includes/theme.php b/wp-includes/theme.php index dafc073..aa5f385 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -486,12 +486,12 @@ function preview_theme() { if ( !current_user_can( 'switch_themes' ) ) return; - $_GET[template] = preg_replace('|[^a-z0-9]|i', '', $_GET[template]); + $_GET[template] = preg_replace('|[^a-z0-9_-]|i', '', $_GET[template]); add_filter('template', create_function('', "return '$_GET[template]';") ); if ( isset($_GET['stylesheet']) ) { - $_GET[stylesheet] = preg_replace('|[^a-z0-9]|i', '', $_GET[stylesheet]); + $_GET[stylesheet] = preg_replace('|[^a-z0-9_-]|i', '', $_GET[stylesheet]); add_filter('stylesheet', create_function('', "return '$_GET[stylesheet]';") ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index ecf91d6..db0ceb6 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -8,7 +8,7 @@ * * @global string $wp_version */ -$wp_version = '2.6-beta2'; +$wp_version = '2.6-beta3'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. @@ -17,5 +17,5 @@ $wp_version = '2.6-beta2'; */ $wp_db_version = 8201; -$wpmu_version = '2.6.beta2'; +$wpmu_version = '2.6.beta3'; ?> diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index fd0bc3d..1dd8bd3 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -461,17 +461,22 @@ function wp_widget_links($args) { function wp_widget_search($args) { extract($args); -?> - <?php echo $before_widget; ?> - <form id="searchform" method="get" action="<?php bloginfo('home'); ?>"> - <div> + $searchform_template = get_template_directory() . '/searchform.php'; + + echo $before_widget; + + // Use current theme search form if it exists + if ( file_exists($searchform_template) ) { + include_once($searchform_template); + } else { ?> + <form id="searchform" method="get" action="<?php bloginfo('url'); ?>/"><div> <label class="hidden" for="s"><?php _e('Search for:'); ?></label> - <input type="text" name="s" id="s" size="15" /><br /> + <input type="text" name="s" id="s" size="15" value="<?php the_search_query(); ?>" /> <input type="submit" value="<?php echo attribute_escape(__('Search')); ?>" /> - </div> - </form> - <?php echo $after_widget; ?> -<?php + </div></form> + <?php } + + echo $after_widget; } function wp_widget_archives($args) { |