Changeset 1172

Timestamp:

01/02/08 16:00:05 (8 months ago)

Author:

donncha

Message:

Merge with WP 2.3.2

Files:

• trunk/wp-admin/admin.php (modified) (2 diffs)
• trunk/wp-admin/includes/file.php (modified) (1 diff)
• trunk/wp-admin/js/cat.js (modified) (1 diff)
• trunk/wp-admin/js/link-cat.js (modified) (1 diff)
• trunk/wp-admin/setup-config.php (modified) (2 diffs)
• trunk/wp-admin/upload-functions.php (deleted)
• trunk/wp-app.php (modified) (6 diffs)
• trunk/wp-includes/formatting.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (5 diffs)
• trunk/wp-includes/pluggable.php (modified) (1 diff)
• trunk/wp-includes/post.php (modified) (2 diffs)
• trunk/wp-includes/query.php (modified) (2 diffs)
• trunk/wp-includes/taxonomy.php (modified) (2 diffs)
• trunk/wp-includes/version.php (modified) (1 diff)
• trunk/wp-includes/wp-db.php (modified) (8 diffs)
• trunk/wp-mail.php (modified) (3 diffs)
• trunk/wp-settings.php (modified) (4 diffs)
• trunk/xmlrpc.php (modified) (18 diffs)

trunk/wp-admin/admin.php

@@ -1 +1 @@
-<?php
+define('WP_ADMIN', TRUE);
+
-if ( defined('ABSPATH') )
-        require_once( ABSPATH . 'wp-config.php');
@@ -65 +67 @@
-
-                if (! isset($_GET['noheader']))
-/
+
-
-                if ( file_exists(ABSPATH . MUPLUGINDIR . "/$plugin_page") )

trunk/wp-admin/includes/file.php

@@ -44 +44 @@
-
-function validate_file( $file, $allowed_files = '' ) {
+        if ( false !== strpos( $file, '..' ))
+                return 1;
+
-        if ( false !== strpos( $file, './' ))
-                return 1;

trunk/wp-admin/js/cat.js

@@ -10 +10 @@
-        $('catadd').onclick = function() { catList.ajaxAdder('category', 'jaxcat'); };
-}
-

trunk/wp-admin/js/link-cat.js

@@ -9 +9 @@
-        $('catadd').onclick = function() { linkcatList.ajaxAdder('link-category', 'jaxcat'); };
-}
-

trunk/wp-admin/setup-config.php

@@ -5 +5 @@
-require_once('../wp-includes/compat.php');
-require_once('../wp-includes/functions.php');
+require_once('../wp-includes/classes.php');
-
-if (!file_exists('../wp-config-sample.php'))
@@ -163 +164 @@
-        // We'll fail here if the values are no good.
-        require_once('../wp-includes/wp-db.php');
+        if ( !empty($wpdb->error) )
+                wp_die($wpdb->error->get_error_message());
+
-        $handle = fopen('../wp-config.php', 'w');
-

trunk/wp-app.php

