Pastoid

diff -u ../../../upgrade_test/user/themes/gp2/commentform.php gp2/commentform.php
--- ../../../upgrade_test/user/themes/gp2/commentform.php	2009-07-18 18:39:40.000000000 -0400
+++ gp2/commentform.php	2010-08-03 19:30:59.617604835 -0400
@@ -4,7 +4,12 @@
 <?php if ( !$post->info->comments_disabled ) : ?>
 <div id="respond">
 <h3><?php _e('Leave a Reply', 'default'); ?></h3>
-<?php if ( Session::has_messages() ) Session::messages_out(); ?>
+<?php if ( Session::has_messages() ) Session::messages_out(); 
+
+	$post->comment_form()->out();
+?>
+
+<?php /*
 	<form action="<?php URL::out( 'submit_feedback', array( 'id' => $post->id ) ); ?>" method="post" id="commentform">
 		<div id="comment-personaldetails" class="respond-left">
 			<p>
@@ -27,6 +32,7 @@
   		</p>
 		</div>
 	</form>
+*/ ?>
 </div>
 <?php else: ?> 
 <div id="comments-closed">
diff -u ../../../upgrade_test/user/themes/gp2/entry.single.php gp2/entry.single.php
--- ../../../upgrade_test/user/themes/gp2/entry.single.php	2009-07-18 18:14:32.000000000 -0400
+++ gp2/entry.single.php	2010-08-03 19:42:09.521352733 -0400
@@ -3,7 +3,7 @@
 	<div id="container">
 		<div id="content">
 
-				<div class="<?php echo $post_class?>">
+				<div class="<?php echo $post_class; ?>">
 
 						<h1>
 							<a href="<?php echo $post->permalink; ?>" title="<?php echo $post->title; ?>"><?php echo $post->title_out; ?></a>
@@ -43,5 +43,5 @@
 		</div><!-- #content -->
 	</div><!-- #container -->
 
-<?php include'sidebar.php' ?>
+<?php include 'sidebar.php'; ?>
 <?php include 'footer.php'; ?>
diff -u ../../../upgrade_test/user/themes/gp2/header.php gp2/header.php
--- ../../../upgrade_test/user/themes/gp2/header.php	2009-07-18 16:42:28.000000000 -0400
+++ gp2/header.php	2010-08-03 19:44:48.253603192 -0400
@@ -58,7 +58,7 @@
 		<?php endif; ?>
 			<div class="description"><?php Options::out( 'tagline' ); ?></div>
 	</div>
-	
+
 	<div id="nav" class="clearfix">
 		<div id="nav-search">
 			<?php $theme->search_form() ?>
@@ -73,11 +73,11 @@
     		</li>
     	<?php endforeach; ?>
 		</ul>
-    <div id="submenu-bg">    
+    <div id="submenu-bg">
 
     </div>
 	</div><!-- #navbar -->
 
 </div>
 
