WordPress.org
Get WordPress

Make WordPress Core

Changeset 628


Ignore:
Timestamp:
12/18/2003 09:36:13 AM (21 years ago)
Author:
saxmatt
Message:

Renaming Reloaded.

Location:
trunk
Files:
1 deleted
41 edited

Legend:

Unmodified
Added
Removed

  • trunk/b2rdf.php

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

  • trunk/b2rss.php

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

  • trunk/b2rss2.php

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

  • trunk/index-smarty.php

    r601 r628  
    1212$blog = 1;
    1313require_once('wp-blog-header.php');
    14 require_once($abspath.'wp-links/links.php');
    15 // not on by default: require_once($abspath.'wp-links/links.weblogs.com.php');
     14require_once(ABSPATH.'wp-links/links.php');
     15// not on by default: require_once(ABSPATH.'wp-links/links.weblogs.com.php');
    1616
    1717define( 'NODISPLAY', false );
    1818
    1919$wpsmarty->assign( 'siteurl', $siteurl );
    20 $wpsmarty->assign( 'b2_version', $b2_version );
     20$wpsmarty->assign( 'b2_version', $wp_version );
    2121
    2222if($posts)
    … …  
    2424    foreach ($posts as $post)
    2525    {
    26         start_b2();
     26        start_wp();
    2727        $content .= $wpsmarty->fetch( 'post.html' );
    2828        ob_start();
    29         include($abspath . 'wp-comments.php');
     29        include(ABSPATH . 'wp-comments.php');
    3030        $txt = ob_get_contents();
    3131        ob_end_clean();

  • trunk/index.php

    r617 r628  
    3131
    3232<div id="content">
    33 <?php if ($posts) { foreach ($posts as $post) { start_b2(); ?>
     33<?php if ($posts) { foreach ($posts as $post) { start_wp(); ?>
    3434
    3535<?php the_date('','<h2>','</h2>'); ?>
    … …  
    5252    -->
    5353
    54 <?php include($abspath . 'wp-comments.php'); ?>
     54<?php include(ABSPATH . 'wp-comments.php'); ?>
    5555</div>
    5656

  • trunk/wp-admin/admin-footer.php

    r606 r628  
    11
    22
    3 <p align="center" style="width: 100%" class="tabletoprow"><strong><a href="http://wordpress.org">WordPress</a></strong> <?php echo $b2_version ?> &#8212; <a href="http://wordpress.org/support/">Support Forums</a><br />
     3<p align="center" style="width: 100%" class="tabletoprow"><strong><a href="http://wordpress.org">WordPress</a></strong> <?php echo $wp_version ?> &#8212; <a href="http://wordpress.org/support/">Support Forums</a><br />
    44<?php
    55    echo number_format(timer_stop(), 2)." seconds";

  • trunk/wp-admin/admin-header.php

    r617 r628  
    22
    33require_once('../wp-config.php');
    4 require_once($abspath.'/wp-admin/auth.php');
     4require_once(ABSPATH.'/wp-admin/auth.php');
    55
    66function gethelp_link($this_file, $helptag) {
    … …  
    3030    $use_quicktags = 0;
    3131
    32 $b2varstoreset = array('profile','standalone','redirect','redirect_url','a','popuptitle','popupurl','text', 'trackback', 'pingback');
    33 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    34     $b2var = $b2varstoreset[$i];
    35     if (!isset($$b2var)) {
    36         if (empty($HTTP_POST_VARS["$b2var"])) {
    37             if (empty($HTTP_GET_VARS["$b2var"])) {
    38                 $$b2var = '';
     32$wpvarstoreset = array('profile','standalone','redirect','redirect_url','a','popuptitle','popupurl','text', 'trackback', 'pingback');
     33for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     34    $wpvar = $wpvarstoreset[$i];
     35    if (!isset($$wpvar)) {
     36        if (empty($HTTP_POST_VARS["$wpvar"])) {
     37            if (empty($HTTP_GET_VARS["$wpvar"])) {
     38                $$wpvar = '';
    3939            } else {
    40                 $$b2var = $HTTP_GET_VARS["$b2var"];
     40                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    4141            }
    4242        } else {
    43             $$b2var = $HTTP_POST_VARS["$b2var"];
     43            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    4444        }
    4545    }

  • trunk/wp-admin/bookmarklet.php

    r617 r628  
    9191
    9292if (($is_macIE) && (!isset($IEMac_bookmarklet_fix))) {
    93     $popuptitle = preg_replace($b2_macIE_correction["in"],$b2_macIE_correction["out"],$popuptitle);
    94     $text = preg_replace($b2_macIE_correction["in"],$b2_macIE_correction["out"],$text);
     93    $popuptitle = preg_replace($wp_macIE_correction["in"],$wp_macIE_correction["out"],$popuptitle);
     94    $text = preg_replace($wp_macIE_correction["in"],$wp_macIE_correction["out"],$text);
    9595}
    9696
    … …  
    101101
    102102if (($is_gecko) && (!isset($Gecko_bookmarklet_fix))) {
    103     $popuptitle = preg_replace($b2_gecko_correction["in"],$b2_gecko_correction["out"],$popuptitle);
    104     $text = preg_replace($b2_gecko_correction["in"],$b2_gecko_correction["out"],$text);
     103    $popuptitle = preg_replace($wp_gecko_correction["in"],$wp_gecko_correction["out"],$popuptitle);
     104    $text = preg_replace($wp_gecko_correction["in"],$wp_gecko_correction["out"],$text);
    105105}
    106106

  • trunk/wp-admin/categories.php

    r601 r628  
    2020}
    2121
    22 $b2varstoreset = array('action','standalone','cat');
    23 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    24     $b2var = $b2varstoreset[$i];
    25     if (!isset($$b2var)) {
    26         if (empty($HTTP_POST_VARS["$b2var"])) {
    27             if (empty($HTTP_GET_VARS["$b2var"])) {
    28                 $$b2var = '';
     22$wpvarstoreset = array('action','standalone','cat');
     23for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     24    $wpvar = $wpvarstoreset[$i];
     25    if (!isset($$wpvar)) {
     26        if (empty($HTTP_POST_VARS["$wpvar"])) {
     27            if (empty($HTTP_GET_VARS["$wpvar"])) {
     28                $$wpvar = '';
    2929            } else {
    30                 $$b2var = $HTTP_GET_VARS["$b2var"];
     30                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    3131            }
    3232        } else {
    33             $$b2var = $HTTP_POST_VARS["$b2var"];
     33            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    3434        }
    3535    }

  • trunk/wp-admin/edit-showposts.php

    r617 r628  
    235235    <?php
    236236    // these lines are b2's "motor", do not alter nor remove them
    237     include($abspath.'wp-blog-header.php');
     237    include(ABSPATH.'wp-blog-header.php');
    238238
    239239    if ($posts) {
    240240    foreach ($posts as $post) {
    241241        //$posts_per_page = 10;
    242         start_b2(); ?>
     242        start_wp(); ?>
    243243            <p>
    244244                <strong><?php the_time('Y/m/d @ H:i:s'); ?></strong> [ <a href="post.php?p=<?php echo $id ?>&c=1"><?php comments_number('no comments', '1 comment', "% comments", true) ?></a>

  • trunk/wp-admin/edit.php

    r601 r628  
    234234
    235235<?php
    236 include($abspath.'wp-blog-header.php');
     236include(ABSPATH.'wp-blog-header.php');
    237237
    238238if ($posts) {
    239 foreach ($posts as $post) { start_b2();
     239foreach ($posts as $post) { start_wp();
    240240?>
    241241            <p>

  • trunk/wp-admin/import-blogger.php

    r617 r628  
    11<?php // rename this to blogger-2-b2.php
    22
    3 $b2varstoreset = array('action');
    4 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    5     $b2var = $b2varstoreset[$i];
    6     if (!isset($$b2var)) {
    7         if (empty($HTTP_POST_VARS["$b2var"])) {
    8             if (empty($HTTP_GET_VARS["$b2var"])) {
    9                 $$b2var = '';
     3$wpvarstoreset = array('action');
     4for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     5    $wpvar = $wpvarstoreset[$i];
     6    if (!isset($$wpvar)) {
     7        if (empty($HTTP_POST_VARS["$wpvar"])) {
     8            if (empty($HTTP_GET_VARS["$wpvar"])) {
     9                $$wpvar = '';
    1010            } else {
    11                 $$b2var = $HTTP_GET_VARS["$b2var"];
     11                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    1212            }
    1313        } else {
    14             $$b2var = $HTTP_POST_VARS["$b2var"];
     14            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    1515        }
    1616    }
    … …  
    2222
    2323    require_once('../wp-config.php');
    24     require_once($abspath.$b2inc.'/template-functions.php');
    25     require_once($abspath.$b2inc.'/functions.php');
    26     require_once($abspath.$b2inc.'/vars.php');
     24    require_once(ABSPATH.WPINC.'/template-functions.php');
     25    require_once(ABSPATH.WPINC.'/functions.php');
     26    require_once(ABSPATH.WPINC.'/vars.php');
    2727
    2828?>

  • trunk/wp-admin/import-greymatter.php

    r617 r628  
    66
    77require_once('wp-config.php');
    8 require_once($abspath.$b2inc.'/functions.php');
    9 
    10 $b2varstoreset = array('action', 'gmpath', 'archivespath');
    11 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    12     $b2var = $b2varstoreset[$i];
    13     if (!isset($$b2var)) {
    14         if (empty($HTTP_POST_VARS["$b2var"])) {
    15             if (empty($HTTP_GET_VARS["$b2var"])) {
    16                 $$b2var = '';
     8require_once(ABSPATH.WPINC.'/functions.php');
     9
     10$wpvarstoreset = array('action', 'gmpath', 'archivespath');
     11for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     12    $wpvar = $wpvarstoreset[$i];
     13    if (!isset($$wpvar)) {
     14        if (empty($HTTP_POST_VARS["$wpvar"])) {
     15            if (empty($HTTP_GET_VARS["$wpvar"])) {
     16                $$wpvar = '';
    1717            } else {
    18                 $$b2var = $HTTP_GET_VARS["$b2var"];
     18                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    1919            }
    2020        } else {
    21             $$b2var = $HTTP_POST_VARS["$b2var"];
     21            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    2222        }
    2323    }

  • trunk/wp-admin/link-categories.php

    r616 r628  
    88$parent_file = 'link-manager.php';
    99
    10 $b2varstoreset = array('action','standalone','cat', 'auto_toggle');
    11 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    12     $b2var = $b2varstoreset[$i];
    13     if (!isset($$b2var)) {
    14         if (empty($HTTP_POST_VARS["$b2var"])) {
    15             if (empty($HTTP_GET_VARS["$b2var"])) {
    16                 $$b2var = '';
     10$wpvarstoreset = array('action','standalone','cat', 'auto_toggle');
     11for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     12    $wpvar = $wpvarstoreset[$i];
     13    if (!isset($$wpvar)) {
     14        if (empty($HTTP_POST_VARS["$wpvar"])) {
     15            if (empty($HTTP_GET_VARS["$wpvar"])) {
     16                $$wpvar = '';
    1717            } else {
    18                 $$b2var = $HTTP_GET_VARS["$b2var"];
     18                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    1919            }
    2020        } else {
    21             $$b2var = $HTTP_POST_VARS["$b2var"];
     21            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    2222        }
    2323    }

  • trunk/wp-admin/link-manager.php

    r601 r628  
    4242}
    4343
    44 $b2varstoreset = array('action','standalone','cat_id', 'linkurl', 'name', 'image',
     44$wpvarstoreset = array('action','standalone','cat_id', 'linkurl', 'name', 'image',
    4545                       'description', 'visible', 'target', 'category', 'link_id',
    4646                       'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
    4747                       'notes', 'linkcheck[]');
    48 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    49     $b2var = $b2varstoreset[$i];
    50     if (!isset($$b2var)) {
    51         if (empty($HTTP_POST_VARS["$b2var"])) {
    52             if (empty($HTTP_GET_VARS["$b2var"])) {
    53                 $$b2var = '';
     48for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     49    $wpvar = $wpvarstoreset[$i];
     50    if (!isset($$wpvar)) {
     51        if (empty($HTTP_POST_VARS["$wpvar"])) {
     52            if (empty($HTTP_GET_VARS["$wpvar"])) {
     53                $$wpvar = '';
    5454            } else {
    55                 $$b2var = $HTTP_GET_VARS["$b2var"];
     55                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    5656            }
    5757        } else {
    58             $$b2var = $HTTP_POST_VARS["$b2var"];
     58            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    5959        }
    6060    }

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

    r601 r628  
    11<?php
    22require_once('../wp-config.php');
    3 require_once($abspath.$b2inc.'/functions.php');
     3require_once(ABSPATH.WPINC.'/functions.php');
    44
    55// columns we wish to find are:  link_url, link_name, link_target, link_description

  • trunk/wp-admin/moderation.php

    r601 r628  
    2121}
    2222
    23 $b2varstoreset = array('action','item_ignored','item_deleted','item_approved');
    24 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    25     $b2var = $b2varstoreset[$i];
    26     if (!isset($$b2var)) {
    27         if (empty($HTTP_POST_VARS["$b2var"])) {
    28             if (empty($HTTP_GET_VARS["$b2var"])) {
    29                 $$b2var = '';
     23$wpvarstoreset = array('action','item_ignored','item_deleted','item_approved');
     24for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     25    $wpvar = $wpvarstoreset[$i];
     26    if (!isset($$wpvar)) {
     27        if (empty($HTTP_POST_VARS["$wpvar"])) {
     28            if (empty($HTTP_GET_VARS["$wpvar"])) {
     29                $$wpvar = '';
    3030            } else {
    31                 $$b2var = $HTTP_GET_VARS["$b2var"];
     31                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    3232            }
    3333        } else {
    34             $$b2var = $HTTP_POST_VARS["$b2var"];
     34            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    3535        }
    3636    }

  • trunk/wp-admin/options-permalink.php

    r613 r628  
    2020}
    2121
    22 $b2varstoreset = array('action','standalone', 'option_group_id');
    23 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    24     $b2var = $b2varstoreset[$i];
    25     if (!isset($$b2var)) {
    26         if (empty($HTTP_POST_VARS["$b2var"])) {
    27             if (empty($HTTP_GET_VARS["$b2var"])) {
    28                 $$b2var = '';
     22$wpvarstoreset = array('action','standalone', 'option_group_id');
     23for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     24    $wpvar = $wpvarstoreset[$i];
     25    if (!isset($$wpvar)) {
     26        if (empty($HTTP_POST_VARS["$wpvar"])) {
     27            if (empty($HTTP_GET_VARS["$wpvar"])) {
     28                $$wpvar = '';
    2929            } else {
    30                 $$b2var = $HTTP_GET_VARS["$b2var"];
     30                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    3131            }
    3232        } else {
    33             $$b2var = $HTTP_POST_VARS["$b2var"];
     33            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    3434        }
    3535    }

  • trunk/wp-admin/options.php

    r620 r628  
    2020}
    2121
    22 $b2varstoreset = array('action','standalone', 'option_group_id');
    23 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    24     $b2var = $b2varstoreset[$i];
    25     if (!isset($$b2var)) {
    26         if (empty($HTTP_POST_VARS["$b2var"])) {
    27             if (empty($HTTP_GET_VARS["$b2var"])) {
    28                 $$b2var = '';
     22$wpvarstoreset = array('action','standalone', 'option_group_id');
     23for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     24    $wpvar = $wpvarstoreset[$i];
     25    if (!isset($$wpvar)) {
     26        if (empty($HTTP_POST_VARS["$wpvar"])) {
     27            if (empty($HTTP_GET_VARS["$wpvar"])) {
     28                $$wpvar = '';
    2929            } else {
    30                 $$b2var = $HTTP_GET_VARS["$b2var"];
     30                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    3131            }
    3232        } else {
    33             $$b2var = $HTTP_POST_VARS["$b2var"];
     33            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    3434        }
    3535    }

  • trunk/wp-admin/post.php

    r607 r628  
    1919}
    2020
    21 $b2varstoreset = array('action', 'safe_mode', 'withcomments', 'c', 'posts', 'poststart', 'postend', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder');
    22 
    23 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    24     $b2var = $b2varstoreset[$i];
    25     if (!isset($$b2var)) {
    26         if (empty($HTTP_POST_VARS["$b2var"])) {
    27             if (empty($HTTP_GET_VARS["$b2var"])) {
    28                 $$b2var = '';
     21$wpvarstoreset = array('action', 'safe_mode', 'withcomments', 'c', 'posts', 'poststart', 'postend', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder');
     22
     23for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     24    $wpvar = $wpvarstoreset[$i];
     25    if (!isset($$wpvar)) {
     26        if (empty($HTTP_POST_VARS["$wpvar"])) {
     27            if (empty($HTTP_GET_VARS["$wpvar"])) {
     28                $$wpvar = '';
    2929            } else {
    30                 $$b2var = $HTTP_GET_VARS["$b2var"];
    31             }
    32         } else {
    33             $$b2var = $HTTP_POST_VARS["$b2var"];
     30                $$wpvar = $HTTP_GET_VARS["$wpvar"];
     31            }
     32        } else {
     33            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    3434        }
    3535    }

  • trunk/wp-admin/profile.php

    r617 r628  
    1919}
    2020
    21 $b2varstoreset = array('action','standalone','redirect','profile','user');
    22 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    23     $b2var = $b2varstoreset[$i];
    24     if (!isset($$b2var)) {
    25         if (empty($HTTP_POST_VARS["$b2var"])) {
    26             if (empty($HTTP_GET_VARS["$b2var"])) {
    27                 $$b2var = '';
     21$wpvarstoreset = array('action','standalone','redirect','profile','user');
     22for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     23    $wpvar = $wpvarstoreset[$i];
     24    if (!isset($$wpvar)) {
     25        if (empty($HTTP_POST_VARS["$wpvar"])) {
     26            if (empty($HTTP_GET_VARS["$wpvar"])) {
     27                $$wpvar = '';
    2828            } else {
    29                 $$b2var = $HTTP_GET_VARS["$b2var"];
     29                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    3030            }
    3131        } else {
    32             $$b2var = $HTTP_POST_VARS["$b2var"];
     32            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    3333        }
    3434    }
    … …  
    3636
    3737require_once('../wp-config.php');
    38 require_once($abspath.$b2inc.'/functions.php');
     38require_once(ABSPATH.WPINC.'/functions.php');
    3939
    4040switch($action) {

  • trunk/wp-admin/templates.php

    r618 r628  
    1919}
    2020
    21 $b2varstoreset = array('action','standalone','redirect','profile','error','warning','a','file');
    22 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    23     $b2var = $b2varstoreset[$i];
    24     if (!isset($$b2var)) {
    25         if (empty($HTTP_POST_VARS["$b2var"])) {
    26             if (empty($HTTP_GET_VARS["$b2var"])) {
    27                 $$b2var = '';
     21$wpvarstoreset = array('action','standalone','redirect','profile','error','warning','a','file');
     22for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     23    $wpvar = $wpvarstoreset[$i];
     24    if (!isset($$wpvar)) {
     25        if (empty($HTTP_POST_VARS["$wpvar"])) {
     26            if (empty($HTTP_GET_VARS["$wpvar"])) {
     27                $$wpvar = '';
    2828            } else {
    29                 $$b2var = $HTTP_GET_VARS["$b2var"];
     29                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    3030            }
    3131        } else {
    32             $$b2var = $HTTP_POST_VARS["$b2var"];
     32            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    3333        }
    3434    }

  • trunk/wp-admin/upload.php

    r601 r628  
    1616<head>
    1717<title>WordPress :: upload images/files</title>
    18 <link rel="stylesheet" href="<?php echo $b2inc; ?>/b2.css" type="text/css">
     18<link rel="stylesheet" href="<?php echo WPINC; ?>/b2.css" type="text/css">
    1919<style type="text/css">
    2020<!--

  • trunk/wp-admin/users.php

    r601 r628  
    33/* <Team> */
    44   
    5 $b2varstoreset = array('action','standalone','redirect','profile');
    6 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    7     $b2var = $b2varstoreset[$i];
    8     if (!isset($$b2var)) {
    9         if (empty($HTTP_POST_VARS["$b2var"])) {
    10             if (empty($HTTP_GET_VARS["$b2var"])) {
    11                 $$b2var = '';
     5$wpvarstoreset = array('action','standalone','redirect','profile');
     6for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     7    $wpvar = $wpvarstoreset[$i];
     8    if (!isset($$wpvar)) {
     9        if (empty($HTTP_POST_VARS["$wpvar"])) {
     10            if (empty($HTTP_GET_VARS["$wpvar"])) {
     11                $$wpvar = '';
    1212            } else {
    13                 $$b2var = $HTTP_GET_VARS["$b2var"];
     13                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    1414            }
    1515        } else {
    16             $$b2var = $HTTP_POST_VARS["$b2var"];
     16            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    1717        }
    1818    }

  • trunk/wp-blog-header.php

    r601 r628  
    1212require_once ($curpath.'/wp-config.php');
    1313
    14 $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', 'year', 'monthnum', 'day', 'name', 'category_name');
    15 
    16     for ($i=0; $i<count($b2varstoreset); $i += 1) {
    17         $b2var = $b2varstoreset[$i];
    18         if (!isset($$b2var)) {
    19             if (empty($HTTP_POST_VARS[$b2var])) {
    20                 if (empty($HTTP_GET_VARS[$b2var])) {
    21                     $$b2var = '';
     14$wpvarstoreset = 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', 'year', 'monthnum', 'day', 'name', 'category_name');
     15
     16    for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     17        $wpvar = $wpvarstoreset[$i];
     18        if (!isset($$wpvar)) {
     19            if (empty($HTTP_POST_VARS[$wpvar])) {
     20                if (empty($HTTP_GET_VARS[$wpvar])) {
     21                    $$wpvar = '';
    2222                } else {
    23                     $$b2var = $HTTP_GET_VARS[$b2var];
     23                    $$wpvar = $HTTP_GET_VARS[$wpvar];
    2424                }
    2525            } else {
    26                 $$b2var = $HTTP_POST_VARS[$b2var];
     26                $$wpvar = $HTTP_POST_VARS[$wpvar];
    2727            }
    2828        }

  • trunk/wp-comments-popup.php

    r601 r628  
    44require ('wp-blog-header.php');
    55add_filter('comment_text', 'popuplinks');
    6 foreach ($posts as $post) { start_b2();
     6foreach ($posts as $post) { start_wp();
    77?>
    88<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

  • trunk/wp-commentsrss2.php

    r601 r628  
    1313echo "<?xml version=\"1.0\"?".">";
    1414?>
    15 <!-- generator="wordpress/<?php echo $b2_version ?>" -->
     15<!-- generator="wordpress/<?php echo $wp_version ?>" -->
    1616<rss version="2.0"
    1717    xmlns:dc="http://purl.org/dc/elements/1.1/"
    … …  
    2323<?php
    2424$i = 0;
    25 foreach ($posts as $post) { start_b2();
     25foreach ($posts as $post) { start_wp();
    2626    if ($i < 1) {
    2727        $i++;
    … …  
    3434    <dc:rights>Copyright <?php echo mysql2date('Y', get_lastpostdate()); ?></dc:rights>
    3535    <dc:date><?php echo gmdate('Y-m-d\TH:i:s'); ?></dc:date>
    36     <admin:generatorAgent rdf:resource="http://wordpress.org/?v=<?php echo $b2_version ?>"/>
     36    <admin:generatorAgent rdf:resource="http://wordpress.org/?v=<?php echo $wp_version ?>"/>
    3737    <admin:errorReportsTo rdf:resource="mailto:<?php echo antispambot($admin_email) ?>"/>
    3838    <sy:updatePeriod>hourly</sy:updatePeriod>

  • trunk/wp-config-extra.php

    r372 r628  
    2727
    2828// here's the conversion table, you can modify it if you know what you're doing
    29 $b2smiliestrans = array(
     29$wpsmiliestrans = array(
    3030    ' :)'        => 'icon_smile.gif',
    3131    ' :D'        => 'icon_biggrin.gif',

  • trunk/wp-config-sample.php

    r601 r628  
    2020$base = DB_NAME;
    2121
    22 $abspath = dirname(__FILE__).'/';
     22define('ABSPATH', dirname(__FILE__).'/');
    2323
    2424// Get everything else
    25 require_once($abspath.'wp-settings.php');
     25require_once(ABSPATH.'wp-settings.php');
    2626?>

  • trunk/wp-includes/functions.php

    r617 r628  
    229229function convert_chars($content,$flag='obsolete attribute left there for backwards compatibility') { // html/unicode entities output
    230230
    231     global $use_htmltrans, $b2_htmltrans, $b2_htmltranswinuni;
     231    global $use_htmltrans, $wp_htmltrans, $wp_htmltranswinuni;
    232232
    233233    // removes metadata tags
    … …  
    242242        // converts HTML-entities to their display values in order to convert them again later
    243243        $content = preg_replace('/['.chr(127).'-'.chr(255).']/e', '"&#".ord(\'\0\').";"', $content );
    244         $content = strtr($content, $b2_htmltrans);
     244        $content = strtr($content, $wp_htmltrans);
    245245
    246246        // now converting: Windows CP1252 => Unicode (valid HTML)
    247247        // (if you've ever pasted text from MSWord, you'll understand)
    248248
    249         $content = strtr($content, $b2_htmltranswinuni);
     249        $content = strtr($content, $wp_htmltranswinuni);
    250250
    251251    }
    … …  
    260260
    261261function convert_bbcode($content) {
    262     global $b2_bbcode, $use_bbcode;
     262    global $wp_bbcode, $use_bbcode;
    263263    if ($use_bbcode) {
    264         $content = preg_replace($b2_bbcode["in"], $b2_bbcode["out"], $content);
     264        $content = preg_replace($wp_bbcode["in"], $wp_bbcode["out"], $content);
    265265    }
    266266    $content = convert_bbcode_email($content);
    … …  
    284284
    285285function convert_gmcode($content) {
    286     global $b2_gmcode, $use_gmcode;
     286    global $wp_gmcode, $use_gmcode;
    287287    if ($use_gmcode) {
    288         $content = preg_replace($b2_gmcode["in"], $b2_gmcode["out"], $content);
     288        $content = preg_replace($wp_gmcode["in"], $wp_gmcode["out"], $content);
    289289    }
    290290    return $content;
    … …  
    293293function convert_smilies($text) {
    294294    global $smilies_directory, $use_smilies;
    295     global $b2_smiliessearch, $b2_smiliesreplace;
     295    global $wp_smiliessearch, $wp_smiliesreplace;
    296296    $output = '';
    297297    if ($use_smilies) {
    … …  
    302302            $content = $textarr[$i];
    303303            if ((strlen($content) > 0) && ('<' != $content{0})) { // If it's not a tag
    304                 $content = str_replace($b2_smiliessearch, $b2_smiliesreplace, $content);
     304                $content = str_replace($wp_smiliessearch, $wp_smiliesreplace, $content);
    305305            }
    306306            $output .= $content;
    … …  
    10311031function pingback($content, $post_ID) {
    10321032    // original code by Mort (http://mort.mine.nu:8080)
    1033     global $siteurl, $blogfilename, $b2_version;
     1033    global $siteurl, $blogfilename, $wp_version;
    10341034    $log = debug_fopen('./pingback.log', 'a');
    10351035    $post_links = array();
    … …  
    11001100
    11011101        // Send the GET request
    1102         $request = "GET $path HTTP/1.1\r\nHost: $host\r\nUser-Agent: b2/$b2_version PHP/" . phpversion() . "\r\n\r\n";
     1102        $request = "GET $path HTTP/1.1\r\nHost: $host\r\nUser-Agent: b2/$wp_version PHP/" . phpversion() . "\r\n\r\n";
    11031103        ob_end_flush();
    11041104        fputs($fp, $request);
    … …  
    15541554}
    15551555
    1556 function start_b2() {
     1556function start_wp() {
    15571557    global $post, $id, $postdata, $authordata, $day, $preview, $page, $pages, $multipage, $more, $numpages;
    15581558    global $preview_userid,$preview_date,$preview_content,$preview_title,$preview_category,$preview_notify,$preview_make_clickable,$preview_autobr;
    … …  
    16101610
    16111611function apply_filters($tag, $string) {
    1612     global $b2_filter;
    1613     if (isset($b2_filter['all'])) {
    1614         $b2_filter['all'] = (is_string($b2_filter['all'])) ? array($b2_filter['all']) : $b2_filter['all'];
    1615         if (isset($b2_filter[$tag]))
    1616             $b2_filter[$tag] = array_merge($b2_filter['all'], $b2_filter[$tag]);
     1612    global $wp_filter;
     1613    if (isset($wp_filter['all'])) {
     1614        $wp_filter['all'] = (is_string($wp_filter['all'])) ? array($wp_filter['all']) : $wp_filter['all'];
     1615        if (isset($wp_filter[$tag]))
     1616            $wp_filter[$tag] = array_merge($wp_filter['all'], $wp_filter[$tag]);
    16171617        else
    1618             $b2_filter[$tag] = array_merge($b2_filter['all'], array());
    1619         $b2_filter[$tag] = array_unique($b2_filter[$tag]);
    1620     }
    1621     if (isset($b2_filter[$tag])) {
    1622         $b2_filter[$tag] = (is_string($b2_filter[$tag])) ? array($b2_filter[$tag]) : $b2_filter[$tag];
    1623         $functions = $b2_filter[$tag];
     1618            $wp_filter[$tag] = array_merge($wp_filter['all'], array());
     1619        $wp_filter[$tag] = array_unique($wp_filter[$tag]);
     1620    }
     1621    if (isset($wp_filter[$tag])) {
     1622        $wp_filter[$tag] = (is_string($wp_filter[$tag])) ? array($wp_filter[$tag]) : $wp_filter[$tag];
     1623        $functions = $wp_filter[$tag];
    16241624        foreach($functions as $function) {
    16251625            //error_log("apply_filters #1 applying filter $function");
    … …  
    16311631
    16321632function add_filter($tag, $function_to_add) {
    1633     global $b2_filter;
    1634     if (isset($b2_filter[$tag])) {
    1635         $functions = $b2_filter[$tag];
     1633    global $wp_filter;
     1634    if (isset($wp_filter[$tag])) {
     1635        $functions = $wp_filter[$tag];
    16361636        if (is_array($functions)) {
    16371637            foreach($functions as $function) {
    … …  
    16451645        if (is_array($function_to_add)) {
    16461646            foreach($function_to_add as $function) {
    1647                 if (!in_array($function, $b2_filter[$tag])) {
     1647                if (!in_array($function, $wp_filter[$tag])) {
    16481648                    $new_functions[] = $function;
    16491649                }
    16501650            }
    16511651        } else */if (is_string($function_to_add)) {
    1652             if (!@in_array($function_to_add, $b2_filter[$tag])) {
     1652            if (!@in_array($function_to_add, $wp_filter[$tag])) {
    16531653                $new_functions[] = $function_to_add;
    16541654            }
    16551655        }
    1656         $b2_filter[$tag] = $new_functions;
    1657     } else {
    1658         $b2_filter[$tag] = array($function_to_add);
     1656        $wp_filter[$tag] = $new_functions;
     1657    } else {
     1658        $wp_filter[$tag] = array($function_to_add);
    16591659    }
    16601660    return true;
    … …  
    16631663// Check for hacks file if the option is enabled
    16641664if (get_settings('hack_file')) {
    1665     if (file_exists($abspath . '/my-hacks.php'))
    1666         require($abspath . '/my-hacks.php');
     1665    if (file_exists(ABSPATH . '/my-hacks.php'))
     1666        require(ABSPATH . '/my-hacks.php');
    16671667}
    16681668?>

  • trunk/wp-includes/template-functions.php

    r624 r628  
    14651465
    14661466function comments_popup_script($width=400, $height=400, $file='wp-comments-popup.php') {
    1467     global $b2commentspopupfile, $b2trackbackpopupfile, $b2pingbackpopupfile, $b2commentsjavascript;
    1468     $b2commentspopupfile = $file;
    1469     $b2commentsjavascript = 1;
     1467    global $wpcommentspopupfile, $wptrackbackpopupfile, $wppingbackpopupfile, $wpcommentsjavascript;
     1468    $wpcommentspopupfile = $file;
     1469    $wpcommentsjavascript = 1;
    14701470    $javascript = "<script type='text/javascript'>\nfunction wpopen (macagna) {\n    window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n";
    14711471    echo $javascript;
    … …  
    14731473
    14741474function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
    1475     global $id, $b2commentspopupfile, $b2commentsjavascript, $post, $wpdb, $tablecomments, $HTTP_COOKIE_VARS, $cookiehash;
     1475    global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb, $tablecomments, $HTTP_COOKIE_VARS, $cookiehash;
    14761476    global $querystring_start, $querystring_equal, $querystring_separator, $siteurl;
    14771477    $number = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1'");
    … …  
    14871487        }
    14881488        echo '<a href="';
    1489         if ($b2commentsjavascript) {
    1490             echo $b2commentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1';
     1489        if ($wpcommentsjavascript) {
     1490            echo $wpcommentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1';
    14911491            //echo get_permalink();
    14921492            echo '" onclick="wpopen(this.href); return false"';

  • trunk/wp-includes/vars.php

    r611 r628  
    44
    55#b2 version
    6 $b2_version = '0.80';
     6$wp_version = '0.80';
    77
    88#BBcode search and replace arrays
    9 $b2_bbcode['in'] = array(
     9$wp_bbcode['in'] = array(
    1010    '#\[b](.+?)\[/b]#is',       // Formatting tags
    1111    '#\[i](.+?)\[/i]#is',
    … …  
    2121#   '#\[email=(.+?)](.+?)\[/email]#eis'
    2222);
    23 $b2_bbcode['out'] = array(
     23$wp_bbcode['out'] = array(
    2424    '<strong>$1</strong>',      // Formatting tags
    2525    '<em>$1</em>',
    … …  
    3737
    3838#GreyMatter formatting search and replace arrays
    39 $b2_gmcode['in'] = array(
     39$wp_gmcode['in'] = array(
    4040    '#\\*\*(.+?)\\*\*#is',      // **bold**
    4141    '#\\\\(.+?)\\\\#is',        // \\italic\\
    4242    '#\__(.+?)\__#is'       // __underline__
    4343);
    44 $b2_gmcode['out'] = array(
     44$wp_gmcode['out'] = array(
    4545    '<strong>$1</strong>',
    4646    '<em>$1</em>',
    … …  
    4949
    5050#Translation of HTML entities and special characters
    51 $b2_htmltrans = array_flip(get_html_translation_table(HTML_ENTITIES));
    52 $b2_htmltrans['<'] = '<';   # preserve HTML
    53 $b2_htmltrans['>'] = '>';   # preserve HTML
    54 $b2_htmltransbis = array(
     51$wp_htmltrans = array_flip(get_html_translation_table(HTML_ENTITIES));
     52$wp_htmltrans['<'] = '<';   # preserve HTML
     53$wp_htmltrans['>'] = '>';   # preserve HTML
     54$wp_htmltransbis = array(
    5555    '–' => '&#8211;',
    5656    '—' => '&#8212;',
    … …  
    9696    '&rang;' => '&#9002;', '&loz;' => '&#9674;', '&spades;' => '&#9824;', '&clubs;' => '&#9827;', '&hearts;' => '&#9829;', '&diams;' => '&#9830;'
    9797);
    98 $b2_htmltrans = array_merge($b2_htmltrans,$b2_htmltransbis);
     98$wp_htmltrans = array_merge($wp_htmltrans,$wp_htmltransbis);
    9999
    100100#Translation of invalid Unicode references range to valid range
    101 $b2_htmltranswinuni = array(
     101$wp_htmltranswinuni = array(
    102102    '&#128;' => '&#8364;', // the Euro sign
    103103    '&#129;' => '',
    … …  
    165165
    166166# browser-specific javascript corrections
    167 $b2_macIE_correction['in'] = array(
     167$wp_macIE_correction['in'] = array(
    168168    '/\%uFFD4/', '/\%uFFD5/', '/\%uFFD2/', '/\%uFFD3/',
    169169    '/\%uFFA5/', '/\%uFFD0/', '/\%uFFD1/', '/\%uFFBD/',
    … …  
    172172    '/\%uFFDB/'
    173173);
    174 $b2_macIE_correction['out'] = array(
     174$wp_macIE_correction['out'] = array(
    175175    '&lsquo;', '&rsquo;', '&ldquo;', '&rdquo;',
    176176    '&bull;', '&ndash;', '&mdash;', '&Omega;',
    … …  
    179179    '&euro;'
    180180);
    181 $b2_gecko_correction['in'] = array(
     181$wp_gecko_correction['in'] = array(
    182182    '/\‘/', '/\’/', '/\“/', '/\”/',
    183183    '/\•/', '/\–/', '/\—/', '/\Ω/',
    … …  
    186186    '/\€/', '/\ /'
    187187);
    188 $b2_gecko_correction['out'] = array(
     188$wp_gecko_correction['out'] = array(
    189189    '&8216;', '&rsquo;', '&ldquo;', '&rdquo;',
    190190    '&bull;', '&ndash;', '&mdash;', '&Omega;',
    … …  
    199199
    200200# if the config file does not provide the smilies array, let's define it here
    201 if (!isset($b2smiliestrans)) {
    202     $b2smiliestrans = array(
     201if (!isset($wpsmiliestrans)) {
     202    $wpsmiliestrans = array(
    203203        ' :)'        => 'icon_smile.gif',
    204204        ' :D'        => 'icon_biggrin.gif',
    … …  
    258258    }
    259259}
    260 uksort($b2smiliestrans, 'smiliescmp');
     260uksort($wpsmiliestrans, 'smiliescmp');
    261261
    262262# generates smilies' search & replace arrays
    263 foreach($b2smiliestrans as $smiley => $img) {
    264     $b2_smiliessearch[] = $smiley;
     263foreach($wpsmiliestrans as $smiley => $img) {
     264    $wp_smiliessearch[] = $smiley;
    265265    $smiley_masked = '';
    266266    for ($i = 0; $i < strlen($smiley); $i = $i + 1) {
    267267        $smiley_masked .= substr($smiley, $i, 1).chr(160);
    268268    }
    269     $b2_smiliesreplace[] = "&nbsp;<img src='$smilies_directory/$img' alt='$smiley_masked' />";
     269    $wp_smiliesreplace[] = "&nbsp;<img src='$smilies_directory/$img' alt='$smiley_masked' />";
    270270}
    271271

  • trunk/wp-locations.php

    r601 r628  
    88for ($i = $start; $i >= 0; $i--) {
    99    $post = $posts[$i];
    10     start_b2();
     10    start_wp();
    1111    if ((get_Lon() != null) && (get_Lon > -360) && (get_Lon() < 360 )) {
    1212?>

  • trunk/wp-login.php

    r601 r628  
    2121}
    2222
    23 $b2varstoreset = array('action','mode','error','text','popupurl','popuptitle');
    24 
    25 for ($i = 0; $i < count($b2varstoreset); $i = $i + 1) {
    26     $b2var = $b2varstoreset[$i];
    27     if (!isset($$b2var)) {
    28         if (empty($HTTP_POST_VARS["$b2var"])) {
    29             if (empty($HTTP_GET_VARS["$b2var"])) {
    30                 $$b2var = '';
     23$wpvarstoreset = array('action','mode','error','text','popupurl','popuptitle');
     24
     25for ($i = 0; $i < count($wpvarstoreset); $i = $i + 1) {
     26    $wpvar = $wpvarstoreset[$i];
     27    if (!isset($$wpvar)) {
     28        if (empty($HTTP_POST_VARS["$wpvar"])) {
     29            if (empty($HTTP_GET_VARS["$wpvar"])) {
     30                $$wpvar = '';
    3131            } else {
    32                 $$b2var = $HTTP_GET_VARS["$b2var"];
     32                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    3333            }
    3434        } else {
    35             $$b2var = $HTTP_POST_VARS["$b2var"];
     35            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    3636        }
    3737    }

  • trunk/wp-mail.php

    r601 r628  
    22require(dirname(__FILE__) . '/wp-config.php');
    33
    4 require_once($abspath.$b2inc.'/class-pop3.php');
     4require_once(ABSPATH.WPINC.'/class-pop3.php');
    55
    66

  • trunk/wp-rdf.php

    r601 r628  
    2121?>
    2222<?php echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">"; ?>
    23 <!-- generator="wordpress/<?php echo $b2_version ?>" -->
     23<!-- generator="wordpress/<?php echo $wp_version ?>" -->
    2424<rdf:RDF
    2525    xmlns="http://purl.org/rss/1.0/"
    … …  
    3737    <dc:date><?php echo gmdate('Y-m-d\TH:i:s'); ?></dc:date>
    3838    <dc:creator><?php echo antispambot($admin_email) ?></dc:creator>
    39     <admin:generatorAgent rdf:resource="http://wordpress.org/?v=<?php echo $b2_version ?>"/>
     39    <admin:generatorAgent rdf:resource="http://wordpress.org/?v=<?php echo $wp_version ?>"/>
    4040    <admin:errorReportsTo rdf:resource="mailto:<?php echo antispambot($admin_email) ?>"/>
    4141    <sy:updatePeriod>hourly</sy:updatePeriod>
    … …  
    4444    <items>
    4545        <rdf:Seq>
    46         <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_b2(); ?>
     46        <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
    4747            <rdf:li rdf:resource="<?php permalink_single_rss() ?>"/>
    48         <?php $b2_items[] = $row; $items_count++; if (($items_count == $posts_per_rss) && empty($m)) { break; } } } ?>
     48        <?php $wp_items[] = $row; $items_count++; if (($items_count == $posts_per_rss) && empty($m)) { break; } } } ?>
    4949        </rdf:Seq>
    5050    </items>
    5151</channel>
    52 <?php if ($posts) { foreach ($posts as $post) { start_b2(); ?>
     52<?php if ($posts) { foreach ($posts as $post) { start_wp(); ?>
    5353<item rdf:about="<?php permalink_single_rss() ?>">
    5454    <title><?php the_title_rss() ?></title>

  • trunk/wp-register.php

    r601 r628  
    1919}
    2020
    21 $b2varstoreset = array('action');
    22 for ($i=0; $i<count($b2varstoreset); $i += 1) {
    23     $b2var = $b2varstoreset[$i];
    24     if (!isset($$b2var)) {
    25         if (empty($HTTP_POST_VARS["$b2var"])) {
    26             if (empty($HTTP_GET_VARS["$b2var"])) {
    27                 $$b2var = '';
     21$wpvarstoreset = array('action');
     22for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     23    $wpvar = $wpvarstoreset[$i];
     24    if (!isset($$wpvar)) {
     25        if (empty($HTTP_POST_VARS["$wpvar"])) {
     26            if (empty($HTTP_GET_VARS["$wpvar"])) {
     27                $$wpvar = '';
    2828            } else {
    29                 $$b2var = $HTTP_GET_VARS["$b2var"];
     29                $$wpvar = $HTTP_GET_VARS["$wpvar"];
    3030            }
    3131        } else {
    32             $$b2var = $HTTP_POST_VARS["$b2var"];
     32            $$wpvar = $HTTP_POST_VARS["$wpvar"];
    3333        }
    3434    }

  • trunk/wp-rss.php

    r601 r628  
    2323?>
    2424<?php echo "<?xml version=\"1.0\"?".">"; ?>
    25 <!-- generator="wordpress/<?php echo $b2_version ?>" -->
     25<!-- generator="wordpress/<?php echo $wp_version ?>" -->
    2626<rss version="0.92">
    2727    <channel>
    … …  
    3535        <language><?php echo $rss_language ?></language>
    3636
    37 <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_b2(); ?>
     37<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
    3838        <item>
    3939            <title><?php the_title_rss() ?></title>

  • trunk/wp-rss2.php

    r624 r628  
    2424?>
    2525<?php echo '<?xml version="1.0"?'.'>'; ?>
    26 <!-- generator="wordpress/<?php echo $b2_version ?>" -->
     26<!-- generator="wordpress/<?php echo $wp_version ?>" -->
    2727<rss version="2.0"
    2828    xmlns:content="http://purl.org/rss/1.0/modules/content/">
    … …  
    3535    <copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate()); ?></copyright>
    3636    <pubDate><?php echo gmdate('r'); ?></pubDate>
    37     <generator>http://wordpress.org/?v=<?php echo $b2_version ?>"</generator>
     37    <generator>http://wordpress.org/?v=<?php echo $wp_version ?>"</generator>
    3838
    39     <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_b2(); ?>
     39    <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
    4040    <item>
    4141        <title><?php the_title_rss() ?></title>

  • trunk/wp-settings.php

    r614 r628  
    2020
    2121// This is the name of the include directory. No "/" allowed.
    22 $b2inc = 'wp-includes';
     22define('WPINC', 'wp-includes');
    2323
    24 require ($abspath . 'wp-config-extra.php');
    25 require ($abspath . $b2inc . '/wp-db.php');
    26 require ($abspath . $b2inc . '/functions.php');
    27 require ($abspath . $b2inc . '/template-functions.php');
    28 require ($abspath . $b2inc . '/class-xmlrpc.php');
    29 require ($abspath . $b2inc . '/class-xmlrpcs.php');
    30 require ($abspath . '/wp-links/links.php');
     24require (ABSPATH . 'wp-config-extra.php');
     25require (ABSPATH . WPINC . '/wp-db.php');
     26require (ABSPATH . WPINC . '/functions.php');
     27require (ABSPATH . WPINC . '/template-functions.php');
     28require (ABSPATH . WPINC . '/class-xmlrpc.php');
     29require (ABSPATH . WPINC . '/class-xmlrpcs.php');
     30require (ABSPATH . '/wp-links/links.php');
    3131
    3232//setup the old globals from b2config.php
    … …  
    9898} //end !$_wp_installing
    9999
    100 require ($abspath . $b2inc . '/vars.php');
     100require (ABSPATH . WPINC . '/vars.php');
    101101?>

  • trunk/wp.php

    r618 r628  
    99  <!-- Change charset if needed(?)  But please do not remove this metatag -->
    1010  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
    11   <meta name="generator" content="WordPress <?php $b2_version ?>" /> <!-- leave this for stats -->
     11  <meta name="generator" content="WordPress <?php $wp_version ?>" /> <!-- leave this for stats -->
    1212  <meta http-equiv="reply-to" content="you@somewhere.zzz" />
    1313  <link rel="alternate" type="text/xml" title="RDF" href="<?php bloginfo('rdf_url'); ?>" />
    … …  
    1919
    2020<!-- // loop start -->
    21 <?php foreach ($posts as $post) { start_b2(); ?>
     21<?php foreach ($posts as $post) { start_wp(); ?>
    2222<?php the_date("d.m.y","<h2>","</h2>"); ?>
    2323<h3 class="storytitle" id="post-<?php the_ID(); ?>"><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h3>
Note: See TracChangeset for help on using the changeset viewer.