Changeset 934

Timestamp:

03/26/07 11:04:22 (2 years ago)

Author:

donncha

Message:

WP Merge to rev 5109

Files:

• trunk/wp-admin/edit.php (modified) (1 diff)
• trunk/wp-admin/upgrade-functions.php (modified) (1 diff)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-content/themes/default/archive.php (modified) (1 diff)
• trunk/wp-includes/comment-template.php (modified) (1 diff)
• trunk/wp-includes/default-filters.php (modified) (1 diff)
• trunk/wp-includes/formatting.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (2 diffs)
• trunk/wp-includes/general-template.php (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce_gzip.php (modified) (2 diffs)
• trunk/wp-includes/script-loader.php (modified) (1 diff)
• trunk/wp-includes/template-loader.php (modified) (2 diffs)
• trunk/xmlrpc.php (modified) (4 diffs)

trunk/wp-admin/edit.php

@@ -65 +65 @@
-} else {
-        if ( is_single() )
-$post->post_title
+apply_filters( "the_title", $post->post_title)
-        elseif ( ! is_paged() || get_query_var('paged') == 1 )
-                _e('Last 15 Posts');

trunk/wp-admin/upgrade-functions.php

@@ -22 +22 @@
-        update_option('blog_public', $public);
-        $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-
+
+
+
+
+
+
-        update_option('siteurl', $guessurl);
-

trunk/wp-admin/wp-admin.css

@@ -489 +489 @@
-        list-style: none;
-        text-align: center;
+        white-space: nowrap;
-}
-

trunk/wp-content/themes/default/archive.php

@@ -7 +7 @@
-                 <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
-<?php /* If this is a category archive */ if (is_category()) { ?>
-echo 
+
-
-          <?php /* If this is a daily archive */ } elseif (is_day()) { ?>

trunk/wp-includes/comment-template.php

@@ -162 +162 @@
-}
-
-number
+deprecated
-        global $id;
-        $number = get_comments_number($id);

trunk/wp-includes/default-filters.php

@@ -146 +146 @@
-add_filter('option_ping_sites', 'privacy_ping_filter');
-add_filter('option_blog_charset', 'wp_specialchars');
+add_filter('option_home', '_config_wp_home');
+add_filter('option_siteurl', '_config_wp_siteurl');
-add_filter('mce_plugins', '_mce_load_rtl_plugin');
-add_filter('mce_buttons', '_mce_add_direction_buttons');

trunk/wp-includes/formatting.php

@@ -1075 +1075 @@
-        // Append http unless a relative link starting with / or a php file.
-        if ( strpos($url, '://') === false &&
-
+?\
-                $url = 'http://' . $url;
-        
-        $url = (strpos($url, '://') === false && substr( $url, 0, 1 ) != '/' ) ? 'http://'.$url : $url;
-        $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url);
-        if ( !is_array($protocols) )

trunk/wp-includes/functions.php

@@ -1013 +1013 @@
-        $installed = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
-        $wpdb->show_errors();
-
+
+
+
-}
-
@@ -1369 +1371 @@
-<?php
-        die();
+}
+
+function _config_wp_home($url = '') {
+        if ( defined( 'WP_HOME' ) ) 
+                return WP_HOME;
+        else return $url;
+}
+
+function _config_wp_siteurl($url = '') {
+        if ( defined( 'WP_SITEURL' ) ) 
+                return WP_SITEURL;
+        else return $url;
-}
-

trunk/wp-includes/general-template.php

@@ -202 +202 @@
-                $my_year = substr($m, 0, 4);
-                $my_month = $wp_locale->get_month($m);
-
+
+
-        }
-

trunk/wp-includes/js/tinymce/tiny_mce_gzip.php

