Permalink
Browse files

fixed merge conflict with the version number in style.css

  • Loading branch information...
2 parents d69e4e1 + d372a15 commit 90f865233252c608fe7fb4992eba64a43a48602e @patrickcarey patrickcarey committed Dec 13, 2010
Showing with 478 additions and 399 deletions.
  1. +1 −1 404.php
  2. +10 −1 archives.php
  3. +66 −373 functions.php
  4. +6 −6 header.php
  5. +3 −2 index.php
  6. +83 −0 library/option-stylesheet.php
  7. +42 −0 library/sidebars.php
  8. +234 −0 library/widgets.php
  9. +33 −16 style.css
View
@@ -18,7 +18,7 @@
<p>You can click back and try again OR search for what you're looking for:</p>
-<form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
+<form method="get" id="searchform" action="<?php echo home_url(); ?>/">
<div class="search">
<input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
<input type="submit" id="searchsubmit" value="Search" />
View
@@ -6,8 +6,17 @@
get_header();
?>
+
+<!-- generated with archives.php -->
+
<div id="content">
-<?php if (! empty($display_stats) ) { get_stats(1); echo "<br />"; } else if (($posts & empty($display_stats)) ) : foreach ($posts as $post) : start_wp(); ?>
+
+<?php
+ if (! empty($display_stats) ) { get_stats(1); echo "<br />"; };
+ if (($posts & empty($display_stats)) ) {
+ while ( have_posts() ) {
+ the_post();
+ ?>
<div class="entrycat">
<h2>All Work</h2>
Oops, something went wrong.

0 comments on commit 90f8652

Please sign in to comment.