Changes from branches/3.0/wp-admin/includes/upgrade.php at r15458 to trunk/wp-admin/includes/upgrade.php at r16959

File:

• trunk/wp-admin/includes/upgrade.php (modified) (25 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -25 +25 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 2.1.0
  *
  * @param string $blog_title Blog title.
@@ -65 +65 @@
     $email_password = false;
     if ( !$user_id && empty($user_password) ) {
-        $user_password = wp_generate_password();
+        $user_password = wp_generate_password( 12, false );
         $message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
         $user_id = wp_create_user($user_name, $user_password, $user_email);
@@ -99 +99 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 2.1.0
  *
  * @param int $user_id User ID.
@@ -244 +244 @@
 
     // First Page
-    $first_page = __('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.');
+    $first_page = sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
+
+<blockquote>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my blog. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
+
+...or something like this:
+
+<blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickies to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
+
+As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
     if ( is_multisite() )
         $first_page = get_site_option( 'first_page', $first_page );
@@ -254 +262 @@
                                 'post_content' => $first_page,
                                 'post_excerpt' => '',
-                                'post_title' => __('About'),
+                                'post_title' => __( 'Sample Page' ),
                                 /* translators: Default page slug */
-                                'post_name' => _x('about', 'Default page slug'),
+                                'post_name' => __( 'sample-page' ),
                                 'post_modified' => $now,
                                 'post_modified_gmt' => $now_gmt,
@@ -267 +275 @@
     $wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
 
-    // Setup default widgets for default theme.
+    // Set up default widgets for default theme.
     update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
     update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
@@ -301 +309 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 2.1.0
  *
  * @param string $blog_title Blog title.
@@ -337 +345 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 2.1.0
  *
  * @return null
@@ -376 +384 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.0.1
  */
 function upgrade_all() {
@@ -1188 +1196 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.0.0
  *
  * @param string $table_name Database table name to create.
@@ -1211 +1219 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.0.1
  *
  * @param string $table Database table name.
@@ -1234 +1242 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.0.1
  *
  * @param string $table Database table name.
@@ -1297 +1305 @@
  * Version of get_option that is private to install/upgrade.
  *
- * @since unknown
+ * @since 1.5.1
  * @access private
  *
@@ -1334 +1342 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.5.0
  *
  * @param string $content
@@ -1361 +1369 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.5.0
  *
  * @param unknown_type $queries
@@ -1568 +1576 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.5.0
  */
 function make_db_current() {
@@ -1584 +1592 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.5.0
  */
 function make_db_current_silent() {
@@ -1597 +1605 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.5.0
  *
  * @param unknown_type $theme_name
@@ -1657 +1665 @@
 
     // Add a theme header.
-    $header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the upgrade.\nVersion: 1.0\nAuthor: Moi\n*/\n";
+    $header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
 
     $stylelines = file_get_contents("$site_dir/style.css");
@@ -1676 +1684 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.5.0
  *
  * @param unknown_type $theme_name
@@ -1742 +1750 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 1.5.0
  *
  * @return unknown
@@ -1790 +1798 @@
  * Translate user level to user role name.
  *
- * @since unknown
+ * @since 2.0.0
  *
  * @param int $level User level.
@@ -1821 +1829 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 2.1.0
  */
 function wp_check_mysql_version() {
@@ -1835 +1843 @@
  * {@internal Missing Long Description}}
  *
- * @since unknown
+ * @since 2.2.0
  */
 function maybe_disable_automattic_widgets() {
@@ -1851 +1859 @@
 /**
  * Runs before the schema is upgraded.
+ *
+ * @since 2.9.0
  */
 function pre_schema_upgrade() {