require -> require_once

b2config.php -> wp-config.php


git-svn-id: http://svn.automattic.com/wordpress/trunk@212 1a063a9b-81f0-0310-95a4-ce76da25c4cd

b2comments.post.php

@@ -3,8 +3,8 @@
 # if you want to change the paths here, remember to put your new path BEFORE $b2inc,
 #  like this: "b2/$b2inc/b2functions.php"
 
-require('b2config.php');
+require_once('wp-config.php');
-require($abspath.$b2inc.'/b2template.functions.php');
+require_once($abspath.$b2inc.'/b2template.functions.php');
 include($abspath.$b2inc.'/b2vars.php');
 include($abspath.$b2inc.'/b2functions.php');
 

b2login.php

@@ -1,5 +1,5 @@
 <?php
-require('b2config.php');
+require_once('wp-config.php');
 require_once($abspath.$b2inc.'/b2template.functions.php');
 require_once($abspath.$b2inc.'/b2functions.php');
 require_once($abspath.$b2inc.'/b2vars.php');

b2mail.php

@@ -3,13 +3,13 @@
 # pop3-2-b2 mail to blog
 # v0.3 20020716
 
-require('b2config.php');
+require_once('wp-config.php');
-require($abspath.$b2inc."/b2template.functions.php");
+require_once($abspath.$b2inc."/b2template.functions.php");
-require($abspath.$b2inc.'/b2vars.php');
+require_once($abspath.$b2inc.'/b2vars.php');
-require($abspath.$b2inc.'/class.POP3.php');
+require_once($abspath.$b2inc.'/class.POP3.php');
-require($abspath.$b2inc.'/b2functions.php');
+require_once($abspath.$b2inc.'/b2functions.php');
-require($abspath.$b2inc."/xmlrpc.inc");
+require_once($abspath.$b2inc."/xmlrpc.inc");
-require($abspath.$b2inc."/xmlrpcs.inc");
+require_once($abspath.$b2inc."/xmlrpcs.inc");
 
 dbconnect();
 timer_start();

b2register.php

@@ -1,8 +1,8 @@
 <?php
 /* <Register> */
 
