Changeset 2009

Timestamp:

12/30/2004 10:58:06 AM (20 years ago)

Author:

saxmatt

Message:

Moving default template stuff into wp-includes, uncluttering root

Location:

trunk

Files:

• index.php (modified) (3 diffs)
• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-comments-popup.php (deleted)
• wp-comments.php (deleted)
• wp-footer.php (deleted)
• wp-header.php (deleted)
• wp-includes/classes.php (modified) (1 diff)
• wp-includes/comment-functions.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/template-functions-general.php (modified) (2 diffs)
• wp-includes/wp-comments-popup.php (added)
• wp-includes/wp-comments.php (added)
• wp-includes/wp-footer.php (added)
• wp-includes/wp-header.php (added)
• wp-includes/wp-layout.css (added)
• wp-includes/wp-sidebar.php (added)
• wp-layout.css (deleted)
• wp-sidebar.php (deleted)

trunk/index.php

@@ -2 +2 @@
 /* Don't remove this line. */
 require('./wp-blog-header.php');
-include(ABSPATH . '/wp-header.php');
+get_header();
 ?>
 
@@ -28 +28 @@
 </div>
 
-<?php comments_template(); // Get wp-comments.php template ?>
+<?php comments_template( is_single() ); // Get wp-comments.php template ?>
 
 <?php endwhile; else: ?>
@@ -36 +36 @@
 <?php posts_nav_link(' &#8212; ', __('&laquo; Previous Page'), __('Next Page &raquo;')); ?>
 
-<?php include(ABSPATH . '/wp-footer.php'); ?>
+<?php get_footer(); ?>

trunk/wp-admin/upgrade-schema.php

@@ -211 +211 @@
     add_option('template', 'default');
     add_option('stylesheet', 'default');
-    add_option('comment_whitelist', 0);
+    add_option('comment_whitelist', 1);
     add_option('page_uris');
 

trunk/wp-includes/classes.php

@@ -66 +66 @@
         if ('' != $qv['name']) {
             $this->is_single = true;
-        } else  if (($qv['p'] != '') && ($qv['p'] != 'all') && (intval($q['p']) != 0)) {
+        } elseif ( intval( $q['p'] ) != 0 && $qv['p'] != 'all' ) {
             $this->is_single = true;            
-        }   else if (('' != $qv['hour']) && ('' != $qv['minute']) &&('' != $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day'])) {
+        } elseif (('' != $qv['hour']) && ('' != $qv['minute']) &&('' != $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day'])) {
             // If year, month, day, hour, minute, and second are set, a single 
           // post is being queried.        
             $this->is_single = true;
-        } else if ('' != $qv['static'] || '' != $qv['pagename'] || '' != $qv['page_id']) {
+        } elseif ('' != $qv['static'] || '' != $qv['pagename'] || '' != $qv['page_id']) {
             $this->is_page = true;
             $this->is_single = false;
-        } else if (!empty($qv['s'])) {
+        } elseif (!empty($qv['s'])) {
             $this->is_search = true;
         } else {

trunk/wp-includes/comment-functions.php

@@ -3 +3 @@
 // Template functions
 
-function comments_template() {
-    global $withcomments, $post, $wpdb, $id, $comment;
+function comments_template( $show ) {
+    global $wp_query, $withcomments, $post, $wpdb, $id, $comment;
 
     if ( is_single() || is_page() || $withcomments ) :
@@ -13 +13 @@
         $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
 
-        $template = get_template_directory();
-        $template .= "/comments.php";
-
-        if (file_exists($template)) {
-            include($template);
-        }   else {
-            include(ABSPATH . 'wp-comments.php');
-        }
+    if ( file_exists( TEMPLATEPATH . '/comments.php') )
+        require( TEMPLATEPATH . '/comments.php');
+    else
+        require( ABSPATH . 'wp-includes/wp-comments.php');
 
     endif;
@@ -73 +69 @@
 
         if (empty ($file)) {
-            $template = TEMPLATEPATH . '/comments-popup.php';
-            if (file_exists($template)) {
-                $wpcommentspopupfile = str_replace(ABSPATH, '', $template);
-            } else {
-                $wpcommentspopupfile = 'wp-comments-popup.php';
-            }
+            if ( file_exists( TEMPLATEPATH . '/comments-popup.php') )
+                require( TEMPLATEPATH . '/comments-popup.php');
+            else
+                require( ABSPATH . 'wp-includes/wp-comments-popup.php');
         } else {
             $wpcommentspopupfile = $file;

trunk/wp-includes/functions.php

@@ -1059 +1059 @@
     global $wp_query;
 
-    if (! $wp_query->is_single) {
+    if ( !$wp_query->is_single )
         return false;
-    }
-
-    if (empty($post)) {
-        return true;
-    }
+
+    if ( empty( $post) )
+        return true;
 
     $post_obj = $wp_query->get_queried_object();
 
-    if ($post == $post_obj->ID) {
-        return true;
-    } else if ($post == $post_obj->post_title) {
-        return true;
-    } else if ($post == $post_obj->post_name) {
-        return true;
-    }
+    if ( $post == $post_obj->ID ) 
+        return true;
+    elseif ( $post == $post_obj->post_title ) 
+        return true;
+    elseif ( $post == $post_obj->post_name )
+        return true;
 
     return false;

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

@@ -2 +2 @@
 
 /* Note: these tags go anywhere in the template */
+
+function get_header() {
+    global $wpdb, $wp_query;
+    if ( file_exists( TEMPLATEPATH . '/header.php') )
+        require_once( TEMPLATEPATH . '/header.php');
+    else
+        require_once( ABSPATH . 'wp-includes/wp-header.php');
+}
+
+function get_footer() {
+    global $wpdb, $wp_query;
+    if ( file_exists( TEMPLATEPATH . '/footer.php') )
+        require_once( TEMPLATEPATH . '/footer.php');
+    else
+        require_once( ABSPATH . 'wp-includes/wp-footer.php');
+}
+
+function get_sidebar() {
+    global $wpdb, $wp_query;
+    if ( file_exists( TEMPLATEPATH . '/sidebar.php') )
+        require_once( TEMPLATEPATH . '/sidebar.php');
+    else
+        require_once( ABSPATH . 'wp-includes/wp-sidebar.php');
+}
+
 
 function wp_loginout() {
@@ -85 +110 @@
         $output = get_stylesheet();
         if (empty($output) || $output == 'default') {
-            $output = get_settings('siteurl') . "/wp-layout.css";
+            $output = get_settings('siteurl') . "/wp-includes/wp-layout.css";
         } else {
             $output = get_settings('siteurl') . "/wp-content/themes/$output/style.css";