<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13309] trunk: Remove unused 'secret' option.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13309">13309</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-22 20:27:02 +0000 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused 'secret' option. Fixes <a href="http://trac.wordpress.org/ticket/12221">#12221</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (13308 => 13309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-02-22 20:15:48 UTC (rev 13308)
+++ trunk/wp-admin/includes/schema.php 2010-02-22 20:27:02 UTC (rev 13309)
</span><span class="lines">@@ -265,9 +265,6 @@
</span><span class="cx"> 'uploads_use_yearmonth_folders' => $uploads_use_yearmonth_folders,
</span><span class="cx"> 'upload_path' => '',
</span><span class="cx">
</span><del>- // 2.0.3
- 'secret' => wp_generate_password( 64, true, true ),
-
</del><span class="cx"> // 2.1
</span><span class="cx"> 'blog_public' => '1',
</span><span class="cx"> 'default_link_category' => 2,
</span><span class="lines">@@ -357,7 +354,7 @@
</span><span class="cx">
</span><span class="cx"> // Delete unused options
</span><span class="cx"> $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', 'deactivated_plugins', 'can_compress_scripts',
</span><del>- 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length');
</del><ins>+ 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret');
</ins><span class="cx"> foreach ($unusedoptions as $option)
</span><span class="cx"> delete_option($option);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (13308 => 13309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-02-22 20:15:48 UTC (rev 13308)
+++ trunk/wp-admin/includes/upgrade.php 2010-02-22 20:27:02 UTC (rev 13309)
</span><span class="lines">@@ -421,9 +421,6 @@
</span><span class="cx"> if ( $wp_current_db_version < 7499 )
</span><span class="cx"> upgrade_250();
</span><span class="cx">
</span><del>- if ( $wp_current_db_version < 7796 )
- upgrade_251();
-
</del><span class="cx"> if ( $wp_current_db_version < 7935 )
</span><span class="cx"> upgrade_252();
</span><span class="cx">
</span><span class="lines">@@ -1012,18 +1009,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Execute changes made in WordPress 2.5.1.
- *
- * @since 2.5.1
- */
-function upgrade_251() {
- global $wp_current_db_version;
-
- // Make the secret longer
- update_option('secret', wp_generate_password(64));
-}
-
-/**
</del><span class="cx"> * Execute changes made in WordPress 2.5.2.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.2
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (13308 => 13309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-02-22 20:15:48 UTC (rev 13308)
+++ trunk/wp-includes/pluggable.php 2010-02-22 20:27:02 UTC (rev 13309)
</span><span class="lines">@@ -1288,7 +1288,8 @@
</span><span class="cx"> * @since 2.5
</span><span class="cx"> * @link https://api.wordpress.org/secret-key/1.1/ Create a Secret Key for wp-config.php
</span><span class="cx"> *
</span><del>- * @return string Salt value from either 'SECRET_KEY' or 'secret' option
</del><ins>+ * @param string $scheme Authentication scheme
+ * @return string Salt value
</ins><span class="cx"> */
</span><span class="cx"> function wp_salt($scheme = 'auth') {
</span><span class="cx"> global $wp_default_secret_key;
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (13308 => 13309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2010-02-22 20:15:48 UTC (rev 13308)
+++ trunk/wp-includes/version.php 2010-02-22 20:27:02 UTC (rev 13309)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 13226;
</del><ins>+$wp_db_version = 13309;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>