diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 579ff9822a..3f8ea52bf0 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -91,15 +91,17 @@ This address is used only for admin purposes.   - The following use the same syntax as the PHP date() function. + The following use the same syntax as the PHP date() function. Save option to update sample output. Default date format: - +
+Output: Default time format: - +
+Output: diff --git a/wp-admin/options-head.php b/wp-admin/options-head.php index a428bfda50..721ec2bd72 100644 --- a/wp-admin/options-head.php +++ b/wp-admin/options-head.php @@ -23,8 +23,8 @@ $submenu = <<Reading
  • Discussion
  • Miscellaneous
    • +
  • Permalinks
    • $groups -
  • Permalinks
    • END; @@ -33,7 +33,7 @@ foreach ($sublines as $subline) { preg_match('/href="([^"]+)"/', $subline, $url); if (substr($_SERVER['REQUEST_URI'], -8) == substr($url[1], -8)) { $subline = str_replace('a hr', 'a class="current" hr', $subline); - if ($_SERVER["REQUEST_URI"] == $url[1]) { + if (str_replace('/wp-admin/', '', $_SERVER["REQUEST_URI"]) == $url[1]) { $subline = preg_replace('|href=".*?"|', '', $subline); } } diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php index ba89dfbbc1..25f46d6eb6 100644 --- a/wp-admin/options-misc.php +++ b/wp-admin/options-misc.php @@ -44,7 +44,56 @@ include('options-head.php');

    Miscellaneous Options

    - + +
    +File Uploads + + + + + + + + + + + + + + + + + + + + + + + + + +
    + /> +
    Destination directory: +
    +Recommended: + +
    URI of this directory: +
    +Recommended: +
    Maximum size: + Kilobytes (KB)
    Allowed file extensions: +
    + Recommended: jpg jpeg png gif
    Minimum level to upload:
    +

  • %postname% --- A sanitized version of the title of the post. So "This Is A Great Post!" becomes "this-is-a-great-post" in the URI
  • %post_id% --- The unique ID # of the post, for example 423
    • -

    So for example a value like /archives/%year%/%monthnum%/%day%/%postname%/ could give you a permalink like /archives/2003/05/23/my-cheese-sandwich/ . For this to work you'll need mod_rewrite installed on your server for the rule generation rule to work below. In the future there may be other options.

    +

    So for example a value like

    +

    /archives/%year%/%monthnum%/%day%/%postname%/

    +

    would give you a permalink like

    +

    /archives/2003/05/23/my-cheese-sandwich/ .

    +

    In general for this you must use mod_rewrite, however if you put a filename at the beginning WordPress will attempt to use that to pass the arguments, example:

    +

    /index.php/archives/%year%/%monthnum%/%day%/%postname%/

    +

    If you use this option you can ignore the mod_rewrite rules.

    Use the template tags above to create a virtual site structure:

    @@ -86,14 +92,18 @@ if ('/' != substr($site_root, -1)) $site_root = $site_root . '/'; ?> - +?> + +

    +

    If your .htaccess file is writable by WordPress, you can edit it through your template interface.

    Writing Options
    - + @@ -103,7 +103,16 @@ Advanced controls - +
    When starting a post, show:
    Usual category: 
    diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php index 9d905e9bbe..f2229c2a27 100644 --- a/wp-admin/upgrade-functions.php +++ b/wp-admin/upgrade-functions.php @@ -710,9 +710,14 @@ function upgrade_110() { $wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 1"); $wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 2"); $wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 3"); + $wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 4"); + $wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 5"); $wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 6"); $wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 7"); + $wpdb->query("UPDATE $tableoptiongroups SET group_name = 'Link Manager' WHERE group_id = 8"); + $wpdb->query("UPDATE $tableoptiongroups SET group_name = 'Geo-data' WHERE group_id = 9"); + // Add blog_charset option if(!$wpdb->get_var("SELECT option_id FROM $tableoptions WHERE option_name = 'blog_charset'")) { $wpdb->query("INSERT INTO $tableoptions (option_name, option_type, option_value, option_admin_level) VALUES ('blog_charset', 3, 'utf-8', 8)");