WP Merge to rev 5499, this is a big one! Test it before you put it live!

Test only, not for production use yet


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@972 7be80a69-a1ef-0310-a953-fb0f7c49ff36

10 files changed, 109 insertions, 86 deletions

diff --git a/wp-content/index.php b/wp-content/index.php
index 3d5acf0..4e6c07c 100644
--- a/wp-content/index.php
+++ b/wp-content/index.php
@@ -1,3 +1,3 @@
-<?php

-// Silence is golden.

+<?php
+// Silence is golden.
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/classic/functions.php b/wp-content/themes/classic/functions.php
new file mode 100644
index 0000000..a63850c
--- /dev/null
+++ b/wp-content/themes/classic/functions.php
@@ -0,0 +1,10 @@
+<?php
+if ( function_exists('register_sidebar') )
+	register_sidebar(array(
+        'before_widget' => '<li id="%1$s" class="widget %2$s">',
+        'after_widget' => '</li>',
+        'before_title' => '',
+        'after_title' => '',
+    ));
+
+?>
diff --git a/wp-content/themes/classic/index.php b/wp-content/themes/classic/index.php
index 2760bff..ce02040 100644
--- a/wp-content/themes/classic/index.php
+++ b/wp-content/themes/classic/index.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 get_header();
 ?>
 
@@ -15,8 +15,8 @@ get_header();
 	</div>
 
 	<div class="feedback">
-            <?php wp_link_pages(); ?>
-            <?php comments_popup_link(__('Comments (0)'), __('Comments (1)'), __('Comments (%)')); ?>
+		<?php wp_link_pages(); ?>
+		<?php comments_popup_link(__('Comments (0)'), __('Comments (1)'), __('Comments (%)')); ?>
 	</div>
 
 </div>
diff --git a/wp-content/themes/classic/sidebar.php b/wp-content/themes/classic/sidebar.php
index ce72662..e4a680a 100644
--- a/wp-content/themes/classic/sidebar.php
+++ b/wp-content/themes/classic/sidebar.php
@@ -3,22 +3,14 @@
 <div id="menu">
 
 <ul>
-<?php if ( function_exists('dynamic_sidebar') && dynamic_sidebar() ) : ?>
-
-</ul>
-
-</div>
-
-<?php return; ?>
-
-<?php endif; ?>
-
+<?php 	/* Widgetized sidebar, if you have the plugin installed. */
+		if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
 	<?php wp_list_pages('title_li=' . __('Pages:')); ?>
 	<?php wp_list_bookmarks('title_after=&title_before='); ?>
 	<?php wp_list_categories('title_li=' . __('Categories:')); ?>
  <li id="search">
    <label for="s"><?php _e('Search:'); ?></label>
-   <form id="searchform" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+   <form id="searchform" method="get" action="<?php bloginfo('home'); ?>">
 	<div>
 		<input type="text" name="s" id="s" size="15" /><br />
 		<input type="submit" value="<?php _e('Search'); ?>" />
@@ -42,6 +34,7 @@
 		<?php wp_meta(); ?>
 	</ul>
  </li>
+<?php endif; ?>
 
 </ul>
 
