diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 8ec1ca0af6..527fbb631c 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -335,10 +335,10 @@ function get_default_post_to_edit() { $post_excerpt = ''; $post->post_status = 'draft'; - $post->comment_status = get_settings('default_comment_status'); - $post->ping_status = get_settings('default_ping_status'); - $post->post_pingback = get_settings('default_pingback_flag'); - $post->post_category = get_settings('default_category'); + $post->comment_status = get_option('default_comment_status'); + $post->ping_status = get_option('default_ping_status'); + $post->post_pingback = get_option('default_pingback_flag'); + $post->post_category = get_option('default_category'); $post->post_content = apply_filters('default_content', $post_content); $post->post_title = apply_filters('default_title', $post_title); $post->post_excerpt = apply_filters('default_excerpt', $post_excerpt); @@ -1106,7 +1106,7 @@ function touch_time($edit = 1, $for_post = 1) { echo '
'; - $time_adj = time() + (get_settings('gmt_offset') * 3600); + $time_adj = time() + (get_option('gmt_offset') * 3600); $post_date = ($for_post) ? $post->post_date : $comment->comment_date; $jj = ($edit) ? mysql2date('d', $post_date) : gmdate('d', $time_adj); $mm = ($edit) ? mysql2date('m', $post_date) : gmdate('m', $time_adj); @@ -1623,8 +1623,8 @@ function validate_file_to_edit($file, $allowed_files = '') { } function get_home_path() { - $home = get_settings('home'); - if ($home != '' && $home != get_settings('siteurl')) { + $home = get_option('home'); + if ($home != '' && $home != get_option('siteurl')) { $home_path = parse_url($home); $home_path = $home_path['path']; $root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"]); diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index b1f981b89f..2487f28469 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -15,9 +15,9 @@ get_admin_page_title(); - + <?php bloginfo('name') ?> › <?php echo $title; ?> — WordPress - + \n"; $this->printed[] = $handle; } diff --git a/wp-includes/theme.php b/wp-includes/theme.php index b93e653819..bb5aab3e25 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -4,7 +4,7 @@ */ function get_stylesheet() { - return apply_filters('stylesheet', get_settings('stylesheet')); + return apply_filters('stylesheet', get_option('stylesheet')); } function get_stylesheet_directory() { @@ -26,7 +26,7 @@ function get_stylesheet_uri() { } function get_template() { - return apply_filters('template', get_settings('template')); + return apply_filters('template', get_option('template')); } function get_template_directory() { @@ -237,8 +237,8 @@ function get_theme($theme) { function get_current_theme() { $themes = get_themes(); $theme_names = array_keys($themes); - $current_template = get_settings('template'); - $current_stylesheet = get_settings('stylesheet'); + $current_template = get_option('template'); + $current_stylesheet = get_option('stylesheet'); $current_theme = 'WordPress Default'; if ( $themes ) { @@ -259,7 +259,7 @@ function get_theme_root() { } function get_theme_root_uri() { - return apply_filters('theme_root_uri', get_settings('siteurl') . "/wp-content/themes", get_settings('siteurl')); + return apply_filters('theme_root_uri', get_option('siteurl') . "/wp-content/themes", get_option('siteurl')); } function get_query_template($type) { diff --git a/wp-includes/vars.php b/wp-includes/vars.php index beec34cbcd..62253c1a6a 100644 --- a/wp-includes/vars.php +++ b/wp-includes/vars.php @@ -89,7 +89,7 @@ if (!isset($wpsmiliestrans)) { foreach($wpsmiliestrans as $smiley => $img) { $wp_smiliessearch[] = $smiley; $smiley_masked = htmlspecialchars( trim($smiley) , ENT_QUOTES); - $wp_smiliesreplace[] = " $smiley_masked "; + $wp_smiliesreplace[] = " $smiley_masked "; } ?> diff --git a/wp-links-opml.php b/wp-links-opml.php index ea656b8a8e..811a5e9d42 100644 --- a/wp-links-opml.php +++ b/wp-links-opml.php @@ -5,7 +5,7 @@ if (empty($wp)) { wp(); } -header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true); +header('Content-type: text/xml; charset=' . get_option('blog_charset'), true); $link_cat = $_GET['link_cat']; if ((empty ($link_cat)) || ($link_cat == 'all') || ($link_cat == '0')) { $link_cat = ''; diff --git a/wp-login.php b/wp-login.php index 7712d2ebec..a976d10e4d 100644 --- a/wp-login.php +++ b/wp-login.php @@ -16,7 +16,7 @@ if ( defined('RELOCATE') ) { // Move flag is set $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] ); $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; - if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') ) + if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') ) update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) ); } @@ -45,7 +45,7 @@ do_action('lost_password'); WordPress » <?php _e('Lost Password') ?> - +