Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

Cleaning up some includes.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@1190 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2004-04-27 23:17:16 +00:00
parent f535954c3e
commit 9dc65ab2db
7 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2rdf.php
View File

@ -1,7 +1,5 @@
<?php <?php
$curpath = dirname(__FILE__).'/'; require_once ('./wp-config.php');
require_once ($curpath.'wp-config.php');
require_once ($curpath.WPINC.'/template-functions.php');
if (!empty($_SERVER["QUERY_STRING"])) { if (!empty($_SERVER["QUERY_STRING"])) {
$location = get_bloginfo('rdf_url').'?'.$_SERVER["QUERY_STRING"]; $location = get_bloginfo('rdf_url').'?'.$_SERVER["QUERY_STRING"];
} }

4
b2rss.php
View File

@ -1,7 +1,5 @@
<?php <?php
$curpath = dirname(__FILE__).'/'; require_once ('./wp-config.php');
require_once ($curpath.'wp-config.php');
require_once ($curpath.WPINC.'/template-functions.php');
if (!empty($_SERVER["QUERY_STRING"])) { if (!empty($_SERVER["QUERY_STRING"])) {
$location = get_bloginfo('rss_url').'?'.$_SERVER["QUERY_STRING"]; $location = get_bloginfo('rss_url').'?'.$_SERVER["QUERY_STRING"];
} }

4
b2rss2.php
View File

@ -1,7 +1,5 @@
<?php <?php
$curpath = dirname(__FILE__).'/'; require_once ('./wp-config.php');
require_once ($curpath.'wp-config.php');
require_once ($curpath.WPINC.'/template-functions.php');
if (!empty($_SERVER["QUERY_STRING"])) { if (!empty($_SERVER["QUERY_STRING"])) {
$location = get_bloginfo('rss2_url').'?'.$_SERVER["QUERY_STRING"]; $location = get_bloginfo('rss2_url').'?'.$_SERVER["QUERY_STRING"];
} }

5
wp-admin/import-greymatter.php
View File

@ -1,11 +1,6 @@
<?php <?php
// 1. save as gm-2-b2.php
// 2. upload on your server in the directory where your b2 files are
// 3. load in the browser from there
require_once('../wp-config.php'); require_once('../wp-config.php');
require_once(ABSPATH.WPINC.'/functions.php');
require('upgrade-functions.php'); require('upgrade-functions.php');
$wpvarstoreset = array('action', 'gmpath', 'archivespath'); $wpvarstoreset = array('action', 'gmpath', 'archivespath');

1
wp-admin/link-parse-opml.php
View File

@ -1,6 +1,5 @@
<?php <?php
require_once('../wp-config.php'); require_once('../wp-config.php');
require_once(ABSPATH.WPINC.'/functions.php');
// columns we wish to find are: link_url, link_name, link_target, link_description // columns we wish to find are: link_url, link_name, link_target, link_description
// we need to map XML attribute names to our columns // we need to map XML attribute names to our columns

5
wp-includes/functions.php
View File

@ -526,6 +526,9 @@ function timer_stop($display=0,$precision=3) { //if called like timer_stop(1), w
} }
function weblog_ping($server = '', $path = '') { function weblog_ping($server = '', $path = '') {
include_once (ABSPATH . WPINC . '/class-xmlrpc.php');
include_once (ABSPATH . WPINC . '/class-xmlrpcs.php');
$f = new xmlrpcmsg('weblogUpdates.ping', $f = new xmlrpcmsg('weblogUpdates.ping',
array(new xmlrpcval(get_settings('blogname'), 'string'), array(new xmlrpcval(get_settings('blogname'), 'string'),
new xmlrpcval(get_settings('siteurl') ,'string'))); new xmlrpcval(get_settings('siteurl') ,'string')));
@ -699,6 +702,8 @@ function debug_fclose($fp) {
} }
function pingback($content, $post_ID) { function pingback($content, $post_ID) {
include_once (ABSPATH . WPINC . '/class-xmlrpc.php');
include_once (ABSPATH . WPINC . '/class-xmlrpcs.php');
// original code by Mort (http://mort.mine.nu:8080) // original code by Mort (http://mort.mine.nu:8080)
global $wp_version; global $wp_version;
$log = debug_fopen('./pingback.log', 'a'); $log = debug_fopen('./pingback.log', 'a');

23
wp-settings.php
View File

@ -24,7 +24,9 @@ $tableoptionvalues = $table_prefix . 'optionvalues';
$tableoptiongroups = $table_prefix . 'optiongroups'; $tableoptiongroups = $table_prefix . 'optiongroups';
$tableoptiongroup_options = $table_prefix . 'optiongroup_options'; $tableoptiongroup_options = $table_prefix . 'optiongroup_options';
$tablepostmeta = $table_prefix . 'postmeta'; $tablepostmeta = $table_prefix . 'postmeta';
define('WPINC', 'wp-includes'); define('WPINC', 'wp-includes');
require_once (ABSPATH . WPINC . '/wp-db.php'); require_once (ABSPATH . WPINC . '/wp-db.php');
$wpdb->hide_errors(); $wpdb->hide_errors();
@ -34,22 +36,13 @@ if (!$users && !strstr($_SERVER['REQUEST_URI'], 'install.php')) {
} }
$wpdb->show_errors(); $wpdb->show_errors();
// This is the name of the include directory. No "/" allowed. require (ABSPATH . WPINC . '/functions.php');
require (ABSPATH . 'wp-config-extra.php');
require_once (ABSPATH . WPINC . '/functions.php'); require (ABSPATH . WPINC . '/template-functions.php');
require_once (ABSPATH . 'wp-config-extra.php'); require (ABSPATH . WPINC . '/links.php');
require_once (ABSPATH . WPINC . '/template-functions.php'); require (ABSPATH . WPINC . '/kses.php');
require_once (ABSPATH . WPINC . '/class-xmlrpc.php');
require_once (ABSPATH . WPINC . '/class-xmlrpcs.php');
require_once (ABSPATH . WPINC . '/links.php');
require_once (ABSPATH . WPINC . '/kses.php');
require_once (ABSPATH . WPINC . '/wp-l10n.php'); require_once (ABSPATH . WPINC . '/wp-l10n.php');
//setup the old globals from b2config.php
//
// We should eventually migrate to either calling
// get_settings() wherever these are needed OR
// accessing a single global $all_settings var
if (!strstr($_SERVER['REQUEST_URI'], 'install.php') && !strstr($_SERVER['REQUEST_URI'], 'wp-admin/import')) { if (!strstr($_SERVER['REQUEST_URI'], 'install.php') && !strstr($_SERVER['REQUEST_URI'], 'wp-admin/import')) {
$querystring_start = '?'; $querystring_start = '?';
@ -61,7 +54,7 @@ if (!strstr($_SERVER['REQUEST_URI'], 'install.php') && !strstr($_SERVER['REQUEST
} //end !$_wp_installing } //end !$_wp_installing
require_once (ABSPATH . WPINC . '/vars.php'); require (ABSPATH . WPINC . '/vars.php');
// Check for hacks file if the option is enabled // Check for hacks file if the option is enabled