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

Removed erroneous require of wp-db 

Added missing require of wp-db to b2config
Moved links tables tt b2config
Fixed definition of extra db vars


git-svn-id: http://svn.automattic.com/wordpress/trunk@152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
mikelittle 2003-06-03 23:15:14 +00:00
parent 73c4f8cfad
commit 3b1ee8f5ab
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2calendar.php
View File

@ -55,7 +55,6 @@ require('b2config.php');
require_once($abspath.$b2inc.'/b2template.functions.php'); require_once($abspath.$b2inc.'/b2template.functions.php');
require_once($abspath.$b2inc.'/b2functions.php'); require_once($abspath.$b2inc.'/b2functions.php');
require_once($abspath.$b2inc.'/b2vars.php'); require_once($abspath.$b2inc.'/b2vars.php');
require_once($curpath.$b2inc.'/wp-db.php');
if (isset($calendar) && ($calendar != '')) { if (isset($calendar) && ($calendar != '')) {
$thisyear = substr($calendar,0,4); $thisyear = substr($calendar,0,4);

12
b2config.php
View File

@ -49,6 +49,9 @@ $tableusers = 'b2users';
$tablesettings = 'b2settings'; $tablesettings = 'b2settings';
$tablecategories = 'b2categories'; $tablecategories = 'b2categories';
$tablecomments = 'b2comments'; $tablecomments = 'b2comments';
// tables for link manager
$tablelinks = "b2links";
$tablelinkcategories = "b2linkcategories";
// ** Post preview function ** // ** Post preview function **
@ -315,11 +318,11 @@ $HTTP_HOST = getenv('HTTP_HOST'); /* domain name */
$REMOTE_ADDR = getenv('REMOTE_ADDR'); /* visitor's IP */ $REMOTE_ADDR = getenv('REMOTE_ADDR'); /* visitor's IP */
$HTTP_USER_AGENT = getenv('HTTP_USER_AGENT'); /* visitor's browser */ $HTTP_USER_AGENT = getenv('HTTP_USER_AGENT'); /* visitor's browser */
$server = $dbhost; $server = DB_HOST;
$loginsql = $dbusername; $loginsql = DB_USER;
$passsql = $dbpassword; $passsql = DB_PASSWORD;
$path = $siteurl; $path = $siteurl;
$base = $dbname; $base = DB_NAME;
// This should get us the relative path of WordPress and the absolute path on the server. Yipee! // This should get us the relative path of WordPress and the absolute path on the server. Yipee!
@ -331,4 +334,5 @@ for ($i = 3; $i < count($url); $i++) {
$abspath = getenv('DOCUMENT_ROOT') . $relpath . '/'; $abspath = getenv('DOCUMENT_ROOT') . $relpath . '/';
$b2inc = "/$b2inc"; $b2inc = "/$b2inc";
$pathserver = &$siteurl; $pathserver = &$siteurl;
require_once($abspath.$b2inc.'/wp-db.php');
?> ?>

1
blog.header.php
View File

@ -12,7 +12,6 @@ require_once ($curpath.$b2inc.'/b2vars.php');
require_once ($curpath.$b2inc.'/b2functions.php'); require_once ($curpath.$b2inc.'/b2functions.php');
require_once ($curpath.$b2inc.'/xmlrpc.inc'); require_once ($curpath.$b2inc.'/xmlrpc.inc');
require_once ($curpath.$b2inc.'/xmlrpcs.inc'); require_once ($curpath.$b2inc.'/xmlrpcs.inc');
require_once ($curpath.$b2inc.'/wp-db.php');
$b2varstoreset = array('m','p','posts','w','c', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby'); $b2varstoreset = array('m','p','posts','w','c', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby');

1
wp-admin/b2header.php
View File

@ -7,7 +7,6 @@ require_once($abspath.$b2inc.'/b2vars.php');
require_once($abspath.$b2inc.'/b2functions.php'); require_once($abspath.$b2inc.'/b2functions.php');
require_once($abspath.$b2inc.'/xmlrpc.inc'); require_once($abspath.$b2inc.'/xmlrpc.inc');
require_once($abspath.$b2inc.'/xmlrpcs.inc'); require_once($abspath.$b2inc.'/xmlrpcs.inc');
require_once($abspath.$b2inc.'/wp-db.php');
if (!isset($use_cache)) $use_cache=1; if (!isset($use_cache)) $use_cache=1;
if (!isset($blogID)) $blog_ID=1; if (!isset($blogID)) $blog_ID=1;

1
wp-admin/b2verifauth.php
View File

@ -1,7 +1,6 @@
<?php <?php
require_once('../b2config.php'); require_once('../b2config.php');
require_once($abspath.$b2inc.'/wp-db.php');
/* checking login & pass in the database */ /* checking login & pass in the database */
function veriflog() { function veriflog() {