WordPress.org

Make WordPress Core

Changeset 601


Ignore:
Timestamp:
12/11/2003 12:22:36 AM (18 years ago)
Author:
saxmatt
Message:

The great renaming.

Location:
trunk
Files:
41 added
30 deleted
26 edited

Legend:

Unmodified
Added
Removed
  • trunk/b2rdf.php

    r535 r601  
    22$curpath = dirname(__FILE__).'/';
    33require_once ($curpath.'wp-config.php');
    4 require_once ($curpath.$b2inc.'/b2template.functions.php');
     4require_once ($curpath.$b2inc.'/template-functions.php');
    55header('HTTP/1.0 301 Moved Permanently');
    66header('Location: ' . get_bloginfo('rdf_url') . "\n");
  • trunk/b2rss.php

    r535 r601  
    22$curpath = dirname(__FILE__).'/';
    33require_once ($curpath.'wp-config.php');
    4 require_once ($curpath.$b2inc.'/b2template.functions.php');
     4require_once ($curpath.$b2inc.'/template-functions.php');
    55header('HTTP/1.0 301 Moved Permanently');
    66header('Location: ' . get_bloginfo('rss_url') . "\n");
  • trunk/b2rss2.php

    r535 r601  
    22$curpath = dirname(__FILE__).'/';
    33require_once ($curpath.'wp-config.php');
    4 require_once ($curpath.$b2inc.'/b2template.functions.php');
     4require_once ($curpath.$b2inc.'/template-functions.php');
    55header('HTTP/1.0 301 Moved Permanently');
    66header('Location: ' . get_bloginfo('rss2_url') . "\n");
  • trunk/index-smarty.php

    r544 r601  
    99$wpsmarty->cache_dir    = './wp-blogs/main/smartycache';
    1010$wpsmarty->plugin_dir    = './wp-plugins';
    11 require_once( 'b2-include/smarty.inc.php' );
     11require_once( 'b2-include/class-smarty.php' );
    1212$blog = 1;
    13 require_once('blog.header.php');
     13require_once('wp-blog-header.php');
    1414require_once($abspath.'wp-links/links.php');
    1515// not on by default: require_once($abspath.'wp-links/links.weblogs.com.php');
     
    2727        $content .= $wpsmarty->fetch( 'post.html' );
    2828        ob_start();
    29         include($abspath . 'b2comments.php');
     29        include($abspath . 'wp-comments.php');
    3030        $txt = ob_get_contents();
    3131        ob_end_clean();
  • trunk/index.php

    r569 r601  
    1 <?php /* Don't remove these lines, they call the b2 function files ! */
     1<?php
     2/* Don't remove these lines. */
    23$blog = 1;
    3 require_once('blog.header.php');
    4 require_once($abspath.'wp-links/links.php');
    5 // not on by default: require_once($abspath.'wp-links/links.weblogs.com.php');
     4require_once('wp-blog-header.php');
    65?>
    76<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     
    5352    -->
    5453
    55 <?php include($abspath . 'b2comments.php'); ?>
     54<?php include($abspath . 'wp-comments.php'); ?>
    5655</div>
    5756
     
    9493 <li>Other:
    9594    <ul>
    96         <li><a href="<?php echo $siteurl; ?>/b2login.php">login</a></li>
     95        <li><a href="<?php echo $siteurl; ?>/wp-login.php">login</a></li>
    9796        <li><a href="<?php echo $siteurl; ?>/b2register.php">register</a></li>
    9897    </ul>
  • trunk/readme.html

    r462 r601  
    6363  <li>Upload everything. This release is designed to sit in your root folder, IE the folder where your WordPress-powered page will reside.</li>
    6464  <li>The weblogs.com cache file needs to be writable by the web server. <a href="http://www.evolt.org/article/A_quick_and_dirty_chmod_Tutorial/18/541/">CHMOD 666</a> the <code>weblogs.com.changes.cache</code> file. </li>
    65   <li> Launch <a href="wp-admin/wp-install.php">wp-admin/wp-install.php</a> in your browser. This should setup the MySQL database for your blog. If there is an error, double check your wp-config.php file, and try again. If it fails again, please go to the <a href="http://wordpress.org/support/">support forums</a> and make a post with all the information about the failure (error messages, etc), and your setup (the PHP and MySQL versions on your server, and the browser you were using). <strong>Note the password given to you.</strong></li>
    66   <li> Go to <a href="b2login.php">b2login.php</a> and sign in with the login "admin" and the password given to you by the install script. Then click on the menu 'My Profile', and change the password. Note: you need javascript enabled to launch the profile popup window.</li>
     65  <li> Launch <a href="wp-admin/install.php">wp-admin/install.php</a> in your browser. This should setup the MySQL database for your blog. If there is an error, double check your wp-config.php file, and try again. If it fails again, please go to the <a href="http://wordpress.org/support/">support forums</a> and make a post with all the information about the failure (error messages, etc), and your setup (the PHP and MySQL versions on your server, and the browser you were using). <strong>Note the password given to you.</strong></li>
     66  <li> Go to <a href="wp-login.php">wp-login.php</a> and sign in with the login "admin" and the password given to you by the install script. Then click on the menu 'My Profile', and change the password. Note: you need javascript enabled to launch the profile popup window.</li>
    6767</ol>
    6868<h2>Some notes:</h2>
    6969<ul>
    70   <li>Whenever you want to post something, just open a browser and go to b2login.php to log in and post.</li>
     70  <li>Whenever you want to post something, just open a browser and go to wp-login.php to log in and post.</li>
    7171  <li>You can also use a bookmarklet and/or a sidebar (IE5+/NS6+) to post.</li>
    7272  <li> You can also post through the Blogger, MetaWeblog, and MovableType APIs, <a href="#xmlrpc">click here</a> for more info.</li>
     
    8888  <li>Enclosed is an example of a template, in the file b2.php. You can rename this file to "index.php"or something else (recent b2 versions have a default index.php, which is an elaborate CSS-based template).</li>
    8989  <li>You can have any number of template files, since all they do is extract the posts from the database.</li>
    90   <li>Pseudo-template for the comments is in b2comments.php. You needn't rename this file, but you can edit it.</li>
     90  <li>Pseudo-template for the comments is in wp-comments.php. You needn't rename this file, but you can edit it.</li>
    9191  <li>The only thing to remember is that it's not actually a template, but a PHP file that you're manipulating. So when you see "don't delete this line", you know you mustn't, unless you want to have a broken page.</li>
    92   <li>Required lines are: the first lines that call blog.header.php, the lines with the "while" statement, and the ones with just "}" (it ends the while loop).</li>
     92  <li>Required lines are: the first lines that call wp-blog-header.php, the lines with the "while" statement, and the ones with just "}" (it ends the while loop).</li>
    9393  <li>Between the "while" line and the "}", is the template for your posts.</li>
    9494</ul>
     
    430430    <li>width (default is 400)</li>
    431431    <li>height (default is 400)</li>
    432     <li>file name, in case you want to use a different template for comments (default is b2commentspopup.php)</li>
     432    <li>file name, in case you want to use a different template for comments (default is wp-comments-popup.php)</li>
    433433  </ul>
    434434</div>
     
    437437<strong>&lt;?php comments_popup_link() ?&gt;</strong><br />
    438438This will display the link to open comments in a popup window, with the number of comments.<br />
    439 To edit the popup window's template, edit the file b2commentspopup.php (it's the default one for comments popup).<br />
     439To edit the popup window's template, edit the file wp-comments-popup.php (it's the default one for comments popup).<br />
    440440<br />
    441441<br />
     
    481481This tag differs from v0.5's tag because in v0.5 and prior, it would only display a number, not a text with it, so you could have terrible things like "1 comments" (doh !)<br />
    482482<br />
    483 <strong>Necessary: &lt;?php include("b2comments.php") ?&gt;</strong><br />
     483<strong>Necessary: &lt;?php include("wp-comments.php") ?&gt;</strong><br />
    484484you'll put this line where you want the comments to be placed on your page.<br />
    485485typically, under the post itself. don't worry, the comments only appear if the page is called in the comments mode. (like this: url?c=1)<br />
    486486<br />
    487487<br />
    488 <strong>Tags that go in b2comments.php:</strong> (these are easy too)<br />
     488<strong>Tags that go in wp-comments.php:</strong> (these are easy too)<br />
    489489<br />
    490490<strong>&lt;?php comment_author() ?&gt;</strong><br />
     
    515515This tag is out of the b2 TrackBacks loop.<br />
    516516It will output the URL to TrackBack the post, that other people can copy and use in b2's posting interface to trackback this post.<br />
    517 <p>  In b2comments.php, like in the main template file, please keep the first PHP lines, the "while" lines, and the "}" lines.</p>
     517<p>  In wp-comments.php, like in the main template file, please keep the first PHP lines, the "while" lines, and the "}" lines.</p>
    518518<p>You can modify the form, but do not remove "&lt;?php echo ... ?&gt;" and all the name="..." attributes.</p>
    519519<br />
     
    596596Extended entries in the <a href="http://www.movabletype.org/docs/mtmanual_programmatic.html">MovableType API</a> are automatically converted to/from the WordPress &lt;!--more--&gt; tag.<br />
    597597<p>You can now post to your b2 blog with tools like <a href="http://blogbuddy.sourceforge.net">BlogBuddy</a>, <a href="http://bloggar.com/">Bloggar</a>, <a href="http://www.ubique.ch/wapblogger/">WapBlogger</a> (post from your Wap cellphone!), <a href="http://radio.userland.com">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.zempt.com/">Zempt</a>, <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the Blogging APIs! :)</p>
    598 <p>Your XMLRPC server/path are as described here: if you login to b2 on http://example.com/me/b2login.php, then you have:</p>
     598<p>Your XMLRPC server/path are as described here: if you login to b2 on http://example.com/me/wp-login.php, then you have:</p>
    599599<ul>
    600600  <li>server: http://example.com/ (some tools will just want the 'example.com' hostname part)</li>
     
    606606<p>You can post news from an email client!<br />
    607607  But first you'll have to edit the options on the options screen, filling the appropriate values for your POP3 email account (this interface doesn't support IMAP yet, only POP3, sorry).</p>
    608 <p> Once you have edited the options, you can make your webserver execute b2mail.php every set amount of time (depending on your host's performance, this script can be resource intensive, so don't make it run every minute or you'll be kicked).</p>
    609 <p>You can do it with Cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your b2mail.php URL.</p>
     608<p> Once you have edited the options, you can make your webserver execute wp-mail.php every set amount of time (depending on your host's performance, this script can be resource intensive, so don't make it run every minute or you'll be kicked).</p>
     609<p>You can do it with Cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your wp-mail.php URL.</p>
    610610<h2> Preliminary advice:</h2>
    611611<p> It is strongly advised to send your email as text-only (Outlook and Outlook Express default to 'html', which may cause problems), but HTML email could work (the script would strip all your html tags though...).</p>
  • trunk/wp-admin/categories.php

    r590 r601  
    4141
    4242    $standalone = 1;
    43     require_once('b2header.php');
     43    require_once('admin-header.php');
    4444   
    4545    if ($user_level < 3)
     
    5959
    6060    $standalone = 1;
    61     require_once('b2header.php');
     61    require_once('admin-header.php');
    6262
    6363    $cat_ID = intval($HTTP_GET_VARS["cat_ID"]);
     
    8080case 'edit':
    8181
    82     require_once ('b2header.php');
     82    require_once ('admin-header.php');
    8383    $category = $wpdb->get_row("SELECT * FROM $tablecategories WHERE cat_ID = " . $HTTP_GET_VARS['cat_ID']);
    8484    $cat_name = stripslashes($category->cat_name);
     
    105105
    106106    $standalone = 1;
    107     require_once('b2header.php');
     107    require_once('admin-header.php');
    108108
    109109    if ($user_level < 3)
     
    124124
    125125    $standalone = 0;
    126     require_once ('b2header.php');
     126    require_once ('admin-header.php');
    127127    if ($user_level < 3) {
    128128        die("You have no right to edit the categories for this blog.<br />Ask for a promotion to your <a href='mailto:$admin_email'>blog admin</a>. :)");
     
    195195
    196196/* </Categories> */
    197 include('b2footer.php');
     197include('admin-footer.php');
    198198?>
  • trunk/wp-admin/edit-comments.php

    r590 r601  
    22$title = 'Edit Comments';
    33$parent_file = 'edit.php';
    4 require_once('b2header.php');
     4require_once('admin-header.php');
    55
    66if (!$showcomments) {
     
    4141    <li><a href="edit.php">Latest Posts</a></li>
    4242    <li><a href="edit-comments.php" class="current">Latest Comments</a></li>
    43     <li class="last"><a href="wp-moderation.php">Comments Awaiting Moderation</a></li>
     43    <li class="last"><a href="moderation.php">Comments Awaiting Moderation</a></li>
    4444</ul>
    4545
     
    156156        <p>Posted <?php comment_date('M j, g:i A') ?> | <?php
    157157            if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) {
    158                 echo "<a href=\"wp-post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">Edit Comment</a>";
    159                 echo " | <a href=\"wp-post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n  \'Cancel\' to stop, \'OK\' to delete.')\">Delete</a> | ";
     158                echo "<a href=\"post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">Edit Comment</a>";
     159                echo " | <a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n  \'Cancel\' to stop, \'OK\' to delete.')\">Delete</a> | ";
    160160            } // end if any comments to show
    161161            // Get post title
    162162            $post_title = $wpdb->get_var("SELECT post_title FROM $tableposts WHERE ID = $comment->comment_post_ID");
    163163            $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
    164             ?> <a href="wp-post.php?action=edit&amp;post=<?php echo $comment->comment_post_ID; ?>">Edit Post &#8220;<?php echo $post_title; ?>&#8221;</a></p>
     164            ?> <a href="post.php?action=edit&amp;post=<?php echo $comment->comment_post_ID; ?>">Edit Post &#8220;<?php echo $post_title; ?>&#8221;</a></p>
    165165        </li>
    166166
     
    184184<?php
    185185echo $comments_nav_bar;
    186 include('b2footer.php');
     186include('admin-footer.php');
    187187?>
  • trunk/wp-admin/edit.php

    r570 r601  
    11<?php
    22$title = 'Edit Posts';
    3 require_once('b2header.php');
     3require_once('admin-header.php');
    44if (!$showposts) {
    55    if ($posts_per_page) {
     
    3939    <li><a href="edit.php" class="current">Latest Posts</a></li>
    4040    <li><a href="edit-comments.php">Latest Comments</a></li>
    41     <li class="last"><a href="wp-moderation.php">Comments Awaiting Moderation</a></li>
     41    <li class="last"><a href="moderation.php">Comments Awaiting Moderation</a></li>
    4242</ul>
    4343
     
    234234
    235235<?php
    236 include($abspath.'blog.header.php');
     236include($abspath.'wp-blog-header.php');
    237237
    238238if ($posts) {
     
    243243                <?php
    244244                if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) {
    245                 echo " - <a href='wp-post.php?action=edit&amp;post=$id";
     245                echo " - <a href='post.php?action=edit&amp;post=$id";
    246246                if ($m)
    247247                echo "&m=$m";
    248248                echo "'>Edit</a>";
    249                 echo " - <a href='wp-post.php?action=delete&amp;post=$id' onclick=\"return confirm('You are about to delete this post \'".the_title('','',0)."\'\\n  \'OK\' to delete, \'Cancel\' to stop.')\">Delete</a> ";
     249                echo " - <a href='post.php?action=delete&amp;post=$id' onclick=\"return confirm('You are about to delete this post \'".the_title('','',0)."\'\\n  \'OK\' to delete, \'Cancel\' to stop.')\">Delete</a> ";
    250250                }
    251251                if ('private' == $post->post_status) echo ' - <strong>Private</strong>';
     
    285285                            <?php
    286286                            if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) {
    287                                 echo "[ <a href=\"wp-post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">Edit</a>";
    288                                 echo " - <a href=\"wp-post.php?action=deletecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n  \'OK\' to delete, \'Cancel\' to stop.')\">Delete</a> ";
     287                                echo "[ <a href=\"post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">Edit</a>";
     288                                echo " - <a href=\"post.php?action=deletecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n  \'OK\' to delete, \'Cancel\' to stop.')\">Delete</a> ";
    289289                                if ( ('none' != $comment_status) && ($user_level >= 3) ) {
    290290                                    if ('approved' == wp_get_comment_status($comment->comment_ID)) {
    291                                         echo " - <a href=\"wp-post.php?action=unapprovecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Unapprove</a> ";
     291                                        echo " - <a href=\"post.php?action=unapprovecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Unapprove</a> ";
    292292                                    } else {
    293                                         echo " - <a href=\"wp-post.php?action=approvecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Approve</a> ";
     293                                        echo " - <a href=\"post.php?action=approvecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Approve</a> ";
    294294                                    }
    295295                                }
     
    321321                    <!-- form to add a comment -->
    322322
    323                     <form action="<?php echo $siteurl.'/b2comments.post.php'?>" method="post">
     323                    <form action="<?php echo $siteurl.'/wp-comments-post.php'?>" method="post">
    324324                        <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
    325325                        <input type="hidden" name="redirect_to" value="<?php echo $HTTP_SERVER_VARS["REQUEST_URI"]; ?>" />
     
    358358// uncomment this to show the nav bar at the bottom as well
    359359 echo $posts_nav_bar;
    360  include('b2footer.php');
    361 ?>
     360 include('admin-footer.php');
     361?>
  • trunk/wp-admin/import-blogger.php

    r570 r601  
    2222
    2323    require_once('../wp-config.php');
    24     require_once($abspath.$b2inc.'/b2template.functions.php');
    25     require_once($abspath.$b2inc.'/b2functions.php');
    26     require_once($abspath.$b2inc.'/b2vars.php');
     24    require_once($abspath.$b2inc.'/template-functions.php');
     25    require_once($abspath.$b2inc.'/functions.php');
     26    require_once($abspath.$b2inc.'/vars.php');
    2727
    2828?>
     
    3434<body>
    3535<div class="wrap">
    36 <h1>Blogger to <img src="../b2-img/wpminilogo.png" width="50" height="50" border="0" alt="WordPress" align="top" /></h1>
     36<h1>Blogger to <img src="../wp-images/wpminilogo.png" width="50" height="50" border="0" alt="WordPress" align="top" /></h1>
    3737<p>The importer is running...</p>
    3838<ul>
     
    167167<p>&nbsp;</p>
    168168<p>Completed Blogger to WordPress import!</p>
    169 <p>Now you can go and <a href="../b2login.php">log in</a>, have fun!</p>
     169<p>Now you can go and <a href="../wp-login.php">log in</a>, have fun!</p>
    170170</div>
    171171</body>
     
    185185<body>
    186186<div class="wrap">
    187 <h1>Blogger to <img src="../b2-img/wpminilogo.png" width="50" height="50" border="0" alt="WordPress" align="top" /></h1>
     187<h1>Blogger to <img src="../wp-images/wpminilogo.png" width="50" height="50" border="0" alt="WordPress" align="top" /></h1>
    188188<p>This is a basic Blogger to WordPress import script.</p>
    189189<p>What it does:</p>
  • trunk/wp-admin/import-greymatter.php

    r570 r601  
    66
    77require_once('wp-config.php');
    8 require_once($abspath.$b2inc.'/b2functions.php');
     8require_once($abspath.$b2inc.'/functions.php');
    99
    1010$b2varstoreset = array('action', 'gmpath', 'archivespath');
     
    6464</head>
    6565<body style="margin: 20px;">
    66 <p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="b2-img/wpminilogo.png" width="50" height="50" border="0" alt="b2" align="top" /></font></p>
     66<p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="wp-images/wpminilogo.png" width="50" height="50" border="0" alt="b2" align="top" /></font></p>
    6767<p>The importer is running...</p>
    6868<ul>
     
    240240<p>&nbsp;</p>
    241241<p>Completed GM 2 b2 import !</p>
    242 <p>Now you can go and <a href="b2login.php">log in</a>, have fun !</p>
     242<p>Now you can go and <a href="wp-login.php">log in</a>, have fun !</p>
    243243    <?php
    244244    break;
     
    275275</head>
    276276<body style="margin: 20px;">
    277 <p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="b2-img/wpminilogo.png" width="50" height="50" border="0" alt="b2" align="top" /></font></p>
     277<p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="wp-images/wpminilogo.png" width="50" height="50" border="0" alt="b2" align="top" /></font></p>
    278278<p>This is a basic GreyMatter to b2 import script.</p>
    279279<p>What it does:</p>
  • trunk/wp-admin/import-textpattern.php

    r570 r601  
    1010if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config.sample.php with the proper database connection information and renamed it to wp-config.php.");
    1111require('../wp-config.php');
    12 require('wp-install-helper.php');
     12require('install-helper.php');
    1313
    1414$step = $HTTP_GET_VARS['step'];
  • trunk/wp-admin/index.php

    r479 r601  
    33/* This will possibly be more later but for now let's just redirect. */
    44
    5 header ('Location: wp-post.php');
     5header ('Location: post.php');
    66?>
  • trunk/wp-admin/templates.php

    r589 r601  
    4040
    4141    $standalone = 1;
    42     require_once("b2header.php");
     42    require_once("admin-header.php");
    4343
    4444    if ($user_level < 3) {
     
    6060default:
    6161
    62     require_once('b2header.php');
     62    require_once('admin-header.php');
    6363
    6464    if ($user_level <= 3) {
     
    128128</div>
    129129<div class="wrap">
    130   <p>You can also edit the <a href="templates.php?file=b2comments.php">comments template</a> or the <a href="templates.php?file=b2commentspopup.php">popup comments template</a>, or edit any other file (provided it&#8217;s writable by the server, e.g. CHMOD 766).</p>
     130  <p>You can also edit the <a href="templates.php?file=wp-comments.php">comments template</a> or the <a href="templates.php?file=wp-comments-popup.php">popup comments template</a>, or edit any other file (provided it&#8217;s writable by the server, e.g. CHMOD 766).</p>
    131131  <p>To edit a file, type its name here:</p>
    132132  <form name="file" action="templates.php" method="get">
     
    141141}
    142142
    143 include("b2footer.php") ?>
     143include("admin-footer.php") ?>
  • trunk/wp-admin/upgrade-071-to-072.php

    r494 r601  
    33if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config.sample.php with the proper database connection information and renamed it to wp-config.php.");
    44require('../wp-config.php');
    5 require('wp-install-helper.php');
     5require('install-helper.php');
    66
    77$thisfile = 'upgrade-071-to-072.php';
     
    409409"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(15,'use_balanceTags', 2, '1', 'this could help balance your HTML code. if it gives bad results, set it to false', 8, 20)",
    410410"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(16,'use_smilies', 2, '1', 'set this to true to enable smiley conversion in posts (note: this makes smiley conversion in ALL posts)', 8, 20)",
    411 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(17,'smilies_directory', 3, 'http://example.com/b2-img/smilies', 'the directory where your smilies are (no trailing slash)', 8, 40)",
     411"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(17,'smilies_directory', 3, 'http://example.com/wp-images/smilies', 'the directory where your smilies are (no trailing slash)', 8, 40)",
    412412"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(18,'require_name_email', 2, '0', 'set this to true to require e-mail and name, or false to allow comments without e-mail/name', 8, 20)",
    413413"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(19,'comment_allowed_tags', 3, '<b><i><strong><em><code><blockquote><p><br><strike><a>', 'here is a list of the tags that are allowed in the comments. You can add tags to the list, just add them in the string, add only the opening tag: for example, only \'&lt;a>\' instead of \'&lt;a href=\"\">&lt;/a>\'', 8, 40)",
     
    710710?>
    711711<p>Hmm... I couldn't find links.config.php so I couldn't transfer all your settings.
    712     You need to check them on the <a href="wp-options.php?option_group_id=8">admin options page</a>.</p>
     712    You need to check them on the <a href="options.php?option_group_id=8">admin options page</a>.</p>
    713713<?php
    714714    } // end else no links.config
     
    820820?>
    821821<p>Hmm... I couldn't find b2config.php so I couldn't transfer all your settings.
    822     You need to check them on the <a href="wp-options.php?option_group_id=6">admin options page</a>.</p>
     822    You need to check them on the <a href="options.php?option_group_id=6">admin options page</a>.</p>
    823823<p>You can now go play with your <a href="<?php echo $siteurl ? $siteurl : '../index.php'; ?>">updated blog</a> </p>
    824824<?php
  • trunk/wp-admin/upgrade-072-to-080.php

    r567 r601  
    11<?php
    22require_once('../wp-config.php');
    3 require('wp-install-helper.php');
     3require('install-helper.php');
    44
    55$step = $HTTP_GET_VARS['step'];
     
    110110        (`option_id`, `blog_id`, `option_name`, `option_can_override`, `option_type`, `option_value`, `option_width`, `option_height`, `option_description`, `option_admin_level`)
    111111        VALUES
    112         ('', '0', 'permalink_structure', 'Y', '3', '', '20', '8', 'How the permalinks for your site are constructed. See <a href=\"wp-options-permalink.php\">permalink options page</a> for necessary mod_rewrite rules and more information.', '8');");
     112        ('', '0', 'permalink_structure', 'Y', '3', '', '20', '8', 'How the permalinks for your site are constructed. See <a href=\"options-permalink.php\">permalink options page</a> for necessary mod_rewrite rules and more information.', '8');");
    113113    }
    114114?>
     
    271271?>
    272272 All done!</p>
    273  <p>You are ready to rock &#8217;n roll. <a href="../b2login.php">Go crazy</a>.</p>
     273 <p>You are ready to rock &#8217;n roll. <a href="../wp-login.php">Go crazy</a>.</p>
    274274<?php
    275275    break;
  • trunk/wp-admin/users.php

    r591 r601  
    2424
    2525    $standalone = 1;
    26     require_once('b2header.php');
     26    require_once('admin-header.php');
    2727
    2828    if (empty($HTTP_GET_VARS['prom'])) {
     
    5454
    5555    $standalone = 1;
    56     require_once('b2header.php');
     56    require_once('admin-header.php');
    5757
    5858    $id = $HTTP_GET_VARS['id'];
     
    8181   
    8282    $standalone = 0;
    83     include ('b2header.php');
     83    include ('admin-header.php');
    8484    ?>
    8585<div class="wrap">
     
    193193   
    194194/* </Team> */
    195 include('b2footer.php');
     195include('admin-footer.php');
    196196?>
  • trunk/wp-admin/wp-admin.css

    r590 r601  
    294294    height: 44px;
    295295    margin: 0;
    296     background: repeat-x url(../b2-img/header-shadow.png) #f2f2f2;
     296    background: repeat-x url(../wp-images/header-shadow.png) #f2f2f2;
    297297}
    298298
    299299#wphead a {
    300300    display: block;
    301     background: url(../b2-img/wp-small.png) no-repeat;
     301    background: url(../wp-images/wp-small.png) no-repeat;
    302302    height: 44px;
    303303    text-decoration: none;
  • trunk/wp-commentsrss2.php

    r569 r601  
    88$blog=1; // enter your blog's ID
    99header('Content-type: text/xml');
    10 include('blog.header.php');
     10require('wp-blog-header.php');
    1111
    1212if (!isset($rss_language)) { $rss_language = 'en'; }
  • trunk/wp-locations.php

    r294 r601  
    11<?php $blog = 1; // enter your blog's ID
    22header('Content-type: text/xml');
    3 include('blog.header.php');
     3include('wp-blog-header.php');
    44?><?php echo "<?xml version=\"1.0\"?".">\n"; ?>
    55<travels>
  • trunk/wp-pass.php

    r458 r601  
    11<?php
    2 
    32/*
    43  This is just a very simple script to set a cookie with a posted password and redirect back from whence the browser came.
     
    65  -- Matt
    76*/
    8 include_once('wp-config.php');
     7require(dirname(__FILE__) . '/wp-config.php');
    98setcookie('wp-postpass_'.$cookiehash, $HTTP_POST_VARS['post_password'], time()+60*60*24*30);
    109header('Location: ' . $HTTP_SERVER_VARS['HTTP_REFERER']);
  • trunk/wp-rdf.php

    r568 r601  
    33$doing_rss = 1;
    44header('Content-type: text/xml', true);
    5 include('blog.header.php');
     5require('wp-blog-header.php');
    66
    77// Get the time of the most recent article
  • trunk/wp-register.php

    r586 r601  
    11<?php
    2 /* <Register> */
    3 
    4 require_once('wp-config.php');
    5 require_once($abspath.$b2inc.'/b2functions.php');
     2require(dirname(__FILE__) . '/wp-config.php');
    63
    74function add_magic_quotes($array) {
     
    127124    Password: <strong><?php echo $stars; ?></strong><br />
    128125    E-mail: <strong><?php echo $user_email; ?></strong></p>
    129     <form action="b2login.php" method="post" name="login">
     126    <form action="wp-login.php" method="post" name="login">
    130127        <input type="hidden" name="log" value="<?php echo $user_login; ?>" />
    131128        <input type="submit" value="Login" name="submit" />
  • trunk/wp-rss.php

    r568 r601  
    44$doing_rss = 1;
    55header('Content-type: text/xml', true);
    6 include('blog.header.php');
     6require('wp-blog-header.php');
    77
    88// Get the time of the most recent article
  • trunk/wp-rss2.php

    r568 r601  
    33$doing_rss = 1;
    44header('Content-type: text/xml', true);
    5 include('blog.header.php');
     5require('wp-blog-header.php');
    66
    77// Get the time of the most recent article
  • trunk/wp-settings.php

    r561 r601  
    11<?php
     2// This is the name of the include directory. No "/" allowed.
     3$b2inc = 'wp-includes';
     4
     5require ($abspath . 'wp-config-extra.php');
     6require ($abspath . $b2inc . '/wp-db.php');
     7require ($abspath . $b2inc . '/functions.php');
     8require ($abspath . $b2inc . '/template-functions.php');
     9require ($abspath . $b2inc . '/vars.php');
     10require ($abspath . $b2inc . '/class-xmlrpc.php');
     11require ($abspath . $b2inc . '/class-xmlrpcs.php');
     12require ($abspath . '/wp-links/links.php');
     13
     14$HTTP_HOST = getenv('HTTP_HOST');  /* domain name */
     15$REMOTE_ADDR = getenv('REMOTE_ADDR'); /* visitor's IP */
     16$HTTP_USER_AGENT = getenv('HTTP_USER_AGENT'); /* visitor's browser */
     17
    218// Table names
    319$tableposts               = $table_prefix . 'posts';
     
    7995    $default_geourl_lon = get_settings('default_geourl_lon');
    8096
    81     /* not currently used
    82     if (get_settings('search_engine_friendly_urls')) {
    83         $querystring_start = '/';
    84         $querystring_equal = '/';
    85         $querystring_separator = '/';
    86     } else {
    87     */
    8897    $querystring_start = '?';
    8998    $querystring_equal = '=';
Note: See TracChangeset for help on using the changeset viewer.