From dd8e5a3aae12282980d3235397b04e2b17dc1653 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 5 Jan 2006 01:47:22 +0000
Subject: [PATCH] Default theme header color provisioning tweaks. fixes #2219

git-svn-id: http://svn.automattic.com/wordpress/trunk@3399 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/default/functions.php         | 14 ++++++++------
 wp-content/themes/default/images/header-img.php |  7 +++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php
index 2af0b16d3..23482a249 100644
--- a/wp-content/themes/default/functions.php
+++ b/wp-content/themes/default/functions.php
@@ -25,16 +25,18 @@ function kubrick_header_image() {
 }
 
 function kubrick_upper_color() {
-	if ( strstr( kubrick_header_image_url(), 'header-img.php?' ) )
-		return substr( kubrick_header_image(), 21, 6 );
-	else
+	if ( strstr( $url = kubrick_header_image_url(), 'header-img.php?' ) ) {
+		parse_str(substr($url, strpos($url, '?') + 1), $q);
+		return $q['upper'];
+	} else
 		return '69aee7';
 }
 
 function kubrick_lower_color() {
-	if ( strstr( kubrick_header_image_url(), 'header-img.php?' ) )
-		return substr( kubrick_header_image(), 34, 6 );
-	else
+	if ( strstr( $url = kubrick_header_image_url(), 'header-img.php?' ) ) {
+		parse_str(substr($url, strpos($url, '?') + 1), $q);
+		return $q['lower'];
+	} else
 		return '4180b6';
 }
 
diff --git a/wp-content/themes/default/images/header-img.php b/wp-content/themes/default/images/header-img.php
index afae590b0..65a9e8751 100644
--- a/wp-content/themes/default/images/header-img.php
+++ b/wp-content/themes/default/images/header-img.php
@@ -8,11 +8,14 @@ if ( ! function_exists('imagecreatefromjpeg') )
 
 // Assign and validate the color values
 $default = false;
-$vars = array('upper'=>array(0=>'r1', 2=>'g1', 4=>'b1'), 'lower'=>array(0=>'r2', 2=>'g2', 4=>'b2'));
+$vars = array('upper'=>array('r1', 'g1', 'b1'), 'lower'=>array('r2', 'g2', 'b2'));
 foreach ( $vars as $var => $subvars ) {
 	if ( isset($_GET[$var]) ) {
 		foreach ( $subvars as $index => $subvar ) {
-			$$subvar = hexdec( substr($_GET[$var], $index, 2) );
+			$length = strlen($_GET[$var]) / 3;
+			$v = substr($_GET[$var], $index * $length, $length);
+			if ( $length == 1 ) $v = '' . $v . $v;
+			$$subvar = hexdec( $v );
 			if ( $$subvar < 0 || $$subvar > 255 )
 				$default = true;
 		}