diff --git a/wp-admin/upgrade-072-to-080.php b/wp-admin/upgrade-072-to-080.php new file mode 100644 index 0000000000..7bd5cbeeea --- /dev/null +++ b/wp-admin/upgrade-072-to-080.php @@ -0,0 +1,250 @@ + + + +WordPress › .72 to .80 Upgrade + + + +

WordPress

+ +

This file seeks to upgrade you to the latest version of WordPress. If you are upgrading from any version other than .72, you should run the previous upgrade files to get everything up to date before running this.

+

If you’re all ready, let's go!

+ +

Step 1

+

If it isn’t there already, let’s add a field new to this version.

+hide_errors(); +$wpdb->query("ALTER TABLE `$tableposts` ADD INDEX (`post_name`)"); +$wpdb->show_errors(); +?> +

Done.

+

Now let's populate the new field.

+

Working + get_results("SELECT ID, post_title, post_name FROM $tableposts"); + +foreach($posts as $post) { + if ('' == $post->post_name) { + $newtitle = sanitize_title($post->post_title); + $wpdb->query("UPDATE $tableposts SET post_name = '$newtitle' WHERE ID = $post->ID"); + } + echo ' .'; + flush(); +} + +if (!$wpdb->get_var("SELECT option_name FROM $tableoptions WHERE option_name = 'permalink_structure'")) { // If it's not already there + $wpdb->query("INSERT INTO `$tableoptions` + (`option_id`, `blog_id`, `option_name`, `option_can_override`, `option_type`, `option_value`, `option_width`, `option_height`, `option_description`, `option_admin_level`) + VALUES + ('', '0', 'permalink_structure', 'Y', '3', '', '20', '8', 'How the permalinks for your site are constructed. See permalink options page for necessary mod_rewrite rules and more information.', '8');"); + } +?> + Done with the name game. Now a little option action.

+

Now on to step 2.

+ +

Step 2

+

Now we need to adjust some option data (don't worry this won't change any of your settings.)

+

Working +hide_errors(); // Turn this off for dev and we should probably just fix the queries anyway + // fix timezone diff range + $wpdb->query("UPDATE $tableoptionvalues SET optionvalue_max = 23 , optionvalue_min = -23 WHERE option_id = 51"); + echo ' .'; + flush(); + // fix upload users description + $wpdb->query("UPDATE $tableoptions SET option_description = '...or you may authorize only some users. enter their logins here, separated by spaces. if you leave this variable blank, all users who have the minimum level are authorized to upload. example: \'barbara anne george\'' WHERE option_id = 37"); + echo ' .'; + flush(); + // and file types + $wpdb->query("UPDATE $tableoptions SET option_description = 'accepted file types, separated by spaces. example: \'jpg gif png\'' WHERE option_id = 34"); + echo ' .'; + flush(); + // add link to php date format. this could be to a wordpress.org page in the future + $wpdb->query("UPDATE $tableoptions SET option_description = 'see help for format characters' WHERE option_id = 52"); + $wpdb->query("UPDATE $tableoptions SET option_description = 'see help for format characters' WHERE option_id = 53"); + echo ' .'; + flush(); +?> + Done with the options updates. Now for a bit of comment action

+query("ALTER TABLE $tablecomments ADD INDEX (comment_approved)"); + } +} + +// Insert new option "comment_moderation" to settings +if (!$wpdb->get_var("SELECT option_id FROM $tableoptions WHERE option_name = 'comment_moderation'")) { + $wpdb->query("INSERT INTO $tableoptions + (option_id, blog_id, option_name, option_can_override, option_type, option_value, option_width, option_height, option_description, option_admin_level) + VALUES + ('0', '0', 'comment_moderation', 'Y', '5',' none', 20, 8, 'If enabled, comments will only be shown after they have been approved.', 8)"); +} + +// attach option to group "General blog settings" +if ($continue) { + $oid = $wpdb->get_var("SELECT option_id FROM $tableoptions WHERE option_name = 'comment_moderation'"); + $gid = $wpdb->get_var("SELECT group_id FROM $tableoptiongroups WHERE group_name = 'General blog settings'"); + + $seq = $wpdb->get_var("SELECT MAX(seq) FROM $tableoptiongroup_options WHERE group_id = '$gid'"); + + ++$seq; + + $wpdb->query("INSERT INTO $tableoptiongroup_options + (group_id, option_id, seq) + VALUES + ('$gid', '$oid', '$seq')"); +} + +// Insert option values for new option "comment_moderation" +if ($continue) { + $ddl = array(); + $ddl[] = "INSERT INTO $tableoptionvalues + (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) + VALUES + ('$oid', 'none', 'None', NULL, NULL, 1)"; + $ddl[] = "INSERT INTO $tableoptionvalues + (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) + VALUES + ('$oid', 'manual', 'Manual', NULL, NULL, 2)"; + $ddl[] = "INSERT INTO $tableoptionvalues + (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) + VALUES + ('$oid','auto', 'Automatic', NULL, NULL, 3)"; + + foreach ($ddl as $query) { + $wpdb->query($query); + } + +} + +// Insert new option "moderation_notify" to settings +if (!$wpdb->get_var("SELECT option_id FROM $tableoptions WHERE option_name = 'moderation_notify'")) { + $wpdb->query("INSERT INTO $tableoptions + (option_id, blog_id, option_name, option_can_override, option_type, option_value, option_width, option_height, option_description, option_admin_level) + VALUES + ('0', '0', 'moderation_notify' , 'Y', '2', '1', 20, 8, 'Set this to true if you want to be notified about new comments that wait for approval', 8)"); +} + +// attach option to group "General blog settings" +if ($continue) { + $oid = $wpdb->get_var("SELECT option_id FROM $tableoptions WHERE option_name = 'moderation_notify'"); + $gid = $wpdb->get_var("SELECT group_id FROM $tableoptiongroups WHERE group_name = 'General blog settings'"); + + $seq = $wpdb->get_var("SELECT MAX(seq) FROM $tableoptiongroup_options WHERE group_id = '$gid'"); + + ++$seq; + $wpdb->query("INSERT INTO $tableoptiongroup_options + (group_id, option_id, seq) + VALUES + ('$gid', '$oid', '$seq')"); +} +$wpdb->show_errors(); +?> +

