Changeset 1190

Timestamp:

04/27/2004 11:17:16 PM (20 years ago)

Author:

saxmatt

Message:

Cleaning up some includes.

Location:

trunk

Files:

• b2rdf.php (modified) (1 diff)
• b2rss.php (modified) (1 diff)
• b2rss2.php (modified) (1 diff)
• wp-admin/import-greymatter.php (modified) (1 diff)
• wp-admin/link-parse-opml.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-settings.php (modified) (3 diffs)

trunk/b2rdf.php

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

trunk/b2rss.php

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

trunk/b2rss2.php

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

trunk/wp-admin/import-greymatter.php

@@ -1 +1 @@
 <?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(ABSPATH.WPINC.'/functions.php');
 require('upgrade-functions.php');
 

trunk/wp-admin/link-parse-opml.php

@@ -1 +1 @@
 <?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

trunk/wp-includes/functions.php

@@ -527 +527 @@
 
 function weblog_ping($server = '', $path = '') {
+include_once (ABSPATH . WPINC . '/class-xmlrpc.php');
+include_once (ABSPATH . WPINC . '/class-xmlrpcs.php');
+
   $f = new xmlrpcmsg('weblogUpdates.ping',
                 array(new xmlrpcval(get_settings('blogname'), 'string'),
@@ -700 +703 @@
 
 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)
     global $wp_version;

trunk/wp-settings.php

@@ -25 +25 @@
 $tableoptiongroup_options = $table_prefix . 'optiongroup_options';
 $tablepostmeta            = $table_prefix . 'postmeta';
+
 define('WPINC', 'wp-includes');
+
 require_once (ABSPATH . WPINC . '/wp-db.php');
 
@@ -35 +37 @@
 $wpdb->show_errors();
 
-// This is the name of the include directory. No "/" allowed.
-
-require_once (ABSPATH . WPINC . '/functions.php');
-require_once (ABSPATH . 'wp-config-extra.php');
-require_once (ABSPATH . WPINC . '/template-functions.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 (ABSPATH . WPINC . '/functions.php');
+require (ABSPATH . 'wp-config-extra.php');
+require (ABSPATH . WPINC . '/template-functions.php');
+require (ABSPATH . WPINC . '/links.php');
+require (ABSPATH . WPINC . '/kses.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')) {
 
@@ -62 +55 @@
 } //end !$_wp_installing
 
-require_once (ABSPATH . WPINC . '/vars.php');
+require (ABSPATH . WPINC . '/vars.php');