Changeset 447

Show
Ignore:
Timestamp:
11/25/05 11:27:27 (3 years ago)
Author:
donncha
Message:

WP Merge

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/htaccess.dist

    r333 r447  
    1010### 
    1111RewriteRule ^([_0-9a-zA-Z-]+)/templates/(.*)                    BASE/wp-inst/wp-content/blogs/$1/templates/$2 [L] 
    12 RewriteRule ^([_0-9a-zA-Z-]+)/files/(.*)                       BASE/wp-inst/wp-content/blogs/$1/files/$2 [L] 
    13 RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/blogs/(.*)/files/(.*)  BASE/wp-inst/wp-content/blogs/$1/files/$3 [L] 
     12RewriteRule ^([_0-9a-zA-Z-]+)/files/(.*)                       BASE/wp-inst/wp-content/blogs.php?file=$1 [L] 
     13RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/blogs/(.*)/files/(.*)  BASE/wp-inst/wp-content/blogs.php?file=$3 [L] 
    1414RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/themes/(.*)            BASE/wp-inst/wp-content/themes/$2 [L] 
    1515RewriteRule ^wp-content/themes/(.*)             BASE/wp-inst/wp-content/themes/$1 [L] 

  • trunk/wp-inst/wp-admin/admin-header.php

    r442 r447  
    115115<script type="text/javascript" src="../wp-includes/js/dbx-key.js"></script> 
    116116 
    117 <?php if ( current_user_can('manage_categories') ) : ?> 
     117<?php if ( isset($editing) && current_user_can('manage_categories') ) : ?> 
    118118<style type="text/css"> 
    119119#newcat { width: 120px; margin-right: 5px; } 
    …… 
    331331        return fixedExplode; 
    332332} 
    333  
    334333</script> 
    335334<?php endif; ?> 

  • trunk/wp-inst/wp-admin/options-misc.php

    r439 r447  
    1313<h2><?php _e('Miscellaneous Options') ?></h2>  
    1414<form method="post" action="options.php">  
    15 <fieldset class="options"> 
    16 <legend> 
    17 <input name="use_fileupload" type="checkbox" id="use_fileupload" value="1" <?php checked('1', get_settings('use_fileupload')); ?> /> 
    18 <label for="use_fileupload"><?php _e('Allow File Uploads') ?></label></legend> 
    19 <table width="100%" cellspacing="2" cellpadding="5" class="editform">  
    20 <tr>  
    21 <th width="33%" valign="top" scope="row"><?php _e('Destination directory:') ?> </th>  
    22 <td> 
    23 <input name="fileupload_realpath" type="text" id="fileupload_realpath" value="<?php form_option('fileupload_realpath'); ?>" size="50" /><br /> 
    24 <?php printf(__('Recommended: <code>%s</code>'), ABSPATH . 'wp-content') ?> 
    25  
    26 </td>  
    27 </tr>  
    28 <tr> 
    29 <th valign="top" scope="row"><?php _e('URI of this directory:') ?> </th> 
    30 <td>           
    31 <input name="fileupload_url" type="text" id="fileupload_url" value="<?php form_option('fileupload_url'); ?>" size="50" /><br /> 
    32 <?php printf(__('Recommended: <code>%s</code>'), get_settings('siteurl') . '/wp-content') ?> 
    33 </td> 
    34 </tr> 
    35 <tr> 
    36 <th scope="row"><?php _e('Maximum size:') ?> </th> 
    37 <td><input name="fileupload_maxk" type="text" id="fileupload_maxk" value="<?php form_option('fileupload_maxk'); ?>" size="4" />  
    38 <?php _e('Kilobytes (KB)') ?></td> 
    39 </tr> 
    40 <tr> 
    41 <th valign="top" scope="row"><?php _e('Allowed file extensions:') ?></th> 
    42 <td><input name="fileupload_allowedtypes" type="text" id="fileupload_allowedtypes" value="<?php form_option('fileupload_allowedtypes'); ?>" size="40" /> 
    43 <br /> 
    44 <?php _e('Recommended: <code>jpg jpeg png gif</code>') ?></td> 
    45 </tr> 
    46 <tr> 
    47 <th scope="row"><?php _e('Minimum level to upload:') ?></th> 
    48 <td><select name="fileupload_minlevel" id="fileupload_minlevel"> 
    49 <?php 
    50 for ($i = 1; $i < 11; $i++) { 
    51 if ($i == get_settings('fileupload_minlevel')) $selected = " selected='selected'"; 
    52 else $selected = ''; 
    53 echo "\n\t<option value='$i' $selected>$i</option>"; 
    54 } 
    55 ?> 
    56 </select></td> 
    57 </tr> 
    58 </table>  
    59 </fieldset> 
    6015<p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_settings('use_linksupdate')); ?> /> 
    6116<label for="use_linksupdate"><?php _e('Track Links&#8217; Update Times') ?></label></p> 
    …… 
    6520<p class="submit"> 
    6621<input type="hidden" name="action" value="update" /> 
    67 <input type="hidden" name="page_options" value="hack_file,use_fileupload,fileupload_realpath,fileupload_url,fileupload_allowedtypes,fileupload_maxk,fileupload_maxk,fileupload_minlevel,use_geo_positions,use_linksupdate" />  
     22<input type="hidden" name="page_options" value="hack_file,use_linksupdate" />  
    6823        <input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" /> 
    6924</p> 

  • trunk/wp-inst/wp-admin/setup-config.php

    r401 r447  
    106106         
    107107        case 2: 
    108         $dbname = $_POST['dbname']; 
    109     $uname = $_POST['uname']; 
    110     $passwrd = $_POST['pwd']; 
    111     $dbhost = $_POST['dbhost']; 
    112         $prefix = $_POST['prefix']; 
     108        $dbname = trim($_POST['dbname']); 
     109    $uname   = trim($_POST['uname']); 
     110    $passwrd = trim($_POST['pwd']); 
     111    $dbhost = trim($_POST['dbhost']); 
     112        $prefix = trim($_POST['prefix']); 
    113113        if (empty($prefix)) $prefix = 'wp_'; 
    114114 

  • trunk/wp-inst/wp-admin/upgrade-schema.php

    r445 r447  
    208208        add_option('rss_excerpt_length', 50); 
    209209        add_option('rss_use_excerpt', 0); 
    210         add_option('use_fileupload', 1); 
    211         add_option('fileupload_realpath', ABSPATH . 'wp-content/blogs.dir/'.$wpdb->blogid.'/files'); 
    212         add_option('fileupload_url', get_option('siteurl') . '/files'); 
    213         add_option('fileupload_allowedtypes', 'jpg jpeg gif png'); 
    214         add_option('fileupload_maxk', 300); 
    215         add_option('fileupload_minlevel', 6); 
    216210        add_option('mailserver_url', 'mail.example.com'); 
    217211        add_option('mailserver_login', 'login@example.com');