Comment spammers should now watch out for you.

+

See, that didn’t hurt a bit (again). Now on to the final step.

+ + +

Step 3

+

This is the final step, and the most exciting. We’re going to make it so each post can now have multiple categories. Hold on tight.

+Table created successfully.

'; + else echo '

New category table already created. Skipping.

'; +?> +

Now we need to transfer all your old categories into the new table.

+

Working... +get_results("SELECT ID, post_category FROM $tableposts"); + +foreach ($allposts as $post) { + // Check to see if it's already been imported + $cat = $wpdb->get_row("SELECT * FROM $tablepost2cat WHERE post_id = $post->ID AND category_id = $post->post_category"); + if (!$cat) { // If there's no result + $wpdb->query(" + INSERT INTO $tablepost2cat + (post_id, category_id) + VALUES + ($post->ID, $post->post_category) + "); + echo '. '; + flush(); + } +} + +// Going to leave the post table category field in for now. We can remove it in a future version. +?> + All done!

+

You are ready to rock ’n roll. Go crazy.

+ + + diff --git a/wp-config.sample.php b/wp-config.sample.php index a172a7fa8c..89e2c82477 100644 --- a/wp-config.sample.php +++ b/wp-config.sample.php @@ -9,25 +9,10 @@ define('DB_HOST', 'localhost'); // 99% chance you won't need to change this // Database tables' names // -// Change them if you want to have multiple blogs in a single database. -// If you already have custom names leave table_prefix empty and just -// edit the names. +// Change the prefix if you want to have multiple blogs in a single database. $table_prefix = 'wp_'; // eg 'wp_' or 'b2' or 'mylogin_' -$tableposts = $table_prefix . 'posts'; -$tableusers = $table_prefix . 'users'; -$tablesettings = $table_prefix . 'settings'; // only used during upgrade -$tablecategories = $table_prefix . 'categories'; -$tablecomments = $table_prefix . 'comments'; -$tablelinks = $table_prefix . 'links'; -$tablelinkcategories = $table_prefix . 'linkcategories'; -$tableoptions = $table_prefix . 'options'; -$tableoptiontypes = $table_prefix . 'optiontypes'; -$tableoptionvalues = $table_prefix . 'optionvalues'; -$tableoptiongroups = $table_prefix . 'optiongroups'; -$tableoptiongroup_options = $table_prefix . 'optiongroup_options'; - // This is the name of the include directory. No "/" allowed. $b2inc = 'b2-include'; diff --git a/wp-settings.php b/wp-settings.php index de462bcb6f..0d910c2c46 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -1,4 +1,20 @@