Merge branch 'release/3.7'

crowdfavorite · Nov 12, 2013 · 10c729e · 10c729e
2 parents b722202 + d5a91de
commit 10c729e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -2,10 +2,11 @@
 
 ## 3.7
 
-- Add support for "sticky" posts (sticky.php, single-sticky.php, feed-sticky.php) in the post context
-- Set default context to archive instead of home
-- Properly load type-* templates in General context
-- Requires WordPress 3.6 (for get_post() returning global $post)
+- (feature) Add support for "sticky" posts (sticky.php, single-sticky.php, feed-sticky.php) in the post context
+- (change) Set default context to archive instead of home
+- (change) Requires WordPress 3.6 (for get_post() returning global $post)
+- (fix) Properly load type-* templates in General context
+- (fix) Output %Y as expected in admin settings for copyright field
 
 ## 3.4
 

diff --git a/utility.php b/utility.php
@@ -59,7 +59,7 @@ function cfct_banner($str = '') {
  * @return mixed Value of the option
  * 
 **/
-function cfct_get_option($name) {
+function cfct_get_option($name, $admin = true) {
 	$defaults = array(
 		cfct_option_name('login_link_enabled') => 'yes',
 		cfct_option_name('copyright') => sprintf(__('Copyright &copy; %s &nbsp;&middot;&nbsp; %s', 'carrington'), date('Y'), get_bloginfo('name')),
@@ -85,7 +85,7 @@ function cfct_get_option($name) {
 			$value = $defaults[$basename];
 		}
 	}
-	if ($name == cfct_option_name('copyright')) {
+	if (!$admin && $name == cfct_option_name('copyright')) {
 		$value = str_replace('%Y', date('Y'), $value);
 	}