diff --git a/wp-content/themes/classic/style.css b/wp-content/themes/classic/style.css
index e09122d..f5436b2 100644
--- a/wp-content/themes/classic/style.css
+++ b/wp-content/themes/classic/style.css
@@ -48,9 +48,9 @@ blockquote {
 
 body {
 	background: #fff;
-	border: solid 2px #565;
-	border-bottom: solid 1px #565;
-	border-top: solid 3px #565;
+	border: 2px solid #565;
+	border-bottom: 1px solid #565;
+	border-top: 3px solid #565;
 	color: #000;
 	font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
 	margin: 0;
@@ -71,7 +71,7 @@ h2 {
 }
 
 h3 {
-	border-bottom: dotted 1px #eee;
+	border-bottom: 1px dotted #eee;
 	font-family: "Times New Roman", Times, serif;
 	margin-top: 0;
 }
@@ -96,7 +96,7 @@ ul.post-meta span.post-meta-key {
 
 .credit {
 	background: #90a090;
-	border-top: double 3px #aba;
+	border-top: 3px double #aba;
 	color: #fff;
 	font-size: 11px;
 	margin: 10px 0 0 0;
@@ -166,10 +166,10 @@ ul.post-meta span.post-meta-key {
 
 #header {
 	background: #90a090;
-	border-bottom: double 3px #aba;
-	border-left: solid 1px #9a9;
-	border-right: solid 1px #565;
-	border-top: solid 1px #9a9;
+	border-bottom: 3px double #aba;
+	border-left: 1px solid #9a9;
+	border-right: 1px solid #565;
+	border-top: 1px solid #9a9;
 	font: italic normal 230% 'Times New Roman', Times, serif;
 	letter-spacing: 0.2em;
 	margin: 0;
@@ -188,7 +188,7 @@ ul.post-meta span.post-meta-key {
 #menu {
 	background: #fff;
 	border-left: 1px dotted #ccc;
-	border-top: solid 3px #e0e6e0;
+	border-top: 3px solid #e0e6e0;
 	padding: 20px 0 10px 30px;
 	position: absolute;
 	right: 2px;
diff --git a/wp-content/themes/default/archive.php b/wp-content/themes/default/archive.php
index 1d2b1de..db6db4c 100644
--- a/wp-content/themes/default/archive.php
+++ b/wp-content/themes/default/archive.php
@@ -4,26 +4,21 @@
 
 		<?php if (have_posts()) : ?>
 
-		 <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
-<?php /* If this is a category archive */ if (is_category()) { ?>
+ 	  <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
+ 	  <?php /* If this is a category archive */ if (is_category()) { ?>
 		<h2 class="pagetitle">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category</h2>
 
  	  <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
 		<h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
-
-	 <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
+ 	  <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
 		<h2 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h2>
-
-		<?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
+ 	  <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
 		<h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2>
-
 	  <?php /* If this is an author archive */ } elseif (is_author()) { ?>
 		<h2 class="pagetitle">Author Archive</h2>
-
-		<?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
+ 	  <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
 		<h2 class="pagetitle">Blog Archives</h2>
-
-		<?php } ?>
+ 	  <?php } ?>
 
 
 		<div class="navigation">
diff --git a/wp-content/themes/default/comments.php b/wp-content/themes/default/comments.php
index 0ff43b4..a9f1f39 100644
--- a/wp-content/themes/default/comments.php
+++ b/wp-content/themes/default/comments.php
@@ -6,7 +6,7 @@
 		if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
 			?>
 
-			<p class="nocomments">This post is password protected. Enter the password to view comments.<p>
+			<p class="nocomments">This post is password protected. Enter the password to view comments.</p>
 
 			<?php
 			return;
@@ -33,7 +33,7 @@
 			<?php endif; ?>
 			<br />
 
-			<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('e','',''); ?></small>
+			<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('edit','&nbsp;&nbsp;',''); ?></small>
 
 			<?php comment_text() ?>
 
diff --git a/wp-content/themes/default/footer.php b/wp-content/themes/default/footer.php
index c2317f2..68e9e5f 100644
--- a/wp-content/themes/default/footer.php
+++ b/wp-content/themes/default/footer.php
@@ -2,7 +2,7 @@
 <?php $current_site = get_current_site(); ?>
 <hr />
 <div id="footer">
-<!-- If you'd like to support WordPress, having the "powered by" link someone on your blog is the best way, it's our only promotion or advertising. -->
+<!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way, it's our only promotion or advertising. -->
 	<p>
 		<?php bloginfo('name'); ?> is proudly powered by
 		<a href="http://mu.wordpress.org/">WordPress MU</a> running on <a href="http://<?php echo $current_site->domain . $current_site->path ?>"><?php echo $current_site->site_name ?></a>. <a href="http://<?php echo $current_site->domain . $current_site->path ?>wp-signup.php" title="Create a new blog">Create a new blog</a> and join in the fun!
diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php
index 5079fce..faf85ad 100644
--- a/wp-content/themes/default/functions.php
+++ b/wp-content/themes/default/functions.php
@@ -1,4 +1,11 @@
 <?php

+if ( function_exists('register_sidebar') )

+    register_sidebar(array(

+        'before_widget' => '<li id="%1$s" class="widget %2$s">',

+        'after_widget' => '</li>',

+        'before_title' => '<h2 class="widgettitle">',

+        'after_title' => '</h2>',

+    ));

 

 function kubrick_head() {

 	$head = "<style type='text/css'>\n<!--";

@@ -75,6 +82,7 @@ add_action('admin_menu', 'kubrick_add_theme_page');
 function kubrick_add_theme_page() {

 	if ( $_GET['page'] == basename(__FILE__) ) {

 		if ( 'save' == $_REQUEST['action'] ) {

+			check_admin_referer('kubrick-header');

 			if ( isset($_REQUEST['njform']) ) {

 				if ( isset($_REQUEST['defaults']) ) {

 					delete_option('kubrick_header_image');

@@ -83,13 +91,14 @@ function kubrick_add_theme_page() {
 				} else {

 					if ( '' == $_REQUEST['njfontcolor'] )

 						delete_option('kubrick_header_color');

-					else

-						update_option('kubrick_header_color', $_REQUEST['njfontcolor']);

-

+					else {

+						$fontcolor = preg_replace('/^.*(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['njfontcolor']);

+						update_option('kubrick_header_color', $fontcolor);

+					}

 					if ( preg_match('/[0-9A-F]{6}|[0-9A-F]{3}/i', $_REQUEST['njuppercolor'], $uc) && preg_match('/[0-9A-F]{6}|[0-9A-F]{3}/i', $_REQUEST['njlowercolor'], $lc) ) {

 						$uc = ( strlen($uc[0]) == 3 ) ? $uc[0]{0}.$uc[0]{0}.$uc[0]{1}.$uc[0]{1}.$uc[0]{2}.$uc[0]{2} : $uc[0];

 						$lc = ( strlen($lc[0]) == 3 ) ? $lc[0]{0}.$lc[0]{0}.$lc[0]{1}.$lc[0]{1}.$lc[0]{2}.$lc[0]{2} : $lc[0];

-						update_option('kubrick_header_image', "header-img.php?upper=$uc&amp;lower=$lc");

+						update_option('kubrick_header_image', "header-img.php?upper=$uc&lower=$lc");

 					}

 

 					if ( isset($_REQUEST['toggledisplay']) ) {

@@ -102,20 +111,27 @@ function kubrick_add_theme_page() {
 			} else {

 

 				if ( isset($_REQUEST['headerimage']) ) {

+					check_admin_referer('kubrick-header');

 					if ( '' == $_REQUEST['headerimage'] )

 						delete_option('kubrick_header_image');

-					else

-						update_option('kubrick_header_image', $_REQUEST['headerimage']);

+					else {

+						$headerimage = preg_replace('/^.*?(header-img.php\?upper=[0-9a-fA-F]{6}&lower=[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['headerimage']);

+						update_option('kubrick_header_image', $headerimage);

+					}

 				}

 

 				if ( isset($_REQUEST['fontcolor']) ) {

+					check_admin_referer('kubrick-header');

 					if ( '' == $_REQUEST['fontcolor'] )

 						delete_option('kubrick_header_color');

-					else

-						update_option('kubrick_header_color', $_REQUEST['fontcolor']);

+					else {

+						$fontcolor = preg_replace('/^.*?(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['fontcolor']);

+						update_option('kubrick_header_color', $fontcolor);

+					}

 				}

 

 				if ( isset($_REQUEST['fontdisplay']) ) {

+					check_admin_referer('kubrick-header');

 					if ( '' == $_REQUEST['fontdisplay'] || 'inline' == $_REQUEST['fontdisplay'] )

 						delete_option('kubrick_header_display');

 					else

@@ -128,7 +144,7 @@ function kubrick_add_theme_page() {
 		}

 		add_action('admin_head', 'kubrick_theme_page_head');

 	}

-	add_theme_page('Customize Header', 'Header Image and Color', 'edit_themes', basename(__FILE__), 'kubrick_theme_page');

+	add_theme_page(__('Customize Header'), __('Header Image and Color'), 'edit_themes', basename(__FILE__), 'kubrick_theme_page');

 }

 

 function kubrick_theme_page_head() {

@@ -141,7 +157,7 @@ function kubrick_theme_page_head() {
 		kUpdate(ColorPicker_targetInput.id);

 	}

 	function PopupWindow_populate(contents) {

-		contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" value="Close Color Picker" onclick="cp.hidePopup(\'prettyplease\')"></input></p>';

+		contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" value="<?php echo attribute_escape(__('Close Color Picker')); ?>" onclick="cp.hidePopup(\'prettyplease\')"></input></p>';

 		this.contents = contents;

 		this.populated = false;

 	}

@@ -226,13 +242,13 @@ function kubrick_theme_page_head() {
 		document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value;

 	}

 	function kRevert() {

-		document.getElementById('headerimage').value = '<?php echo kubrick_header_image(); ?>';

-		document.getElementById('advuppercolor').value = document.getElementById('uppercolor').value = '#<?php echo kubrick_upper_color(); ?>';

-		document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#<?php echo kubrick_lower_color(); ?>';

-		document.getElementById('header').style.background = 'url("<?php echo kubrick_header_image_url(); ?>") center no-repeat';

+		document.getElementById('headerimage').value = '<?php echo js_escape(kubrick_header_image()); ?>';

+		document.getElementById('advuppercolor').value = document.getElementById('uppercolor').value = '#<?php echo js_escape(kubrick_upper_color()); ?>';

+		document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#<?php echo js_escape(kubrick_lower_color()); ?>';

+		document.getElementById('header').style.background = 'url("<?php echo js_escape(kubrick_header_image_url()); ?>") center no-repeat';

 		document.getElementById('header').style.color = '';

-		document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '<?php echo kubrick_header_color_string(); ?>';

-		document.getElementById('fontdisplay').value = '<?php echo kubrick_header_display_string(); ?>';

+		document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '<?php echo js_escape(kubrick_header_color_string()); ?>';

+		document.getElementById('fontdisplay').value = '<?php echo js_escape(kubrick_header_display_string()); ?>';

 		document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value;

 	}

 	function kInit() {

@@ -338,11 +354,11 @@ function kubrick_theme_page_head() {
 }

 

 function kubrick_theme_page() {

-	if ( $_REQUEST['saved'] ) echo '<div id="message" class="updated fade"><p><strong>Options saved.</strong></p></div>';

+	if ( $_REQUEST['saved'] ) echo '<div id="message" class="updated fade"><p><strong>'.__('Options saved.').'</strong></p></div>';

 ?>

 <div class='wrap'>

 	<div id="kubrick-header">

-		<h2>Header Image and Color</h2>

+	<h2><?php _e('Header Image and Color'); ?></h2>

 		<div id="headwrap">

 			<div id="header">

 				<div id="headerimg">

@@ -354,41 +370,44 @@ function kubrick_theme_page() {
 		<br />

 		<div id="nonJsForm">

 			<form method="post" action="">

-				<div class="zerosize"><input type="submit" name="defaultsubmit" value="Save" /></div>

-				<label for="njfontcolor">Font Color:</label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo kubrick_header_color(); ?>" /> Any CSS color (<code>red</code> or <code>#FF0000</code> or <code>rgb(255, 0, 0)</code>)<br />

-				<label for="njuppercolor">Upper Color:</label><input type="text" name="njuppercolor" id="njuppercolor" value="#<?php echo kubrick_upper_color(); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br />

-				<label for="njlowercolor">Lower Color:</label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo kubrick_lower_color(); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br />

-				<input type="hidden" name="hi" id="hi" value="<?php echo kubrick_header_image(); ?>" />

-				<input type="submit" name="toggledisplay" id="toggledisplay" value="Toggle Text" />

-				<input type="submit" name="defaults" value="Use Defaults" />

-				<input type="submit" class="defbutton" name="submitform" value="&nbsp;&nbsp;Save&nbsp;&nbsp;" />

+				<?php wp_nonce_field('kubrick-header'); ?>

+				<div class="zerosize"><input type="submit" name="defaultsubmit" value="<?php echo attribute_escape(__('Save')); ?>" /></div>

+					<label for="njfontcolor"><?php _e('Font Color:'); ?></label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo attribute_escape(kubrick_header_color()); ?>" /> <?php printf(__('Any CSS color (%s or %s or %s)'), '<code>red</code>', '<code>#FF0000</code>', '<code>rgb(255, 0, 0)</code>'); ?><br />

+					<label for="njuppercolor"><?php _e('Upper Color:'); ?></label><input type="text" name="njuppercolor" id="njuppercolor" value="#<?php echo attribute_escape(kubrick_upper_color()); ?>" /> <?php printf(__('HEX only (%s or %s)'), '<code>#FF0000</code>', '<code>#F00</code>'); ?><br />

+				<label for="njlowercolor"><?php _e('Lower Color:'); ?></label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo attribute_escape(kubrick_lower_color()); ?>" /> <?php printf(__('HEX only (%s or %s)'), '<code>#FF0000</code>', '<code>#F00</code>'); ?><br />

+				<input type="hidden" name="hi" id="hi" value="<?php echo attribute_escape(kubrick_header_image()); ?>" />

+				<input type="submit" name="toggledisplay" id="toggledisplay" value="<?php echo attribute_escape(__('Toggle Text')); ?>" />

+				<input type="submit" name="defaults" value="<?php echo attribute_escape(__('Use Defaults')); ?>" />

+				<input type="submit" class="defbutton" name="submitform" value="&nbsp;&nbsp;<?php _e('Save'); ?>&nbsp;&nbsp;" />

 				<input type="hidden" name="action" value="save" />

 				<input type="hidden" name="njform" value="true" />

 			</form>

 		</div>

 		<div id="jsForm">

 			<form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo $_SERVER['REQUEST_URI']; ?>">

-				<input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="Font Color"></input>

-				<input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="Upper Color"></input>

-				<input type="button" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="Lower Color"></input>

-				<input type="button" name="revert" value="Revert" onclick="kRevert()" />

-				<input type="button" value="Advanced" onclick="toggleAdvanced()" />

+				<?php wp_nonce_field('kubrick-header'); ?>

+	<input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php echo attribute_escape(__('Font Color')); ?>"></input>

+		<input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php echo attribute_escape(__('Upper Color')); ?>"></input>

+		<input type="button" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="<?php echo attribute_escape(__('Lower Color')); ?>"></input>

+				<input type="button" name="revert" value="<?php echo attribute_escape(__('Revert')); ?>" onclick="kRevert()" />

+				<input type="button" value="<?php echo attribute_escape(__('Advanced')); ?>" onclick="toggleAdvanced()" />

 				<input type="hidden" name="action" value="save" />

-				<input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo kubrick_header_display(); ?>" />

-				<input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo kubrick_header_color(); ?>" />

-				<input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo kubrick_upper_color(); ?>" />

-				<input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo kubrick_lower_color(); ?>" />

-				<input type="hidden" name="headerimage" id="headerimage" value="<?php echo kubrick_header_image(); ?>" />

-				<p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php _e('Update Header &raquo;'); ?>" onclick="cp.hidePopup('prettyplease')" /></p>

+				<input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo attribute_escape(kubrick_header_display()); ?>" />

+				<input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo attribute_escape(kubrick_header_color()); ?>" />

+				<input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo attribute_escape(kubrick_upper_color()); ?>" />

+				<input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo attribute_escape(kubrick_lower_color()); ?>" />

+				<input type="hidden" name="headerimage" id="headerimage" value="<?php echo attribute_escape(kubrick_header_image()); ?>" />

+				<p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php echo attribute_escape(__('Update Header &raquo;')); ?>" onclick="cp.hidePopup('prettyplease')" /></p>

 			</form>

 			<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div>

 			<div id="advanced">

 				<form id="jsAdvanced" style="display:none;" action="">

-					<label for="advfontcolor">Font Color (CSS): </label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo kubrick_header_color(); ?>" /><br />

-					<label for="advuppercolor">Upper Color (HEX): </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo kubrick_upper_color(); ?>" /><br />

-					<label for="advlowercolor">Lower Color (HEX): </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo kubrick_lower_color(); ?>" /><br />

-					<input type="button" name="default" value="Select Default Colors" onclick="kDefaults()" /><br />

-					<input type="button" onclick="toggleDisplay();return false;" name="pick" id="pick" value="Toggle Text Display"></input><br />

+					<?php wp_nonce_field('kubrick-header'); ?>

+					<label for="advfontcolor"><?php _e('Font Color (CSS):'); ?> </label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo attribute_escape(kubrick_header_color()); ?>" /><br />

+					<label for="advuppercolor"><?php _e('Upper Color (HEX):');?> </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo attribute_escape(kubrick_upper_color()); ?>" /><br />

+					<label for="advlowercolor"><?php _e('Lower Color (HEX):'); ?> </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo attribute_escape(kubrick_lower_color()); ?>" /><br />

+					<input type="button" name="default" value="<?php echo attribute_escape(__('Select Default Colors')); ?>" onclick="kDefaults()" /><br />

+					<input type="button" onclick="toggleDisplay();return false;" name="pick" id="pick" value="<?php echo attribute_escape(__('Toggle Text Display')); ?>"></input><br />

 				</form>

 			</div>

 		</div>

diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php
index 6834dbc..0fdccda 100644
--- a/wp-content/themes/default/sidebar.php
+++ b/wp-content/themes/default/sidebar.php
@@ -1,6 +1,7 @@
 	<div id="sidebar">
 		<ul>
-
+			<?php 	/* Widgetized sidebar, if you have the plugin installed. */
+					if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
 <?php if ( function_exists('dynamic_sidebar') && dynamic_sidebar() ) : ?>
 
 		</ul>
@@ -19,7 +20,10 @@
 			</li>
 			-->
 
-			<li>
+			<?php if ( is_404() || is_category() || is_day() || is_month() ||
+						is_year() || is_search() || is_paged() ) {
+			?> <li>
+
 			<?php /* If this is a 404 page */ if (is_404()) { ?>
 			<?php /* If this is a category archive */ } elseif (is_category()) { ?>
 			<p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
@@ -44,7 +48,8 @@
 			<p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
 
 			<?php } ?>
-			</li>
+				
+			</li> <?php }?>
 
 			<?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
 
@@ -73,7 +78,8 @@
 				</ul>
 				</li>
 			<?php } ?>
-
+			
+			<?php endif; ?>
 		</ul>
 	</div>