WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include cleanups 

git-svn-id: http://svn.automattic.com/wordpress/trunk@2238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2005-02-07 07:25:30 +00:00
parent 4c6cb0f12e
commit 2520d8e8f5
4 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-includes/template-functions.php
View File

@ -1,24 +0,0 @@
<?php
$curpath = dirname(__FILE__).'/';
/***** About-the-blog tags *****/
require($curpath . 'template-functions-general.php');
/***** Links *****/
require($curpath . 'template-functions-links.php');
/***** Author tags *****/
require($curpath . 'template-functions-author.php');
/***** Post tags *****/
require($curpath . 'template-functions-post.php');
/***** Category tags *****/
require($curpath . 'template-functions-category.php');
/***** Comment tags *****/
require($curpath . 'comment-functions.php');
require($curpath . 'feed-functions.php');
?>

3
wp-includes/vars.php
View File

@ -1,8 +1,5 @@
<?php
/* This file sets various arrays and variables for use in WordPress */
require(ABSPATH . 'wp-includes/version.php');
// On which page are we ?
$PHP_SELF = $_SERVER['PHP_SELF'];
if (preg_match('#([^/]+.php)#', $PHP_SELF, $self_matches)) {

9
wp-includes/wp-l10n.php
View File

@ -1,6 +1,9 @@
<?php
require_once(ABSPATH . 'wp-includes/streams.php');
require_once(ABSPATH . 'wp-includes/gettext.php');
if ( defined('WPLANG') && '' != constant('WPLANG') ) {
require_once(ABSPATH . 'wp-includes/streams.php');
require_once(ABSPATH . 'wp-includes/gettext.php');
}
function get_locale() {
global $locale;
@ -94,4 +97,4 @@ function load_theme_textdomain($domain) {
load_textdomain($domain, $mofile);
}
?>
?>

27
wp-settings.php
View File

@ -35,15 +35,15 @@ define('WPINC', 'wp-includes');
require_once (ABSPATH . WPINC . '/wp-db.php');
// Table names
$wpdb->posts = $table_prefix . 'posts';
$wpdb->users = $table_prefix . 'users';
$wpdb->categories = $table_prefix . 'categories';
$wpdb->post2cat = $table_prefix . 'post2cat';
$wpdb->comments = $table_prefix . 'comments';
$wpdb->links = $table_prefix . 'links';
$wpdb->linkcategories = $table_prefix . 'linkcategories';
$wpdb->options = $table_prefix . 'options';
$wpdb->postmeta = $table_prefix . 'postmeta';
$wpdb->posts = $table_prefix . 'posts';
$wpdb->users = $table_prefix . 'users';
$wpdb->categories = $table_prefix . 'categories';
$wpdb->post2cat = $table_prefix . 'post2cat';
$wpdb->comments = $table_prefix . 'comments';
$wpdb->links = $table_prefix . 'links';
$wpdb->linkcategories = $table_prefix . 'linkcategories';
$wpdb->options = $table_prefix . 'options';
$wpdb->postmeta = $table_prefix . 'postmeta';
if ( defined('CUSTOM_USER_TABLE') )
$wpdb->users = CUSTOM_USER_TABLE;
@ -76,9 +76,16 @@ $wpdb->show_errors();
require (ABSPATH . WPINC . '/functions-formatting.php');
require (ABSPATH . WPINC . '/functions-post.php');
require (ABSPATH . WPINC . '/classes.php');
require (ABSPATH . WPINC . '/template-functions.php');
require (ABSPATH . WPINC . '/template-functions-general.php');
require (ABSPATH . WPINC . '/template-functions-links.php');
require (ABSPATH . WPINC . '/template-functions-author.php');
require (ABSPATH . WPINC . '/template-functions-post.php');
require (ABSPATH . WPINC . '/template-functions-category.php');
require (ABSPATH . WPINC . '/comment-functions.php');
require (ABSPATH . WPINC . '/feed-functions.php');
require (ABSPATH . WPINC . '/links.php');
require (ABSPATH . WPINC . '/kses.php');
require (ABSPATH . WPINC . '/version.php');
if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) :
$querystring_start = '?';