-<div id="main" class="clearfix">
\ No newline at end of file
+<div id="main" class="clearfix">
diff -u ../../../upgrade_test/user/themes/gp2/home.php gp2/home.php
--- ../../../upgrade_test/user/themes/gp2/home.php	2009-07-18 18:58:26.000000000 -0400
+++ gp2/home.php	2010-08-03 19:45:17.985353330 -0400
@@ -6,7 +6,7 @@
 
 
 <?php foreach ( $posts as $post ) { ?>
-				<div class="<?php echo $post_class?>">
+				<div class="<?php echo $post_class; ?>">
   				<h1>
   					<a href="<?php echo $post->permalink; ?>"title="<?php echo $post->title; ?>"><?php echo $post->title_out; ?></a>
   				</h1>
@@ -23,12 +23,12 @@
 					<div class="entry">
 						<?php echo $post->content_out; ?>
 					</div>
-					
+
           <div class="postmetadata clearfix">
     				<?php if ( is_array( $post->tags ) ) : ?>
     					<p class="tags">Tags: <?php echo $post->tags_out;?></p>
     				<?php endif; ?>
-						<?php if ( $loggedin ) : ?>						
+						<?php if ( $loggedin ) : ?>
 							<a href="<?php echo $post->editlink; ?>" title="<?php _e( "Edit post" ); ?>"><?php _e( "Edit" ); ?></a>
 						<?php endif; ?>
 					</div>
@@ -47,5 +47,5 @@
 	</div><!-- #container -->
 
 
-<?php include'sidebar.php' ?>
-<?php include 'footer.php'; ?>
\ No newline at end of file
+<?php include 'sidebar.php'; ?>
+<?php include 'footer.php'; ?>
Common subdirectories: ../../../upgrade_test/user/themes/gp2/img and gp2/img
diff -u ../../../upgrade_test/user/themes/gp2/multiple.php gp2/multiple.php
--- ../../../upgrade_test/user/themes/gp2/multiple.php	2009-07-18 18:58:18.000000000 -0400
+++ gp2/multiple.php	2010-08-03 19:41:22.481354360 -0400
@@ -7,7 +7,7 @@
 				<div class="post multi">
 				<?php if ( is_array( $post->tags ) && ($tags_in_multiple) ) : ?>
 					<div class="post-tags">
-						<?php echo $post->tags_out;?>
+						<?php echo $post->tags_out; ?>
 					</div>
 				<?php endif; ?>
 					<h1>
@@ -37,5 +37,5 @@
 		</div><!-- #content -->
 	</div><!-- #container -->
 
-<?php include'sidebar.php' ?>
+<?php include 'sidebar.php'; ?>
 <?php include 'footer.php'; ?>
diff -u ../../../upgrade_test/user/themes/gp2/page.single.php gp2/page.single.php
--- ../../../upgrade_test/user/themes/gp2/page.single.php	2009-07-18 17:28:40.000000000 -0400
+++ gp2/page.single.php	2010-08-03 19:40:47.365603466 -0400
@@ -3,7 +3,7 @@
 	<div id="container">
 		<div id="content">
 
-				<div class="<?php echo $page_class?>">
+				<div class="<?php echo $page_class; ?>">
 					<h1>
 						<a href="<?php echo $post->permalink; ?>" title="<?php echo $post->title; ?>"><?php echo $post->title_out; ?></a>
 					</h1>
@@ -35,5 +35,5 @@
 		</div><!-- #content -->
 	</div><!-- #container -->
 
-<?php include'sidebar.php' ?>
+<?php include 'sidebar.php'; ?>
 <?php include 'footer.php'; ?>
Common subdirectories: ../../../upgrade_test/user/themes/gp2/scripts and gp2/scripts
diff -u ../../../upgrade_test/user/themes/gp2/search.php gp2/search.php
--- ../../../upgrade_test/user/themes/gp2/search.php	2009-07-18 19:26:30.000000000 -0400
+++ gp2/search.php	2010-08-03 19:37:47.421603952 -0400
@@ -43,5 +43,5 @@
 		</div><!-- #content -->
 	</div><!-- #container -->
 
-<?php include'sidebar.php' ?>
+<?php include 'sidebar.php'; ?>
 <?php include 'footer.php'; ?>
diff -u ../../../upgrade_test/user/themes/gp2/sidebar.php gp2/sidebar.php
--- ../../../upgrade_test/user/themes/gp2/sidebar.php	2009-07-18 19:07:14.000000000 -0400
+++ gp2/sidebar.php	2010-08-03 19:37:30.473605001 -0400
@@ -66,4 +66,6 @@
 
 
 <!-- Call your plugins theme functions here-->
+<?php $theme->area( 'sidebar' ); ?>
+
 </div>
diff -u ../../../upgrade_test/user/themes/gp2/tag.php gp2/tag.php
--- ../../../upgrade_test/user/themes/gp2/tag.php	2009-07-18 19:27:10.000000000 -0400
+++ gp2/tag.php	2010-08-03 19:36:27.573353778 -0400
@@ -28,5 +28,5 @@
 		</div><!-- #content -->
 	</div><!-- #container -->
 
-<?php include'sidebar.php' ?>
+<?php include 'sidebar.php'; ?>
 <?php include 'footer.php'; ?>
diff -u ../../../upgrade_test/user/themes/gp2/theme.php gp2/theme.php
--- ../../../upgrade_test/user/themes/gp2/theme.php	2009-07-18 19:07:48.000000000 -0400
+++ gp2/theme.php	2010-08-03 19:36:02.773353752 -0400
@@ -142,17 +142,7 @@
 	 */
 	public function theme_show_tags ( $theme )
 	{
-		$sql ="
-			SELECT t.tag_slug AS slug, t.tag_text AS text, count(tp.post_id) as ttl
-			FROM {tags} t
-			INNER JOIN {tag2post} tp
-			ON t.id=tp.tag_id
-			INNER JOIN {posts} p
-			ON p.id=tp.post_id AND p.status = ?
-			GROUP BY t.tag_slug
-			ORDER BY t.tag_text
-		";
-		$tags = DB::get_results( $sql, array(Post::status('published')) );
+		$tags = Tags::get();
 
 		foreach ($tags as $index => $tag) {
 			$tags[$index]->url = URL::get( 'display_entries_by_tag', array( 'tag' => $tag->slug ) );

<?xml version="1.0" encoding="UTF-8" ?>
<pluggable type="theme">
        <name>Green Park 2</name>
        <author>Andreas Jacob</author>
        <url>http://cordobo.com/green-park-2/</url>
        <version>0.1</version>
        <template_engine>rawphpengine</template_engine>
        <description>Cordobo Green Park 2 for Habari. Based on GP2 1.0 for Wordpress and is not feature-complete. The ported version of Cordobo Green Park 2 for Habari is based on the theme Charcoal by the Habari Community.</description>
        <license url="http://www.apache.org/licenses/LICENSE-2.0.html">Apache Software License 2.0</license>
        <areas>
                <area name="sidebar">
                        <description><![CDATA[The sidebar area]]></description>
                </area>
        </areas>
</pluggable>