-require('b2config.php');
+require_once('wp-config.php');
-require($abspath.$b2inc.'/b2functions.php');
+require_once($abspath.$b2inc.'/b2functions.php');
 
 function add_magic_quotes($array) {
 	foreach ($array as $k => $v) {

b2trackback.php

@@ -57,7 +57,7 @@ if ((strlen(''.$tb_id)) && (empty($HTTP_GET_VARS['__mode'])) && (strlen(''.$tb_u
 	@header('Content-Type: text/xml');
 
 
-	require_once('b2config.php');
+	require_once('wp-config.php');
 	require_once($abspath.$b2inc.'/b2template.functions.php');
 	require_once($abspath.$b2inc.'/b2vars.php');
 	require_once($abspath.$b2inc.'/b2functions.php');

blog.header.php

@@ -6,7 +6,7 @@ $use_gzipcompression = 1;
 /* Including config and functions files */
 $curpath = dirname(__FILE__).'/';
 
-require_once ($curpath.'/b2config.php');
+require_once ($curpath.'/wp-config.php');
 require_once ($curpath.$b2inc.'/b2template.functions.php');
 require_once ($curpath.$b2inc.'/b2vars.php');
 require_once ($curpath.$b2inc.'/b2functions.php');

blogger-2-wp.php

@@ -20,7 +20,7 @@ switch ($action) {
 
 case "step1":
 
-	require('b2config.php');
+	require('wp-config.php');
 	require($abspath.$b2inc.'/b2template.functions.php');
 	require($abspath.$b2inc.'/b2functions.php');
 	require($abspath.$b2inc.'/b2vars.php');

gm-2-b2.php

@@ -4,8 +4,8 @@
 // 2. upload on your server in the directory where your b2 files are
 // 3. load in the browser from there
 
-require('b2config.php');
+require_once('wp-config.php');
-require($abspath.$b2inc.'/b2functions.php');
+require_once($abspath.$b2inc.'/b2functions.php');
 
 $b2varstoreset = array('action', 'gmpath', 'archivespath');
 for ($i=0; $i<count($b2varstoreset); $i += 1) {

wp-admin/b2-2-wp.php

@@ -1,5 +1,5 @@
 <?php
-require('../b2config.php');
+require_once('../wp-config.php');
 
 $step = $HTTP_GET_VARS['step'];
 if (!$step) $step = 0;
@@ -50,9 +50,8 @@ switch($step) {
   <li>The templates are so much better, and there is so much more going on than 
     before it's probably worth it to start from scratch and work back to your 
     design.</li>
-  <li>You can keeep your <code>b2config.php</code> file if you want to, but it 
+  <li>You need to transfer some of your settings from your old <code>b2config.php</code>
-    is <strong>very important</strong> that you take the last few lines from the 
+    to <code>wp-config.php</code> file [NEED MORE INFO].</li>
-    WordPress one and add those in, otherwise, nothing will work.</li>
   <li>WordPress issues should be discussed in our <a href="http://wordpress.org/support/">support 
     forums</a>.</li>
   <li><strong>Back up</strong> your database before you do anything. Yes, you. 

wp-admin/b2bookmarklet.php

@@ -8,7 +8,7 @@ function selected($selected, $current) {
 $mode = 'bookmarklet';
 
 $standalone = 1;
-require('b2header.php');
+require_once('b2header.php');
 
 if ($user_level == 0)
 	die ("Cheatin' uh?");

wp-admin/b2edit.showposts.php

@@ -1,7 +1,7 @@
 <div class="wrap">
 <?php
 
-require_once('../b2config.php');
+require_once('../wp-config.php');
 
 if (!$showposts) {
 	if ($posts_per_page) {

wp-admin/b2header.php

@@ -1,6 +1,6 @@
 <?php
 
-require('../b2config.php');
+require_once('../wp-config.php');
 require_once($abspath.$b2inc.'/b2template.functions.php');
 require_once($abspath.'/wp-admin/b2verifauth.php');
 require_once($abspath.$b2inc.'/b2vars.php');
@@ -95,4 +95,4 @@ if ($profile==0) {
 
 <?php
 }
-?>
+?>

wp-admin/b2template.php

@@ -40,7 +40,7 @@ switch($action) {
 case 'update':
 
 	$standalone = 1;
-	require("b2header.php");
+	require_once("b2header.php");
 
 	if ($user_level < 3) {
 		die('<p>You have no right to edit the template for this blog.<br />Ask for a promotion to your <a href="mailto:$admin_email">blog admin</a>. :)</p>');
@@ -60,7 +60,7 @@ break;
 
 default:
 
-	require('b2header.php');
+	require_once('b2header.php');
 
 	if ($user_level <= 3) {
 		die('<p>You have no right to edit the template for this blog.<br>Ask for a promotion to your <a href="mailto:$admin_email">blog admin</a>. :)</p>');

wp-admin/linkmanager.php

@@ -26,7 +26,7 @@
 //
 // Mike Little (mike@zed1.com)
 // *****************************************************************
-include_once('../b2config.php');
+include_once('../wp-config.php');
 include_once('../wp-links/links.config.php');
 include_once("../wp-links/links.php");
 

wp-admin/links.import.php

@@ -26,7 +26,7 @@
 //
 // Mike Little (mike@zed1.com)
 // *****************************************************************
-require('../b2config.php');
+require_once('../wp-config.php');
 include_once('../wp-links/links.config.php');
 include_once("../wp-links/links.php");
 

wp-admin/upgrade-070-to-071.php

@@ -1,5 +1,5 @@
 <?php
-require('../b2config.php');
+require_once('../wp-config.php');
 
 $step = $HTTP_GET_VARS['step'];
 if (!$step) $step = 0;