Changeset 1667

Timestamp:

09/16/2004 10:26:39 AM (21 years ago)

Author:

saxmatt

Message:

More new_users_can_blog fixes, including to the registration form and resolution to ​http://mosquito.wordpress.org/bug_view_page.php?bug_id=0000280

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-register.php (modified) (1 diff)

trunk/wp-admin/edit-form-advanced.php

@@ -67 +67 @@
       <legend><a href="http://wordpress.org/docs/reference/post/#post_status" title="<?php _e('Help on post status') ?>"><?php _e('Post Status') ?></a></legend>
       <div>
-<?php if ( 2 == get_option('new_users_can_blog') && 1 != $user_level ) : ?>
+<?php if ( 1 < $user_level || (1 == $user_level && 2 == get_option('new_users_can_blog')) ) : ?>
 <label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post_status, 'publish'); ?> /> <?php _e('Publish') ?></label>
 <?php endif; ?>
@@ -125 +125 @@
 if ('publish' != $post_status || 0 == $post_ID) {
 ?>
-<?php if ( 2 == get_option('new_users_can_blog') && 1 != $user_level ) : ?>
+<?php if ( 1 < $user_level || (1 == $user_level && 2 == get_option('new_users_can_blog')) ) : ?>
     <input name="publish" type="submit" id="publish" tabindex="10" value="<?php _e('Publish') ?>" /> 
 <?php endif; ?>

trunk/wp-register.php

@@ -86 +86 @@
     $user_nicename = sanitize_title($user_nickname);
     $now = gmdate('Y-m-d H:i:s');
-    $new_users_can_blog = get_settings('new_users_can_blog');
+    if (get_settings('new_users_can_blog') >= 1) $user_level = 1;
 
     $result = $wpdb->query("INSERT INTO $wpdb->users 
         (user_login, user_pass, user_nickname, user_email, user_ip, user_browser, dateYMDhour, user_level, user_idmode, user_nicename)
     VALUES 
-        ('$user_login', MD5('$pass1'), '$user_nickname', '$user_email', '$user_ip', '$user_browser', '$now', '$new_users_can_blog', 'nickname', '$user_nicename')");
+        ('$user_login', MD5('$pass1'), '$user_nickname', '$user_email', '$user_ip', '$user_browser', '$now', '$user_level', 'nickname', '$user_nicename')");
     
     if ($result == false) {