Commits

Doug Stewart committed 3ef233d

Revamp of copyright and credits display in the footer.

Comments (0)

Files changed (3)

 		* Switched options textareas from `esc_attr()` to `wp_kses_post()`
 		* Calendar widget styling added
 		* `text` and `textarea` options properly escaped before output by `esc_html()`
+		* Comments styling fully fleshed-out
+		* User-specified credits and copyright text displayed correctly
 * Version 1.1.1
 	* **Issues Fixed**
 		* Updated to fix 'native' bug in upstream `bbp_twentyten` (ref. [rev. 3331](http://bbpress.trac.wordpress.org/changeset/3331))
 	* <del>You must provide styling for heading elements (&lt;h2&gt; - &lt;h6&gt;), blockquotes, tables, definition lists, ordered lists and unordered lists.</del>
 	* <del>Captioned images must be properly aligned.</del>
 	* <del>Floated elements must be properly cleared.</del>
-	* Check your styling of comments, particularly nested comments.
+	* <del>Check your styling of comments, particularly nested comments.</del>
 	* <del>Posts with closed comments are required to display some kind of "Comments are disabled" message. This does not apply to Pages.</del>
 	* <del>Theme options using textareas that allow HTML should use `wp_kses_post()` when sanitizing form data.</del>
 	* <del>Provide styling for the calendar widget.</del>
 	* <del>Provide more whitespace between the post meta and post content.</del>
-	* Content entered in "Copyright Statement" and "Footer Credits" does not show up on the site.
+	* <del>Content entered in "Copyright Statement" and "Footer Credits" does not show up on the site.</del>
 	* <del>wp_footer() must be placed directly before &lt;/body&gt;.</del>
 	* <del>The use of `$_SERVER['PHP_SELF']` in forms is discouraged as it presents a security risk.</del>
 	* <del>All custom functions and global variables must be prefixed with the theme slug or an appropriate variant.</del>
 	</div>
 	<div id="footercredits">
 	<?php 
-		if( 'true' == $lblg_options['display_footer_copyright'] ) {
-	?>
-	<p><a href="<?php echo home_url(); ?>"><?php bloginfo('name'); ?></a> <?php lblg_print_copyright(); ?></p>
-	<?php }
-		if( 'true' == $lblg_options['display_footer_credits'] ) {
+		if( $lblg_options['display_footer_copyright'] ) {
+			lblg_print_copyright();
+ 		}
+
+		if( $lblg_options['display_footer_credits'] ) {
 			lblg_print_credits();
 		}
 	?>

includes/functions/hooks.php

 	if($tmp_credits != ''){
 		$credits_text = $tmp_credits;
 	}else{
-		$credits_text = '<p>Powered by <a href="http://wordpress.org\">WordPress</a> ' . get_bloginfo('version');
-		$credits_text .= ' and <a href="http://literalbarrage.org/blog/code/elbee-elgee">Elbee Elgee</a></p>';
+		$credits_text = 'Powered by <a href="http://wordpress.org\">WordPress</a> ' . get_bloginfo('version');
+		$credits_text .= ' and <a href="http://literalbarrage.org/blog/code/elbee-elgee">Elbee Elgee</a>';
 	}
-	echo $credits_text;
+	echo "<div id=\"credits-text\">$credits_text</div>";
 }
 
 /*
 }
 
 function lblg_echo_copyright() {
-	echo lblg_copyright();
+	global $lblg_shortname, $lblg_options;
+	$tmp_copyright = $lblg_options['footer_copyright'];
+	if( $tmp_copyright != '' ){
+		$copyright_text = $tmp_copyright;
+	} else {
+		$copyright_text = "<a href=\"" . get_home_url() . "\">" . get_bloginfo('name') . "</a> " . lblg_copyright();
+	}
+	
+	print_r($tmp_copyright);
+	echo "<div id=\"copyright-text\">$copyright_text</div>";
 }
 
 // Output the Featured Image