WordPress.org
Get WordPress

Make WordPress Core

Changeset 83


Ignore:
Timestamp:
05/24/2003 09:50:22 PM (21 years ago)
Author:
mikelittle
Message:

Removed $pathserver. Now use $siteurl everywhere.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/b2-include/b2template.functions.php

    r24 r83  
    4141
    4242function get_bloginfo($show='') {
    43     global $siteurl, $blogfilename, $blogname, $blogdescription, $pathserver, $admin_email;
     43    global $siteurl, $blogfilename, $blogname, $blogdescription, $siteurl, $admin_email;
    4444    switch($show) {
    4545        case "url":
    … …  
    5959            break;
    6060        case "pingback_url":
    61             $output = $pathserver.'/xmlrpc.php';
     61            $output = $siteurl.'/xmlrpc.php';
    6262            break;
    6363        case "admin_email":
    … …  
    10841084
    10851085function trackback_url($display = 1) {
    1086     global $pathserver, $id;
    1087     $tb_url = $pathserver.'/b2trackback.php/'.$id;
     1086    global $siteurl, $id;
     1087    $tb_url = $siteurl.'/b2trackback.php/'.$id;
    10881088    if ($display) {
    10891089        echo $tb_url;
    … …  
    11371137
    11381138function trackback_rdf($timezone=0) {
    1139     global $pathserver, $id, $HTTP_SERVER_VARS;
     1139    global $siteurl, $id, $HTTP_SERVER_VARS;
    11401140    if (!stristr($HTTP_SERVER_VARS['HTTP_USER_AGENT'], 'W3C_Validator')) {
    11411141        echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" '."\n";

  • trunk/b2config.php

    r61 r83  
    1919$blogdescription = "babblings !";
    2020
    21 
    22 
    23 // $pathserver is where you have uploaded b2: for example, 'http://mydomain.com' (no ending slash !)
    24 //   by default b2 is set to run in the folder your blog resides, same as $siteurl
    25 
    26 $pathserver = 'http://example.com';
    27 
    28 
    2921// your email (obvious eh ?)
    3022$admin_email = 'you@example.com';
    … …  
    4133// day at the start of the week: 0 for Sunday, 1 for Monday, 2 for Tuesday, etc
    4234$start_of_week = 1;
    43 
    4435
    4536
    … …  
    336327$loginsql = $dbusername;
    337328$passsql = $dbpassword;
    338 $path = $pathserver;
     329$path = $siteurl;
    339330$base = $dbname;
    340331
    … …  
    344335$path_sep=':';
    345336ini_set('include_path', ".$path_sep..$path_sep../$b2inc$path_sep./$b2inc");
    346 
    347337?>

  • trunk/b2login.php

    r80 r83  
    176176    <title>WordPress > Lost password ?</title>
    177177    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
    178     <link rel="stylesheet" href="<?php echo $pathserver; ?>/wp-admin/b2.css" type="text/css" />
     178    <link rel="stylesheet" href="<?php echo $siteurl; ?>/wp-admin/b2.css" type="text/css" />
    179179    <style type="text/css">
    180180    <!--
    … …  
    288288<title>WordPress > Login form</title>
    289289<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    290 <link rel="stylesheet" href="<?php echo $pathserver; ?>/wp-admin/b2.css" type="text/css">
     290<link rel="stylesheet" href="<?php echo $siteurl; ?>/wp-admin/b2.css" type="text/css">
    291291<style type="text/css">
    292292<!--
    … …  
    314314
    315315<div id="login">
    316 <p><a href="<?=$pathserver?>">Back to blog?</a><br />
     316<p><a href="<?=$siteurl?>">Back to blog?</a><br />
    317317<?php if ($users_can_register) { ?>
    318     <a href="<?php echo $pathserver; ?>/b2register.php">Register?</a><br />
     318    <a href="<?php echo $siteurl; ?>/b2register.php">Register?</a><br />
    319319<?php } ?>
    320    <a href="<?php echo $pathserver; ?>/b2login.php?action=lostpassword">Lost your password?</a></p>
     320   <a href="<?php echo $siteurl; ?>/b2login.php?action=lostpassword">Lost your password?</a></p>
    321321
    322322<?php

  • trunk/blog.header.php

    r57 r83  
    3636dbconnect();
    3737
    38 @header ("X-Pingback: $pathserver/xmlrpc.php");
     38@header ("X-Pingback: $siteurl/xmlrpc.php");
    3939/* Sending HTTP headers
    4040// It is presumptious to think that WP is the only thing that might change on the page.

  • trunk/wp-admin/b2menutop.php

    r50 r83  
    2424}
    2525?>
    26 <li><a href="<?php echo $pathserver."/".$blogfilename; ?>">View site</a></li>
     26<li><a href="<?php echo $siteurl."/".$blogfilename; ?>">View site</a></li>
    2727<li id="last"><a href="<?php echo $siteurl ?>/b2login.php?action=logout">Logout</a></li>
    2828</ul>

  • trunk/wp-admin/b2profile.php

    r73 r83  
    259259    <p>To have a one-click bookmarklet, just copy and paste this<br />into a new text file:</p>
    260260    <?php
    261     $regedit = "REGEDIT4\r\n[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\MenuExt\Post To &WP : ".$blogname."]\r\n@=\"javascript:doc=external.menuArguments.document;Q=doc.selection.createRange().text;void(btw=window.open('".$pathserver."/wp-admin/b2bookmarklet.php?text='+escape(Q)+'".$bookmarklet_tbpb."&popupurl='+escape(doc.location.href)+'&popuptitle='+escape(doc.title),'b2bookmarklet','scrollbars=no,width=480,height=".$bookmarklet_height.",left=100,top=150,status=yes'));btw.focus();\"\r\n\"contexts\"=hex:31\"";
     261    $regedit = "REGEDIT4\r\n[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\MenuExt\Post To &WP : ".$blogname."]\r\n@=\"javascript:doc=external.menuArguments.document;Q=doc.selection.createRange().text;void(btw=window.open('".$siteurl."/wp-admin/b2bookmarklet.php?text='+escape(Q)+'".$bookmarklet_tbpb."&popupurl='+escape(doc.location.href)+'&popuptitle='+escape(doc.title),'b2bookmarklet','scrollbars=no,width=480,height=".$bookmarklet_height.",left=100,top=150,status=yes'));btw.focus();\"\r\n\"contexts\"=hex:31\"";
    262262    ?>
    263263    <pre style="margin: 20px; background-color: #cccccc; border: 1px dashed #333333; padding: 5px; font-size: 12px;"><?php echo $regedit; ?></pre>
    … …  
    436436        {
    437437          if ((typeof window.sidebar == "object") && (typeof window.sidebar.addPanel == "function"))
    438             window.sidebar.addPanel("WordPress post: <?php echo $blogname ?>","<?php echo $pathserver ?>/wp-admin/b2sidebar.php","");
     438            window.sidebar.addPanel("WordPress post: <?php echo $blogname ?>","<?php echo $siteurl ?>/wp-admin/b2sidebar.php","");
    439439          else
    440440            alert('No Sidebar found!  You must use Mozilla 0.9.4 or later!');
    … …  
    446446<br /><br />
    447447<strong>SideBar</strong><br />
    448 Add this link to your favorites:<br /><a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(_search=open('<?php echo $pathserver ?>/wp-admin/b2sidebar.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'_search'))">WordPress Sidebar</a>.
     448Add this link to your favorites:<br /><a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(_search=open('<?php echo $siteurl ?>/wp-admin/b2sidebar.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'_search'))">WordPress Sidebar</a>.
    449449<?php } ?>
    450450    </td>

  • trunk/wp-admin/b2sidebar.php

    r44 r83  
    6161document.SPELLDATA.companyID.value="custom\\http://cafelog.com"
    6262document.SPELLDATA.language.value=1033
    63 document.SPELLDATA.opener.value="<?php echo $pathserver ?>/sproxy.pl"
     63document.SPELLDATA.opener.value="<?php echo $siteurl ?>/sproxy.pl"
    6464document.SPELLDATA.formaction.value="http://www.spellchecker.com/spell/startspelling.asp "
    65 window.open("<?php echo $pathserver ?>/b2spell.php","Spell",
     65window.open("<?php echo $siteurl ?>/b2spell.php","Spell",
    6666"toolbar=no,directories=no,location=yes,resizable=yes,width=620,height=400,top=100,left=100")
    6767}
Note: See TracChangeset for help on using the changeset viewer.