@@ -160 +160 @@
-        function get_service() {
-                log_app('function','get_service()');
+
+                if( !current_user_can( 'edit_posts' ) ) 
+                        $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) );
+
-                $entries_url = attribute_escape($this->get_entries_url());
-                $categories_url = attribute_escape($this->get_categories_url());
@@ -189 +193 @@
-
-        function get_categories_xml() {
-
-                log_app('function','get_categories_xml()');
+
+                if( !current_user_can( 'edit_posts' ) ) 
+                        $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) );
+
-                $home = attribute_escape(get_bloginfo_rss('home'));
-
@@ -283 +290 @@
-
-        function get_post($postID) {
-
-                global $entry;
+
+                if( !current_user_can( 'edit_post', $postID ) )
+                        $this->auth_required( __( 'Sorry, you do not have the right to access this post.' ) ); 
+
-                $this->set_current_entry($postID);
-                $output = $this->get_entry($postID);
@@ -373 +383 @@
-
-        function get_attachment($postID = NULL) {
-
-
+
+
+
-                if (!isset($postID)) {
-                        $this->get_attachments();
@@ -495 +506 @@
-
-                $location = get_post_meta($entry['ID'], '_wp_attached_file', true);
+                $filetype = wp_check_filetype($location);
+
+                if(!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']))
+                        $this->internal_error(__('Error ocurred while accessing post metadata for file location.'));
-
-                // delete file
@@ -796 +811 @@
-        <author>
-                <name><?php the_author()?></name>
-                <email><?php the_author_email()?></email>
-<?php if (get_the_author_url() && get_the_author_url() != 'http://') { ?>
-                <uri><?php the_author_url()?></uri>

trunk/wp-includes/formatting.php

@@ -623 +623 @@
-}
-
+function _make_url_clickable_cb($matches) {
+        $url = $matches[2];
+        $url = clean_url($url);
+        if ( empty($url) )
+                return $matches[0];
+        return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>";
+}
+
+function _make_web_ftp_clickable_cb($matches) {
+        $dest = $matches[2];
+        $dest = 'http://' . $dest;
+        $dest = clean_url($dest);
+        if ( empty($dest) )
+                return $matches[0];
+
+        return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>";
+}
+
+function _make_email_clickable_cb($matches) {
+        $email = $matches[2] . '@' . $matches[3];
+        return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+}
+
-function make_clickable($ret) {
-        $ret = ' ' . $ret;
-        // in testing, using arrays here was found to be faster
-
-
-
-
-
-
-
-
-
+
+
+
-        // this one is not in an array because we need it to run last, for cleanup of accidental links within links
-        $ret = preg_replace("#(<a( [^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i", "$1$3</a>", $ret);

trunk/wp-includes/functions.php

@@ -205 +205 @@
-                if ( false === $value ) {
-                        if ( defined('WP_INSTALLING') )
-
+show = $
-                        $row = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1");
-                        if ( defined('WP_INSTALLING') )
-
+$show
-
-                        if( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
@@ -243 +243 @@
-function get_alloptions() {
-        global $wpdb, $wp_queries;
-
+show = $
-        if ( !$options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'") ) {
-                $options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
-        }
-
+$show
-
-        foreach ($options as $option) {
@@ -270 +270 @@
-
-        if ( !$alloptions ) {
-
+show = $
-                if ( !$alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'") )
-                        $alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
-
+$show
-                $alloptions = array();
-                foreach ( (array) $alloptions_db as $o )
@@ -900 +900 @@
-function is_blog_installed() {
-        global $wpdb;
-
+show = $
-        $installed = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
-
+$show
-
-        $install_status = !empty( $installed ) ? TRUE : FALSE;
@@ -1427 +1427 @@
-}
-
+function dead_db() {
+        global $wpdb;
+
+        // Load custom DB error template, if present.
+        if ( file_exists( ABSPATH . 'wp-content/db-error.php' ) ) {
+                require_once( ABSPATH . 'wp-content/db-error.php' );
+                die();
+        }
+
+        // If installing or in the admin, provide the verbose message.
+        if ( defined('WP_INSTALLING') || defined('WP_ADMIN') )
+                wp_die($wpdb->error);
+
+        // Otherwise, be terse.
+        status_header( 500 );
+        nocache_headers();
+        header( 'Content-Type: text/html; charset=utf-8' );
-?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) ) language_attributes(); ?>>
+<head>
+        <title>Database Error</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+</head>
+<body>
+        <h1>Error establishing a database connection</h1>
+</body>
+</html>
+<?php
+        die();
+}
+
+?>

trunk/wp-includes/pluggable.php

@@ -80 +80 @@
-                return false;
-
-
+show = $
-        $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user_id'");
-
+$show
-
-        if ($metavalues) {

trunk/wp-includes/post.php

@@ -429 +429 @@
-
-function sanitize_post($post, $context = 'display') {
+
+        if ( 'raw' == $context )
+                return $post;
+
-        // TODO: Use array keys instead of hard coded list
-        $fields = array('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_date', 'post_date_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'post_category');
@@ -1140 +1144 @@
-                $meta_key = '';
-                $meta_value = '';
+                $hierarchical = false;
-                $incpages = preg_split('/[\s,]+/',$include);
-                if ( count($incpages) ) {

trunk/wp-includes/query.php

@@ -33 +33 @@
-
-function is_admin () {
-global $wp_query;
-
-($wp_query->is_admin || (stripos($_SERVER['REQUEST_URI'], 'wp-admin/') !== false))
+if ( defined('WP_ADMIN') ) 
+
+false
-}
-
@@ -643 +643 @@
-                        $this->is_preview = true;
-
-strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false
+is_admin()
-                        $this->is_admin = true;
-

trunk/wp-includes/taxonomy.php

@@ -664 +664 @@
- */
-function sanitize_term($term, $taxonomy, $context = 'display') {
+
+        if ( 'raw' == $context )
+                return $term;
+
-        $fields = array('term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group');
-
@@ -934 +938 @@
-                } else {
-                        // The alias isn't in a group, so let's create a new one and firstly add the alias term to it.
-
- $wpdb->prepare( "UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $alias->term_id ) 
+ GROUP BY term_group
+"UPDATE $wpdb->terms SET term_group = $term_group WHERE term_id = $alias->term_id"
-                }
-        }

trunk/wp-includes/version.php

@@ -3 +3 @@
-// This holds the version number in a separate file so we can bump it without cluttering the SVN
-
-1
-
+2
+.1
-$wp_db_version = 6124;
-

trunk/wp-includes/wp-db.php

@@ -16 +16 @@
-class wpdb {
-
-tru
+fals
-        var $num_queries = 0;
-        var $last_query;
-        var $col_info;
-        var $queries;
+        var $ready = false;
-
-        // Our tables
@@ -59 +60 @@
-                register_shutdown_function(array(&$this, "__destruct"));
-
+                if ( defined('WP_DEBUG') and WP_DEBUG == true )
+                        $this->show_errors();
+
-                $this->charset = 'utf8';
-                $this->collete = 'utf8';
@@ -80 +84 @@
-<p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
-");
-
+
+
+
+
-
-                if ( !empty($this->charset) && version_compare(mysql_get_server_info(), '4.1.0', '>=') )
@@ -98 +105 @@
-        function select($db, &$dbh) {
-                if (!@mysql_select_db($db, $dbh)) {
+                        $this->ready = false;
-                        $this->bail("
-<h1>Can&#8217;t select database</h1>
@@ -106 +114 @@
-</ul>
-<p>If you don't know how to setup a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>");
+                        return;
-                }
-        }
@@ -175 +184 @@
-        //      Turn error handling on or off..
-
-
-
+
+
+
+
-        }
-
-        function hide_errors() {
+                $show = $this->show_errors;
-                $this->show_errors = false;
+                return $show;
-        }
-
@@ -232 +245 @@
-
-        function query($query) {
+                if ( ! $this->ready )
+                        return false;
+
-                // filter the query, if filters are available
-                // NOTE: some queries are made before the plugins have been loaded, and thus cannot be filtered with this method
@@ -471 +487 @@
-         */
-        function bail($message) { // Just wraps errors in a nice header and footer
-
+
+
+
+
+
-                        return false;
+                }
-                wp_die($message);
-        }

trunk/wp-mail.php

@@ -13 +13 @@
-
-if (!$pop3->connect(get_option('mailserver_url'), get_option('mailserver_port')))
-$pop3->ERROR
+wp_specialchars($pop3->ERROR)
-
-$count = $pop3->login(get_option('mailserver_login'), get_option('mailserver_pass'));
@@ -130 +130 @@
-        $content[1] ? $content = $content[1] : $content = $content[0];
-
-        echo "<p><b>Content-type:</b> $content_type, <b>Content-Transfer-Encoding:</b> $content_transfer_encoding, <b>boundary:</b> $boundary</p>\n";
-        echo "<p><b>Raw content:</b><br /><pre>".$content.'</pre></p>';
-
-        $content = trim($content);
-
@@ -162 +159 @@
-        do_action('publish_phone', $post_ID);
-
-
-
-
+
+
-
-        if(!$pop3->delete($i)) {
-$pop3->ERROR
+wp_specialchars($pop3->ERROR)
-                $pop3->reset();
-                exit;

trunk/wp-settings.php

@@ -131 +131 @@
-        require_once (ABSPATH . WPINC . '/wp-db.php');
-
+if ( !empty($wpdb->error) )
+        dead_db();
+
-// $table_prefix is deprecated as of 2.1
-$wpdb->prefix = $wpdb->base_prefix = $table_prefix;
@@ -138 +141 @@
-
-// Table names
+$wpdb->usermeta       = $wpdb->prefix . 'usermeta';
-$wpdb->blogs            = $wpdb->prefix . 'blogs';
-$wpdb->site             = $wpdb->prefix . 'site';
@@ -146 +150 @@
-$wpdb->blog_versions    = $wpdb->prefix . 'blog_versions';
-$wpdb->users            = $wpdb->prefix . 'users';
-$wpdb->usermeta         = $wpdb->prefix . 'usermeta';
-
-if( defined( 'SUNRISE' ) )
@@ -172 +175 @@
-if ( defined('CUSTOM_USER_META_TABLE') )
-        $wpdb->usermeta = CUSTOM_USER_META_TABLE;
-
-// To be removed in 2.2
-$tableposts = $tableusers = $tablecategories = $tablepost2cat = $tablecomments = $tablelink2cat = $tablelinks = $tablelinkcategories = $tableoptions = $tablepostmeta = '';
-
-if ( file_exists(ABSPATH . 'wp-content/object-cache.php') )

trunk/xmlrpc.php

@@ -187 +187 @@
-                        return($this->error);
-                }
+
+                set_current_user( 0, $username );
+                if( !current_user_can( 'edit_page', $page_id ) )
+                        return new IXR_Error( 401, __( 'Sorry, you can not edit this page.' ) );
+
+                do_action('xmlrpc_call', 'wp.getPage');
-
-                // Lookup page info.
@@ -269 +275 @@
-                }
-
+                set_current_user( 0, $username );
+                if( !current_user_can( 'edit_pages' ) )
+                        return new IXR_Error( 401, __( 'Sorry, you can not edit pages.' ) );
+
+                do_action('xmlrpc_call', 'wp.getPages');
+
-                // Lookup info on pages.
-                $pages = get_pages();
@@ -427 +439 @@
-                }
-
+                set_current_user( 0, $username );
+                if( !current_user_can( 'edit_pages' ) )
+                        return new IXR_Error( 401, __( 'Sorry, you can not edit pages.' ) );
+
+                do_action('xmlrpc_call', 'wp.getPageList');
+
-                // Get list of pages ids and titles
-                $page_list = $wpdb->get_results("
@@ -460 +478 @@
-         */
-        function wp_getAuthors($args) {
-                global $wpdb;
-
-                $this->escape($args);
@@ -472 +489 @@
-                }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -494 +527 @@
-                // allowed to add a category.
-                set_current_user(0, $username);
-, $page_id
+
-                        return(new IXR_Error(401, __("Sorry, you do not have the right to add a category.")));
-                }
@@ -548 +581 @@
-                }
-
+                set_current_user(0, $username);
+                if( !current_user_can( 'edit_posts' ) ) 
+                        return new IXR_Error( 401, __( 'Sorry, you must be able to publish to this blog in order to view categories.' ) );
+
+                do_action('xmlrpc_call', 'wp.suggestCategories');
+
-                $args = array('get' => 'all', 'number' => $max_results, 'name__like' => $category);
-                $category_suggestions = get_categories($args);
@@ -611 +650 @@
-                }
-
+                set_current_user( 0, $user_login );
+                if( !current_user_can( 'edit_posts' ) ) 
+                        return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this blog.' ) );
+
+                do_action('xmlrpc_call', 'blogger.getUserInfo');
+
-                $user_data = get_userdatabylogin($user_login);
-
@@ -617 +662 @@
-                        'userid'    => $user_data->ID,
-                        'url'       => $user_data->user_url,
-                        'email'     => $user_data->user_email,
-                        'lastname'  => $user_data->last_name,
-                        'firstname' => $user_data->first_name
@@ -639 +683 @@
-                }
-
-
+
+
+
+
+
+
-                $post_data = wp_get_single_post($post_ID, ARRAY_A);
-
@@ -677 +726 @@
-                $posts_list = wp_get_recent_posts($num_posts);
-
+                set_current_user( 0, $user_login );
+
-                if (!$posts_list) {
-                        $this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
@@ -683 +734 @@
-
-                foreach ($posts_list as $entry) {
+                        if( !current_user_can( 'edit_post', $entry['ID'] ) )
+                                continue;
-
-                        $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
@@ -1342 +1395 @@
-        function mw_getPost($args) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        }
-
@@ -1438 +1496 @@
-                }
-
+                set_current_user( 0, $user_login );
+
-                foreach ($posts_list as $entry) {
+                        if( !current_user_can( 'edit_post', $entry['ID'] ) )
+                                continue;
-
-                        $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
@@ -1518 +1580 @@
-                }
-
+                set_current_user( 0, $user_login );
+                if( !current_user_can( 'edit_posts' ) )
+                        return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) );
+
+                do_action('xmlrpc_call', 'metaWeblog.getCategories');
+
-                $categories_struct = array();
-
@@ -1637 +1705 @@
-                }
-
+                set_current_user( 0, $user_login );
+
-                foreach ($posts_list as $entry) {
+                        if( !current_user_can( 'edit_post', $entry['ID'] ) ) 
+                                continue;
-
-                        $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
@@ -1676 +1748 @@
-                }
-
+                set_current_user( 0, $user_login );
+                if( !current_user_can( 'edit_posts' ) )
+                        return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) );
+
+                do_action('xmlrpc_call', 'mt.getCategoryList');
+
-                $categories_struct = array();
-
-                // FIXME: can we avoid using direct SQL there?
-                if ( $cats = get_categories('hide_empty=0&hierarchical=0') ) {
-                        foreach ($cats as $cat) {
@@ -1704 +1781 @@
-                        return $this->error;
-                }
+
+                set_current_user( 0, $user_login );
+                if( !current_user_can( 'edit_post', $post_ID ) )
+                        return new IXR_Error( 401, __( 'Sorry, you can not edit this post.' ) );
+
+                do_action('xmlrpc_call', 'mt.getPostCategories');
-
-                $categories = array();