From 91de6b846c2c5101df60c7175a1f10958b7c115d Mon Sep 17 00:00:00 2001 From: saxmatt Date: Sun, 25 May 2003 12:43:31 +0000 Subject: [PATCH] New path system. git-svn-id: http://svn.automattic.com/wordpress/trunk@96 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- b2-include/b2vars.php | 4 ++-- b2archives.php | 4 ++-- b2calendar.php | 8 ++++---- b2comments.post.php | 8 ++++---- b2config.php | 33 +++++++++++++++++++-------------- b2login.php | 6 +++--- b2mail.php | 12 ++++++------ b2rdf.php | 9 +++++---- b2register.php | 4 ++-- b2rss.php | 9 +++++---- b2rss2.php | 7 ++++--- b2trackback.php | 8 ++++---- blog.header.php | 16 +++++++--------- blogger-2-b2.php | 6 +++--- gm-2-b2.php | 4 ++-- index.php | 8 ++++---- readme.html | 16 ++++++++-------- wp-admin/b2edit.showposts.php | 4 ++-- wp-admin/b2header.php | 14 +++++++------- wp-admin/b2profile.php | 4 ++-- wp-admin/linkmanager.php | 2 +- 21 files changed, 96 insertions(+), 90 deletions(-) diff --git a/b2-include/b2vars.php b/b2-include/b2vars.php index d1fa02b8a..d667ef41a 100644 --- a/b2-include/b2vars.php +++ b/b2-include/b2vars.php @@ -267,12 +267,12 @@ foreach($b2smiliestrans as $smiley => $img) { } $b2_smiliesreplace[] = "$smiley_masked"; } -include_once('textile.php'); add_filter('all', 'wptexturize'); add_filter('the_content', 'wpautop'); add_filter('comment_text', 'wpautop'); - // Uncomment the next line for Textile support + // Uncomment the following for Textile support + // include_once('textile.php'); // add_filter('the_content', 'textile'); // There is some duplication of effore so textile.php really should be tweaked to eliminate that. ?> \ No newline at end of file diff --git a/b2archives.php b/b2archives.php index 4947b03f5..c58127674 100644 --- a/b2archives.php +++ b/b2archives.php @@ -2,8 +2,8 @@ // *** b2 Archive file -require_once('./b2config.php'); -require_once($b2inc.'/b2functions.php'); +require('b2config.php'); +require($abspath.$b2inc.'/b2functions.php'); dbconnect(); diff --git a/b2calendar.php b/b2calendar.php index a252872a0..c04f3a73e 100644 --- a/b2calendar.php +++ b/b2calendar.php @@ -51,10 +51,10 @@ $calendaremptycellcontent = ' '; /* stop customizing (unless you really know what you're doing) */ -include('b2config.php'); -require_once("$b2inc/b2template.functions.php"); -require_once("$b2inc/b2functions.php"); -require_once("$b2inc/b2vars.php"); +require('b2config.php'); +require_once($abspath.$b2inc.'/b2template.functions.php'); +require_once($abspath.$b2inc.'/b2functions.php'); +require_once($abspath.$b2inc.'/b2vars.php'); dbconnect(); if (isset($calendar) && ($calendar != '')) { diff --git a/b2comments.post.php b/b2comments.post.php index 8d61fb079..7b5f78e09 100644 --- a/b2comments.post.php +++ b/b2comments.post.php @@ -3,10 +3,10 @@ # 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("$b2inc/b2template.functions.php"); -include("$b2inc/b2vars.php"); -include("$b2inc/b2functions.php"); +require('b2config.php'); +require($abspath.$b2inc.'/b2template.functions.php'); +include($abspath.$b2inc.'/b2vars.php'); +include($abspath.$b2inc.'/b2functions.php'); dbconnect(); diff --git a/b2config.php b/b2config.php index 0d2cf629c..09b6b7345 100644 --- a/b2config.php +++ b/b2config.php @@ -1,10 +1,8 @@ diff --git a/b2login.php b/b2login.php index 4c72b02ac..9c2efae40 100644 --- a/b2login.php +++ b/b2login.php @@ -1,8 +1,8 @@ "; ?> +?> +"; ?> */ -include("./b2config.php"); -include($b2inc."/b2functions.php"); +require('b2config.php'); +require($abspath.$b2inc.'/b2functions.php'); function add_magic_quotes($array) { foreach ($array as $k => $v) { diff --git a/b2rss.php b/b2rss.php index 8a45b1e3e..8be8c107d 100644 --- a/b2rss.php +++ b/b2rss.php @@ -1,12 +1,13 @@ "; ?> +?> +"; ?> diff --git a/b2rss2.php b/b2rss2.php index 16c5cfbe9..e01c3460e 100644 --- a/b2rss2.php +++ b/b2rss2.php @@ -1,12 +1,13 @@ "; ?> +?> +"; ?> diff --git a/gm-2-b2.php b/gm-2-b2.php index 6e9b8595b..de2d31e41 100644 --- a/gm-2-b2.php +++ b/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($b2inc."/b2functions.php"); +require('b2config.php'); +require($abspath.$b2inc.'/b2functions.php'); $b2varstoreset = array('action', 'gmpath', 'archivespath'); for ($i=0; $i @@ -13,10 +13,10 @@ require('wp-links/links.weblogs.com.php'); - + diff --git a/readme.html b/readme.html index 3ae904101..94257eaf0 100644 --- a/readme.html +++ b/readme.html @@ -108,9 +108,8 @@
  • 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.
    • -
  • You can keeep your b2config.php file if you want to, - but it is very important that you take the last few - lines from the WordPress and add those in, otherwise, nothing will work.
    • +
  • You must update your b2config.php. There's all + sort of new stuff in there.
  • WordPress issues should be discussed in our support forums.
  • Back up your database before you do anything. Yes, @@ -869,9 +868,9 @@

    Your XMLRPC server/path are as described here: if you login to b2 on http://mydomain.com/me/b2login.php, then you have:

      -
    • server: http://mydomain.com/me
      • +
    • server: http://example.com/me
    • path: /me/xmlrpc.php
      • -
    • complete URL (just in case): http://mydomain.com/me/xmlrpc.php
      • +
    • complete URL (just in case): http://example.com/me/xmlrpc.php

    There's also a b2-specific method: b2.getCategories. Request it with 3 strings: blog_ID (use '1'), username, password. The response is an array @@ -973,12 +972,12 @@


    Final notes:

      -
    • WordPress is functionnal, but a lot of coding and code clean-up remain +
    • WordPress is functional, but a lot of coding and code clean-up remain to be done.
    • If you've got suggestions, ideas, or comments, or if you found a bug, why not joining us in the Support Forums?
      • -
    • If you can code in PHP, you'll see the structure of b2 is flexible +
    • If you can code in PHP, you'll see the structure of WordPress is flexible enough to allow for more functions and sections to be added.


    @@ -986,7 +985,8 @@
    • Wherever third party code has been used, credit has been given in the code's comments.
      • -
    • WordPress is released under the GPL (see license.txt).
      • +
    • WordPress is released under the GPL + (see license.txt).
    diff --git a/wp-admin/b2edit.showposts.php b/wp-admin/b2edit.showposts.php index 859fc0add..e80e5d6b4 100644 --- a/wp-admin/b2edit.showposts.php +++ b/wp-admin/b2edit.showposts.php @@ -1,7 +1,7 @@