From 99a7358baf27aefb9e0ae350aeb54405a009feac Mon Sep 17 00:00:00 2001 From: saxmatt Date: Thu, 18 Dec 2003 09:36:13 +0000 Subject: [PATCH] Renaming Reloaded. git-svn-id: http://svn.automattic.com/wordpress/trunk@628 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- b2rdf.php | 2 +- b2rss.php | 2 +- b2rss2.php | 2 +- index-smarty.php | 10 +- index.php | 4 +- layout2b.css | 171 ----------------------------- wp-admin/admin-footer.php | 2 +- wp-admin/admin-header.php | 20 ++-- wp-admin/bookmarklet.php | 8 +- wp-admin/categories.php | 18 +-- wp-admin/edit-showposts.php | 4 +- wp-admin/edit.php | 4 +- wp-admin/import-blogger.php | 24 ++-- wp-admin/import-greymatter.php | 20 ++-- wp-admin/link-categories.php | 18 +-- wp-admin/link-manager.php | 18 +-- wp-admin/link-parse-opml.php | 2 +- wp-admin/moderation.php | 18 +-- wp-admin/options-permalink.php | 18 +-- wp-admin/options.php | 18 +-- wp-admin/post.php | 18 +-- wp-admin/profile.php | 20 ++-- wp-admin/templates.php | 18 +-- wp-admin/upload.php | 2 +- wp-admin/users.php | 18 +-- wp-blog-header.php | 18 +-- wp-comments-popup.php | 2 +- wp-commentsrss2.php | 6 +- wp-config-extra.php | 2 +- wp-config-sample.php | 4 +- wp-includes/functions.php | 62 +++++------ wp-includes/template-functions.php | 12 +- wp-includes/vars.php | 42 +++---- wp-locations.php | 2 +- wp-login.php | 18 +-- wp-mail.php | 2 +- wp-rdf.php | 10 +- wp-register.php | 18 +-- wp-rss.php | 4 +- wp-rss2.php | 6 +- wp-settings.php | 18 +-- wp.php | 4 +- 42 files changed, 259 insertions(+), 430 deletions(-) delete mode 100644 layout2b.css diff --git a/b2rdf.php b/b2rdf.php index 7c63a8732..2e6ef99bd 100644 --- a/b2rdf.php +++ b/b2rdf.php @@ -1,7 +1,7 @@ plugin_dir = './wp-plugins'; require_once( 'b2-include/class-smarty.php' ); $blog = 1; require_once('wp-blog-header.php'); -require_once($abspath.'wp-links/links.php'); -// not on by default: require_once($abspath.'wp-links/links.weblogs.com.php'); +require_once(ABSPATH.'wp-links/links.php'); +// not on by default: require_once(ABSPATH.'wp-links/links.weblogs.com.php'); define( 'NODISPLAY', false ); $wpsmarty->assign( 'siteurl', $siteurl ); -$wpsmarty->assign( 'b2_version', $b2_version ); +$wpsmarty->assign( 'b2_version', $wp_version ); if($posts) { foreach ($posts as $post) { - start_b2(); + start_wp(); $content .= $wpsmarty->fetch( 'post.html' ); ob_start(); - include($abspath . 'wp-comments.php'); + include(ABSPATH . 'wp-comments.php'); $txt = ob_get_contents(); ob_end_clean(); $content .= $txt; diff --git a/index.php b/index.php index 9a708f961..3d440a9d2 100644 --- a/index.php +++ b/index.php @@ -30,7 +30,7 @@ require_once('wp-blog-header.php');

- + ',''); ?> @@ -51,7 +51,7 @@ require_once('wp-blog-header.php'); --> - +
diff --git a/layout2b.css b/layout2b.css deleted file mode 100644 index 0b05e6d46..000000000 --- a/layout2b.css +++ /dev/null @@ -1,171 +0,0 @@ -/* Default WordPress by Matthew Mullenweg http://photomatt.net - This is just a basic layout, with only the bare minimum defined. - Please tweak this and make it your own. :) -*/ - -a { - color: #069; -} - -a:visited { - color: #039; -} - -a:hover { - color: #39c; -} - -acronym, abbr { - border-bottom: 1px dashed #333; -} - -acronym, abbr, span.caps { - cursor: help; - font-size: 90%; - letter-spacing: .07em; -} - -blockquote { - border-left: 5px solid #ccc; - margin-left: 1.5em; - padding-left: 5px; -} - -body { - font-family: Georgia, "Times New Roman", Times, serif; - margin: 0; -} - -h2 { - border-bottom: 2px solid #ccc; - margin-bottom: 2px; -} - -p, li { - line-height: 130%; -} - -.b2calendarcell { - color: #000; -} - -.b2calendaremptycell { -} - -.b2calendarheadercell { - background: #808080; - color: #ccc; -} - -.b2calendarlinkpost { - color: #f00; - text-decoration: none; -} - -.b2calendarmonth { - color: #aaa; -} - -.b2calendarrow { - color: #0f0; -} - -.b2calendartable { - background: #fff; - border: 1px solid #000; -} - -.b2calendartoday { - color: #00f; -} - -.credit { - font-size: 11px; - text-align: center; -} - -.feedback { - text-align: right; - color: #ccc; -} - -.meta, .meta a { - color: #808080; - font-size: small; -} - -.storytitle a { - text-decoration: none; -} - -#content { - margin: 0 160px 0 20px; -} - -#header { - background-color: #808080; - margin: 0; - padding-left: 10px; -} - -#header a { - color: #fff; - text-decoration: none; -} - -#header a:hover { - color: #ccc; -} - -#menu { - background-color: #000; - border-left: 3px solid #666; - padding-bottom: 10px; - position: absolute; - right: 0; - top: 65px; - width: 150px; -} - -#menu form { - margin: 0 0 0 13px; -} - -#menu input { - background-color: #ccc; - border: 2px solid #666; -} - -#menu ul { - color: #ccc; - font-variant: small-caps; - font-weight: bold; - list-style-type: none; - margin: 0; - padding-left: 3px; -} - -#menu ul ul { - font-variant: normal; - font-weight: normal; - line-height: 100%; - list-style-type: none; - margin: 0; - padding: 0; - text-align: left; -} - -#menu ul ul li { - line-height: 115%; - padding-left: 12px; -} - -#menu ul ul li a { - color: #fff; - height: 13px; - text-decoration: none; -} - -#menu ul ul li a:hover { - border-bottom: 1px solid #ccc; -} \ No newline at end of file diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php index 7b08d7b25..6674614d4 100644 --- a/wp-admin/admin-footer.php +++ b/wp-admin/admin-footer.php @@ -1,6 +1,6 @@ -

WordPress — Support Forums
+

WordPress — Support Forums
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 8f5717418..456346259 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -1,7 +1,7 @@ + start_wp(); ?>

[

[ diff --git a/wp-admin/import-blogger.php b/wp-admin/import-blogger.php index 07d3ed220..6c477464c 100644 --- a/wp-admin/import-blogger.php +++ b/wp-admin/import-blogger.php @@ -1,17 +1,17 @@ diff --git a/wp-admin/import-greymatter.php b/wp-admin/import-greymatter.php index b6fe8170a..c5e1191a8 100644 --- a/wp-admin/import-greymatter.php +++ b/wp-admin/import-greymatter.php @@ -5,20 +5,20 @@ // 3. load in the browser from there require_once('wp-config.php'); -require_once($abspath.$b2inc.'/functions.php'); +require_once(ABSPATH.WPINC.'/functions.php'); -$b2varstoreset = array('action', 'gmpath', 'archivespath'); -for ($i=0; $i WordPress :: upload images/files - +