Index: trunk/support-forum.php
===================================================================
--- trunk/support-forum.php	(revision 224)
+++ trunk/support-forum.php	(working copy)
@@ -123,7 +123,7 @@
 		global $topic;
 		if ( $id )
 			$topic = get_topic( $id );
-		return ($topic->support_forum_resolved) ? $topic->support_forum_resolved : support_forum_get_default_status();
+		return ($topic->topic_resolved) ? $topic->topic_resolved : support_forum_get_default_status();
 	}
 
 	function support_forum_resolve_topic( $topic_id, $resolved = 'yes' ) {
@@ -135,7 +135,7 @@
 
 		$bb_cache->flush_one( 'topic', $topic_id );
 
-		bb_update_topicmeta( $topic_id, 'support_forum_resolved', $resolved );
+		bb_update_topicmeta( $topic_id, 'topic_resolved', $resolved );
 
 		return true;
 	}
@@ -156,7 +156,7 @@
 	function support_forums_get_latest_topics_where_unresolved($where){
 		global $bbdb;
 
-		$topicids = $bbdb->get_col("SELECT topic_id FROM $bbdb->topicmeta WHERE meta_key = 'support_forum_resolved' AND meta_value = 'no'");
+		$topicids = $bbdb->get_col("SELECT topic_id FROM $bbdb->topicmeta WHERE meta_key = 'topic_resolved' AND meta_value = 'no'");
 		if ($topicids) {
 			$topics_in = join(',',$topicids);
 			return $where . " AND topic_id IN ($topics_in)";
@@ -169,13 +169,9 @@
 
 	add_action('bb_head','support_forum_jsfunction');
 	function support_forum_jsfunction() {
-		?>
+		if ( bb_is_user_logged_in() && is_topic() ) : ?>
 		<script type="text/javascript">
 		addLoadEvent( function() { // TopicMeta
-			theTopicMeta = new listMan('topicmeta');
-			theTopicMeta.showLink = false;
-			theTopicMeta.inputData = '&user_id=' + currentUserId + '&topic_id=' + topicId;
-
 			var resolvedSub = $('resolvedformsub');
 			if ( !resolvedSub )
 				return;
@@ -187,7 +183,7 @@
 			}
 		} );
 		</script>
-		<?php
+		<?php endif;
 	}
 
 	add_action( 'bb_ajax_update-resolution','support_forum_ajax_post_process');
@@ -205,7 +201,7 @@
 			die('0');
 
 		if ( support_forum_resolve_topic( $topic_id, $resolved ) ) {
-			$topic->support_forum_resolved = $resolved;
+			$topic->topic_resolved = $resolved;
 			ob_start();
 				echo '<li id="resolution-flipper">' . __('This topic is') . ' ';
 				support_forum_topic_resolved();
@@ -227,7 +223,7 @@
 
 		global $topic;
 
-		if ( 'yes' == $topic->support_forum_resolved )
+		if ( 'yes' == $topic->topic_resolved )
 			$class[] = 'resolved';
 
 		return $class;