Changeset 453

Timestamp:

03/03/2014 09:56:36 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Use home_url() in URL's instead of hard-coding bloginfo( 'url' ). Also remove duplicate header-nav and header-subnav templates in child themes.

Location:

sites/trunk/buddypress.org/public_html/wp-content/themes

Files:

• bb-base/functions.php (modified) (1 diff)
• bb-base/header-nav.php (modified) (1 diff)
• bb-base/header-subnav.php (modified) (2 diffs)
• bbpress-org/header-nav.php (deleted)
• bbpress-org/header-subnav.php (deleted)
• buddypress-org/header-nav.php (deleted)
• buddypress-org/header-subnav.php (deleted)

sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/functions.php

@@ -14 +14 @@
 show_admin_bar( true );
 
+/**
+ * Are we looking at a codex site
+ *
+ * @return bool
+ */
+function bb_base_is_codex() {
+        return (bool) strstr( $_SERVER['HTTP_HOST'], 'codex' );
+}
+
 // Include in Codex code on codex sites
-if ( strstr( $_SERVER['HTTP_HOST'], 'codex' ) ) {
+if ( bb_base_is_codex() ) {
         include( get_template_directory() . '/functions-codex.php' );
 }

sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/header-nav.php

@@ -1 +1 @@
 <ul id="nav" class="menu">
-        <li <?php if ( is_page( 'about'    ) ) : ?>class="current"<?php endif; ?>><a href="<?php bloginfo( 'url' ); ?>/about/">About</a></li>
-        <li <?php if ( is_page( 'plugins'  ) ) : ?>class="current"<?php endif; ?>><a href="<?php bloginfo( 'url' ); ?>/plugins/">Plugins</a></li>
-        <li <?php if ( is_page( 'themes'   ) ) : ?>class="current"<?php endif; ?>><a href="<?php bloginfo( 'url' ); ?>/themes/">Themes</a></li>
+        <li <?php if ( is_page( 'about'    ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'about'   ); ?>">About</a></li>
+        <li <?php if ( is_page( 'plugins'  ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'plugins' ); ?>">Plugins</a></li>
+        <li <?php if ( is_page( 'themes'   ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'themes'  ); ?>">Themes</a></li>
         <li><a href="http://codex.bbpress.org/">Documentation</a></li>
-        <li <?php if ( is_post_type_archive( 'post' ) || is_singular( 'post' ) || is_date() || is_tag() || is_category() || is_home() ) : ?>class="current"<?php endif; ?>><a href="<?php bloginfo( 'url' ); ?>/blog/">Blog</a></li>
-        <li <?php if ( is_bbpress() ) : ?>class="current"<?php endif; ?>><a href="<?php bloginfo( 'url' ); ?>/forums/">Support</a></li>
-        <li class="download<?php if ( is_page( 'download' ) ) : ?> current<?php endif; ?>"><a href="<?php bloginfo( 'url' ); ?>/download/">Download</a></li>
+        <li <?php if ( is_post_type_archive( 'post' ) || is_singular( 'post' ) || is_date() || is_tag() || is_category() || is_home() ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'blog' ); ?>">Blog</a></li>
+        <?php if ( function_exists( 'is_bbpress' ) ) : ?><li <?php if ( is_bbpress() ) : ?>class="current"<?php endif; ?>><a href="<?php bbp_forums_url(); ?>">Support</a></li><?php endif; ?>
+        <li class="download<?php if ( is_page( 'download' ) ) : ?> current<?php endif; ?>"><a href="<?php echo home_url( 'download' ); ?>">Download</a></li>
 </ul>

sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/header-subnav.php

@@ -2 +2 @@
         <div id="subnav"><div id="subnav-inner">
                 <ul id="nav-secondary" class="menu">
-                        <?php if ( is_user_logged_in() ) : ?>
-                                <li><a href="<?php bloginfo( 'url' ); ?>/forums/new-topic/">Create New Topic</a></li>
+                        <?php if ( is_user_logged_in() && function_exists( 'bbp_forums_url' ) ) : ?>
+                                <li><a href="<?php bbp_forums_url( 'new-topic' ); ?>">Create New Topic</a></li>
                         <?php endif; ?>
                 </ul>
@@ -11 +11 @@
                                 <li><a href="//wordpress.org/support/register.php">Register</a></li>
                                 <li><a href="//wordpress.org/support/bb-login.php">Lost Password</a></li>
-                                <li><a href="<?php bloginfo( 'url' ); ?>/login/">Log In</a></li>
-                        <?php else : ?>
+                                <li><a href="<?php echo home_url( 'login' ); ?>">Log In</a></li>
+                        <?php elseif ( function_exists( 'bbp_favorites_permalink' ) ) : ?>
                                 <li><a href="<?php bbp_favorites_permalink( bbp_get_current_user_id() ); ?>">Favorites</a></li>
                                 <li><a href="<?php bbp_subscriptions_permalink( bbp_get_current_user_id() ); ?>">Subscriptions</a></li>