@@ -1 +1 @@
-<?php
-/**
-
-
-
+
- *
- * @version 1.08
- * @author Moxiecode
- * @copyright Copyright  2005-2006, Moxiecode Systems AB, All rights reserved.
@@ -14 +11 @@
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $diskCache = false;
+        $isJS = true;
+        $suffix = '';
+
+        // Headers
+        header("Content-Type: text/javascript; charset=" . get_bloginfo('charset'));
+        header("Vary: Accept-Encoding");  // Handle proxies
+        header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT");
+
+        // Is called directly then auto init with default settings
+        if (!$isJS) {
+                echo getFileContents("tiny_mce_gzip.js");
+                echo "tinyMCE_GZ.init({});";
+                die();
+        }
+
+        // Setup cache info
+        if ($diskCache) {
+                if (!$cachePath)
+                        die("alert('Real path failed.');");
+
+                $cacheKey = getParam("plugins", "") . getParam("languages", "") . getParam("themes", "");
+
+                foreach ($custom as $file)
+                        $cacheKey .= $file;
+
+                $cacheKey = md5($cacheKey);
+
+                if ($compress)
+                        $cacheFile = $cachePath . "/tiny_mce_" . $cacheKey . ".gz";
+                else
+                        $cacheFile = $cachePath . "/tiny_mce_" . $cacheKey . ".js";
+        }
+
+        // Check if it supports gzip
+        if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+                $encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
+
+        if ((in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) {
+                $enc = in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
+                $supportsGzip = true;
+        }
+
+        // Use cached file disk cache
+        if ($diskCache && $supportsGzip && file_exists($cacheFile)) {
+                if ($compress)
+                        header("Content-Encoding: " . $enc);
+
+                echo getFileContents($cacheFile);
+                die();
+        }
-
-if ($index > -1) {
-        // Write main script and patch some things
-
-
-
-
+
+
+
+
+
-        } else
-
-
+
+
+
+
+
-        // Do init based on index
-TinyMCE_echo("tinyMCE.init(tinyMCECompressed.configs[" . $index . "]);")
+$content .= "tinyMCE.init(tinyMCECompressed.configs[" . $index . "]);"
-
-        // Load external plugins
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        foreach ($plugins as $plugin) {
-pluginFile = realpath
-
-
-if ($pluginFile)
-               TinyMCE_echo(file_get_contents($pluginFile));
-
-       /* WP if ($languageFile) WP */
-               TinyMCE_echo(wp_tinymce_lang("plugins/" . $plugin . "/langs/%s.js")); // WP
-}
+content .= getFileContents
+
+
+       $content .= getFileContents("plugins/" . $plugin . "/langs/" . $lang . ".js");
+}
+
+// Add custom files
+foreach ($custom as $file)
+       $content .= getFileContents($file);
-
-        // Reset tinyMCE compressor engine
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if ($fp) {
-acheData
+ontent
-                        fclose($fp);
-                }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-?>
-

trunk/wp-includes/script-loader.php

@@ -16 +16 @@
-                $this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3517' );
-                $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
-124
+325
-                $mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php');
-                $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20070225' );

trunk/wp-includes/template-loader.php

@@ -4 +4 @@
-        if ( is_robots() ) {
-                do_action('do_robots');
-exit
+return
-        } else if ( is_feed() ) {
-                do_feed();
-exit
+return
-        } else if ( is_trackback() ) {
-                include(ABSPATH . '/wp-trackback.php');
-exit
+return
-        } else if ( is_404() && $template = get_404_template() ) {
-                include($template);
-exit
+return
-        } else if ( is_search() && $template = get_search_template() ) {
-                include($template);
-exit
+return
-        } else if ( is_home() && $template = get_home_template() ) {
-                include($template);
-exit
+return
-        } else if ( is_attachment() && $template = get_attachment_template() ) {
-                include($template);
-exit
+return
-        } else if ( is_single() && $template = get_single_template() ) {
-                if ( is_attachment() )
-                        add_filter('the_content', 'prepend_attachment');
-                include($template);
-exit
+return
-        } else if ( is_page() && $template = get_page_template() ) {
-                if ( is_attachment() )
-                        add_filter('the_content', 'prepend_attachment');
-                include($template);
-exit
+return
-        } else if ( is_category() && $template = get_category_template()) {
-                include($template);
-exit
+return
-        } else if ( is_author() && $template = get_author_template() ) {
-                include($template);
-exit
+return
-        } else if ( is_date() && $template = get_date_template() ) {
-                include($template);
-exit
+return
-        } else if ( is_archive() && $template = get_archive_template() ) {
-                include($template);
-exit
+return
-        } else if ( is_comments_popup() && $template = get_comments_popup_template() ) {
-                include($template);
-exit
+return
-        } else if ( is_paged() && $template = get_paged_template() ) {
-                include($template);
-exit
+return
-        } else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
-                if ( is_attachment() )
-                        add_filter('the_content', 'prepend_attachment');
-                include(TEMPLATEPATH . "/index.php");
-exit
+return
-        }
-} else {
@@ -61 +61 @@
-        if ( is_robots() ) {
-                do_action('do_robots');
-exit
+return
-        } else if ( is_feed() ) {
-                do_feed();
-exit
+return
-        } else if ( is_trackback() ) {
-                include(ABSPATH . '/wp-trackback.php');
-exit
+return
-        }
-}

trunk/xmlrpc.php

@@ -262 +262 @@
-
-                // Lookup info on pages.
-                $pages = array();
-                $pages = get_pages();
-                $num_pages = count($pages);
@@ -281 +280 @@
-                // If no pages were found return an error.
-                else {
-new IXR_Error(404, "Sorry, no pages were found."
+array(
-                }
-        }
@@ -1101 +1100 @@
-
-          $postdata = wp_get_single_post($post_ID, ARRAY_A);
+
+                // If there is no post data for the give post id, stop
+                // now and return an error.  Other wise a new post will be
+                // created (which was the old behavior).
+                if(empty($postdata["ID"])) {
+                        return(new IXR_Error(404, "Invalid post id."));
+                }
+
-          extract($postdata);
-                $this->escape($postdata);
@@ -1616 +1623 @@
-                 support per-post text filters yet */
-        function mt_supportedTextFilters($args) {
-rray(
+pply_filters('xmlrpc_text_filters', array()
-        }
-