Changeset 1139 for trunk/wp-admin/includes

Timestamp:

10/30/07 16:49:38 (10 months ago)

Author:

donncha

Message:

Merge with WordPress? 2.3.1

Files:

• trunk/wp-admin/includes/plugin.php (modified) (1 diff)
• trunk/wp-admin/includes/post.php (modified) (4 diffs)
• trunk/wp-admin/includes/schema.php (modified) (2 diffs)
• trunk/wp-admin/includes/template.php (modified) (8 diffs)
• trunk/wp-admin/includes/upgrade.php (modified) (1 diff)
• trunk/wp-admin/includes/user.php (modified) (3 diffs)

trunk/wp-admin/includes/plugin.php

@@ -87 +87 @@
-}
-
-function activate_plugin($plugin) {
-                $current = get_option('active_plugins');
-                $plugin = trim($plugin);
-
-                if ( validate_file($plugin) )
-                        return new WP_Error('plugin_invalid', __('Invalid plugin.'));
-                if ( ! file_exists(ABSPATH . PLUGINDIR . '/' . $plugin) )
-                        return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
-
-                if (!in_array($plugin, $current)) {
-                        wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), 'plugins.php?error=true&plugin=' . $plugin)); // we'll override this later if the plugin can be included without fatal error
-                        ob_start();
-                        @include(ABSPATH . PLUGINDIR . '/' . $plugin);
-                        $current[] = $plugin;
-                        sort($current);
-                        update_option('active_plugins', $current);
-                        do_action('activate_' . $plugin);
-                        ob_end_clean();
-                }
-
-                return null;
-}
-
-function deactivate_plugins($plugins) {
-        $current = get_option('active_plugins');
-
-        if(!is_array($plugins))
-                $plugins = array($plugins);
-
-        foreach($plugins as $plugin) {
-                array_splice($current, array_search( $plugin, $current), 1 ); // Array-fu!
-                do_action('deactivate_' . trim( $plugin ));
-        }
-
-        update_option('active_plugins', $current);
-}
-
-function deactivate_all_plugins() {
-        $current = get_option('active_plugins');
-        deactivate_plugins($current);
-}
-
-//
-// Menu

trunk/wp-admin/includes/post.php

@@ -349 +349 @@
-                        return false;
-
-                wp_cache_delete($post_ID, 'post_meta');
-
-                $result = $wpdb->query( "
-                                                INSERT INTO $wpdb->postmeta
@@ -365 +363 @@
-        $mid = (int) $mid;
-
-        $post_id = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_id = '$mid'");
-        wp_cache_delete($post_id, 'post_meta');
-
-        return $wpdb->query( "DELETE FROM $wpdb->postmeta WHERE meta_id = '$mid'" );
-}
@@ -413 +408 @@
-        if ( in_array($mkey, $protected) )
-                return false;
-
-        $post_id = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_id = '$mid'");
-        wp_cache_delete($post_id, 'post_meta');
-
-        $mvalue = maybe_serialize( stripslashes( $mvalue ));
@@ -477 +469 @@
-}
-
-function wp_edit_posts_query( $q = false ) {
-        global $wpdb;
-        if ( false === $q )
-                $q = $_GET;
-        $q['m']   = (int) $q['m'];
-        $q['cat'] = (int) $q['cat'];
-        $post_stati  = array(   //      array( adj, noun )
-                                'draft' => array(__('Draft'), _c('Drafts|manage posts header')),
-                                'future' => array(__('Scheduled'), __('Scheduled posts')),
-                                'pending' => array(__('Pending Review'), __('Pending posts')),
-                                'private' => array(__('Private'), __('Private posts')),
-                                'publish' => array(__('Published'), __('Published posts'))
-                        );
-
-        $avail_post_stati = $wpdb->get_col("SELECT DISTINCT post_status FROM $wpdb->posts WHERE post_type = 'post'");
-
-        $post_status_q = '';
-        $post_status_label = _c('Posts|manage posts header');
-        if ( isset($q['post_status']) && in_array( $q['post_status'], array_keys($post_stati) ) ) {
-                $post_status_label = $post_stati[$q['post_status']][1];
-                $post_status_q = '&post_status=' . $q['post_status'];
-        }
-
-        if ( 'pending' === $q['post_status'] ) {
-                $order = 'ASC';
-                $orderby = 'modified';
-        } elseif ( 'draft' === $q['post_status'] ) {
-                $order = 'DESC';
-                $orderby = 'modified';
-        } else {
-                $order = 'DESC';
-                $orderby = 'date';
-        }
-
-        wp("what_to_show=posts$post_status_q&posts_per_page=20&order=$order&orderby=$orderby");
-
-        return array($post_stati, $avail_post_stati);
-}
-
-?>

