Ticket #6830: 6830.001.diff
| File 6830.001.diff, 5.9 KB (added by markjaquith, 5 years ago) |
|---|
-
wp-includes/version.php
16 16 * 17 17 * @global int $wp_db_version 18 18 */ 19 $wp_db_version = 784 2;19 $wp_db_version = 7843; 20 20 21 21 ?> -
wp-content/themes/default/functions.php
62 62 63 63 function kubrick_header_color_string() { 64 64 $color = kubrick_header_color(); 65 if ( false ===$color )65 if ( !$color ) 66 66 return 'white'; 67 67 68 68 return $color; … … 85 85 check_admin_referer('kubrick-header'); 86 86 if ( isset($_REQUEST['njform']) ) { 87 87 if ( isset($_REQUEST['defaults']) ) { 88 delete_option('kubrick_header_image');89 delete_option('kubrick_header_color');90 delete_option('kubrick_header_display');88 update_option('kubrick_header_image', ''); 89 update_option('kubrick_header_color', '#ffffff'); 90 update_option('kubrick_header_display', ''); 91 91 } else { 92 92 if ( '' == $_REQUEST['njfontcolor'] ) 93 delete_option('kubrick_header_color');93 update_option('kubrick_header_color', '#ffffff'); 94 94 else { 95 95 $fontcolor = preg_replace('/^.*(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['njfontcolor']); 96 update_option('kubrick_header_color', $fontcolor); 96 if ( $fontcolor ) // if it fails the preg_replace, it'll be NULL, so don't update 97 update_option('kubrick_header_color', $fontcolor); 97 98 } 98 99 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) ) { 99 100 $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]; … … 105 106 if ( false === get_option('kubrick_header_display') ) 106 107 update_option('kubrick_header_display', 'none'); 107 108 else 108 delete_option('kubrick_header_display');109 update_option('kubrick_header_display', ''); 109 110 } 110 111 } 111 112 } else { … … 113 114 if ( isset($_REQUEST['headerimage']) ) { 114 115 check_admin_referer('kubrick-header'); 115 116 if ( '' == $_REQUEST['headerimage'] ) 116 delete_option('kubrick_header_image');117 update_option('kubrick_header_image', ''); 117 118 else { 118 119 $headerimage = preg_replace('/^.*?(header-img.php\?upper=[0-9a-fA-F]{6}&lower=[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['headerimage']); 119 120 update_option('kubrick_header_image', $headerimage); … … 123 124 if ( isset($_REQUEST['fontcolor']) ) { 124 125 check_admin_referer('kubrick-header'); 125 126 if ( '' == $_REQUEST['fontcolor'] ) 126 delete_option('kubrick_header_color');127 update_option('kubrick_header_color', '#ffffff'); 127 128 else { 128 129 $fontcolor = preg_replace('/^.*?(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['fontcolor']); 129 update_option('kubrick_header_color', $fontcolor); 130 if ( $fontcolor ) // if it fails the preg_replace, it'll be NULL, so don't update 131 update_option('kubrick_header_color', $fontcolor); 130 132 } 131 133 } 132 134 133 135 if ( isset($_REQUEST['fontdisplay']) ) { 134 136 check_admin_referer('kubrick-header'); 135 137 if ( '' == $_REQUEST['fontdisplay'] || 'inline' == $_REQUEST['fontdisplay'] ) 136 delete_option('kubrick_header_display');138 update_option('kubrick_header_display', ''); 137 139 else 138 140 update_option('kubrick_header_display', 'none'); 139 141 } … … 237 239 document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#4180b6'; 238 240 document.getElementById('header').style.background = 'url("<?php echo get_template_directory_uri(); ?>/images/kubrickheader.jpg") center no-repeat'; 239 241 document.getElementById('header').style.color = '#FFFFFF'; 240 document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = ' ';242 document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '#FFFFFF'; 241 243 document.getElementById('fontdisplay').value = 'inline'; 242 244 document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value; 243 245 } -
wp-admin/includes/schema.php
253 253 add_option('medium_size_w', 300); 254 254 add_option('medium_size_h', 300); 255 255 256 // 2.6 257 // these five options have long existed, but need to be initialized to avoid extra queries 258 add_option('widget_text', ''); 259 add_option('widget_rss', ''); 260 add_option('kubrick_header_image', ''); 261 add_option('kubrick_header_color', '#FFFFFF'); 262 add_option('kubrick_header_display', ''); 263 256 264 // Delete unused options 257 265 $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval'); 258 266 foreach ($unusedoptions as $option) :