trunk/wp-admin/includes/schema.php

@@ -5 +5 @@
-$charset_collate = '';
-
-$wpdb->supports_collation(
+version_compare(mysql_get_server_info(), '4.1.0', '>='
-        if ( ! empty($wpdb->charset) )
-                $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
@@ -335 +335 @@
-
-        // Add roles
-c('Administrator|User role
-c('Editor|User role
-c('Author|User role
-c('Contributor|User role
-c('Subscriber|User role
+_('Administrator
+_('Editor
+_('Author
+_('Contributor
+_('Subscriber
-
-        // Add caps for Administrator role

trunk/wp-admin/includes/template.php

@@ -42 +42 @@
-
-                if ( $category->term_id != $default_cat_id )
-class='delete:the-list:cat-$category->term_id 
+onclick=\"return deleteSomething( 'cat', $category->term_id, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll posts that were only assigned to this category will be assigned to the '%s' category.\nAll links that were only assigned to this category will be assigned to the '%s' category.\n'OK' to delete, 'Cancel' to stop." ), $category->name, get_catname( $default_cat_id ), get_catname( $default_link_cat_id ) )) . "' );\" class='
-                else
-                        $edit .= "<td style='text-align:center'>".__( "Default" );
@@ -165 +165 @@
-}
-
-// define the columns to display, the syntax is 'internal name' => 'display name'
-function wp_manage_posts_columns() {
-        $posts_columns = array();
-        $posts_columns['id'] = '<div style="text-align: center">' . __('ID') . '</div>';
-        if ( 'draft' === $_GET['post_status'] )
-                $posts_columns['modified'] = __('Modified');
-        elseif ( 'pending' === $_GET['post_status'] )
-                $posts_columns['modified'] = __('Submitted');
-        else
-                $posts_columns['date'] = __('When');
-        $posts_columns['title'] = __('Title');
-        $posts_columns['categories'] = __('Categories');
-        if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) )
-                $posts_columns['comments'] = '<div style="text-align: center">' . __('Comments') . '</div>';
-        $posts_columns['author'] = __('Author');
-        $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
-
-        // you can not edit these at the moment
-        $posts_columns['control_view']   = '';
-        $posts_columns['control_edit']   = '';
-        $posts_columns['control_delete'] = '';
-
-        return $posts_columns;
-}
-
-function page_rows( $parent = 0, $level = 0, $pages = 0, $hierarchy = true ) {
-        global $wpdb, $class, $post;
@@ -216 +191 @@
-    <td><?php the_author() ?></td>
-    <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $post->post_modified ); ?></td>
-    
+       
-    <td><?php if ( current_user_can( 'edit_page', $id ) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td>
-:the-list:page-$id delete'
+' onclick=\"return deleteSomething( 'page', " . $id . ", '" . js_escape(sprintf( __("You are about to delete the '%s' page.\n'OK' to delete, 'Cancel' to stop." ), get_the_title() ) ) . "' );\"
-  </tr>
-
@@ -290 +265 @@
-function _wp_comment_list_item( $id, $alt = 0 ) {
-        global $authordata, $comment, $wpdb;
+        $id = (int) $id;
-        $comment =& get_comment( $id );
-        $id = (int) $comment->comment_ID;
-        $class = '';
-        $post = get_post($comment->comment_post_ID);
-        $authordata = get_userdata($post->post_author);
-id
+comment->comment_ID
-        if ( 'unapproved' == $comment_status )
-                $class .= ' unapproved';
-        if ( $alt % 2 )
-                $class .= ' alternate';
-id
-
- class="comment-author"
+comment->comment_ID
+
+
-
-<?php comment_text() ?>
@@ -309 +284 @@
-<?php
-if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-
-
-
+
+
-        if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                </li>
-<?php
@@ -359 +327 @@
-        // Exit if no meta
-        if (!$meta ) {
- class="list:meta"
+
-                return;
-        }
@@ -371 +339 @@
-        </tr>
-        </thead>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        echo "\n\t</tbody>";
-}
-
-function _list_meta_row( $entry, &$count ) {
-        $r = '';
-        ++ $count;
-        if ( $count % 2 )
-                $style = 'alternate';
-        else
-                $style = '';
-        if ('_' == $entry['meta_key'] { 0 } )
-                $style .= ' hidden';
-
-        if ( is_serialized( $entry['meta_value'] ) ) {
-                if ( is_serialized_string( $entry['meta_value'] ) ) {
-                        // this is a serialized string, so we should display it
-                        $entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
-                } else {
-                        // this is a serialized array/object so we should NOT display it
-                        --$count;
-                        return;
-                }
-        }
-
-        $key_js = js_escape( $entry['meta_key'] );
-        $entry['meta_key']   = attribute_escape($entry['meta_key']);
-        $entry['meta_value'] = attribute_escape($entry['meta_value']);
-        $entry['meta_id'] = (int) $entry['meta_id'];
-        $r .= "\n\t<tr id='meta-{$entry['meta_id']}' class='$style'>";
-        $r .= "\n\t\t<td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>";
-        $r .= "\n\t\t<td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>";
-        $r .= "\n\t\t<td align='center'><input name='updatemeta' type='submit' tabindex='6' value='".attribute_escape(__( 'Update' ))."' class='add:the-list:meta-{$entry['meta_id']} updatemeta' /><br />";
-        $r .= "\n\t\t<input name='deletemeta[{$entry['meta_id']}]' type='submit' ";
-        $r .= "class='delete:the-list:meta-{$entry['meta_id']} deletemeta' tabindex='6' value='".attribute_escape(__( 'Delete' ))."' />";
-        $r .= "<input type='hidden' name='_ajax_nonce' value='$nonce' />";
-        $r .= "</td>\n\t</tr>";
-        return $r;
-}
-
@@ -452 +416 @@
-        </tr>
-
-<tr class="submit"><td colspan="3">
-        <?php wp_nonce_field( 'change_meta', '_ajax_nonce', false ); ?>
-        <input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php _e( 'Add Custom Field &raquo;' ) ?>" />
-</td></tr>
-</table>
+<p class="submit"><input type="submit" id="updatemetasub" name="updatemeta" tabindex="9" value="<?php _e( 'Add Custom Field &raquo;' ) ?>" /></p>
-<?php
-

trunk/wp-admin/includes/upgrade.php

@@ -1254 +1254 @@
-
-function wp_check_mysql_version() {
-
-
-
-
+
+
+
+
+
+
-}
-

trunk/wp-admin/includes/user.php

@@ -88 +88 @@
-        } else {
-                if ((empty ( $pass1 ) && !empty ( $pass2 ) ) || (empty ( $pass2 ) && !empty ( $pass1 ) ) )
-'<strong>ERROR</strong>: You entered your new password only once.'
+"<strong>ERROR</strong>: you typed your new password only once."
-        }
-
@@ -97 +97 @@
-        /* checking the password has been typed twice the same */
-        if ( $pass1 != $pass2 )
-enter
+type
-
-        if (!empty ( $pass1 ))
@@ -103 +103 @@
-
-        if ( !$update && !validate_username( $user->user_login ) )
-
+ 
-
-        if (!$update && username_exists( $user->user_login ))
-. P
+, p
-
-        /* checking e-mail address */
-        if ( empty ( $user->user_email ) ) {
-'<strong>ERROR</strong>: Please enter an e-mail address.'
+"<strong>ERROR</strong>: please type an e-mail address"
-        } else
-                if (!is_email( $user->user_email ) ) {
-The e-mail address isn't correct.
+the email address isn't correct
-                }
-