Changeset 310

Timestamp:

09/12/05 09:56:20 (3 years ago)

Author:

donncha

Message:

WP Merge

Files:

• trunk/wp-inst/wp-admin/admin-functions.php (modified) (5 diffs)
• trunk/wp-inst/wp-admin/admin.php (modified) (2 diffs)
• trunk/wp-inst/wp-admin/edit-form-ajax-cat.php (modified) (2 diffs)
• trunk/wp-inst/wp-admin/execute-pings.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/import/rss.php (modified) (4 diffs)
• trunk/wp-inst/wp-admin/link-import.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/list-manipulation.js (modified) (1 diff)
• trunk/wp-inst/wp-admin/options-personal.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/post.php (modified) (1 diff)
• trunk/wp-inst/wp-content/themes/default/archive.php (modified) (2 diffs)
• trunk/wp-inst/wp-includes/capabilities.php (modified) (1 diff)
• trunk/wp-inst/wp-includes/classes.php (modified) (1 diff)
• trunk/wp-inst/wp-includes/functions-post.php (modified) (1 diff)
• trunk/wp-inst/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-inst/wp-includes/template-functions-author.php (modified) (1 diff)
• trunk/wp-inst/wp-includes/template-functions-links.php (modified) (4 diffs)
• trunk/wp-inst/wp-rdf.php (modified) (2 diffs)

trunk/wp-inst/wp-admin/admin-functions.php

@@ -131 +131 @@
-
-        add_meta($post_ID);
+        
+        return $post_ID;
-}
-
@@ -261 +263 @@
-
-        if ( $update ) {
-                $rval = $wpdb->rows_affected;
-                do_action('edit_category', $cat_ID);
-        } else {
-                $rval = $wpdb->insert_id;
-                do_action('create_category', $rval);
-                do_action('add_category', $rval);
@@ -271 +271 @@
-        list( $update, $cat_ID, $category_nicename, $cat_name, $rval ) = apply_filters( "new_category", $update, $cat_ID, $category_nicename, $cat_name, $rval );
-
-rval
+cat_ID
-}
-
@@ -316 +316 @@
-
-        return 1;
+}
+
+function wp_create_category($cat_name) {
+        $cat_array = compact('cat_name');
+        return wp_insert_category($cat_array);
+}
+
+
+function wp_create_categories($categories, $post_id = '') {
+        $cat_ids = array();
+        foreach ($categories as $category) {
+                if ( $id = category_exists($category) )
+                        $cat_ids[] = $id;
+                else if ( $id = wp_create_category($category) )
+                        $cat_ids[] = $id;                               
+        }
+        
+        if ( $post_id )
+                wp_set_post_cats('', $post_id, $cat_ids);
+                
+        return $cat_ids;
+}
+
+function category_exists($cat_name) {
+        global $wpdb;
+        if ( !$category_nicename = sanitize_title($cat_name) )
+                return 0;
+                
+        return $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'");
-}
-
@@ -353 +382 @@
-
-        return true;
+}
+
+
+function post_exists($title, $content = '', $post_date = '') {
+        global $wpdb;
+        
+        if ( !empty($post_date) )
+                $post_date = "AND post_date = '$post_date'";
+
+        if ( ! empty($title) )
+                return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' $post_date");
+        else if ( ! empty($content) )
+                return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' $post_date");
+
+        return 0;
-}
-

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

@@ -75 +75 @@
-        if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
-                die(__('Cannot load importer.'));
-
+
-        include(ABSPATH . "wp-admin/import/$importer.php");
-
@@ -86 +86 @@
-        require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
-
+        define('WP_IMPORTING', true);
+
-        call_user_func($wp_importers[$importer][2]);
-                        

trunk/wp-inst/wp-admin/edit-form-ajax-cat.php

@@ -8 +8 @@
-        die('-1');
-
-function grab_id() {
-        global $new_cat_id;
-        $new_cat_id = func_get_arg(0);
-}
-
-function get_out_now() { exit; }
-
-
-add_action('edit_category', 'grab_id');
-add_action('create_category', 'grab_id');
-add_action('shutdown', 'get_out_now', -1);
-
@@ -24 +16 @@
-if ( !$category_nicename = sanitize_title($cat_name) )
-        die('0');
-$wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'"
+category_exists($cat_name
-        die((string) $already);
-
-$cat_name = $wpdb->escape($cat_name);
-
-
+
-die((string) $new_cat_id);
-?>

trunk/wp-inst/wp-admin/execute-pings.php

@@ -31 +31 @@
-                foreach($trackbacks as $trackback) {
-                        //echo "trackback : $trackback->ID<br/>";
-
+s
-                }
-        }

trunk/wp-inst/wp-admin/import/rss.php

@@ -1 +1 @@
-<?php
+
+// Example:
+// define('RSSFILE', '/home/example/public_html/rss.xml');
+define('RSSFILE', 'rss.xml');
+
-class RSS_Import {
-
-        var $authors = array ();
-        var $posts = array ();
-
@@ -14 +18 @@
-        }
-
+        function unhtmlentities($string) { // From php.net for < 4.3 compat
+                $trans_tbl = get_html_translation_table(HTML_ENTITIES);
+                $trans_tbl = array_flip($trans_tbl);
+                return strtr($string, $trans_tbl);
+        }
+        
-        function greet() {
-
-
-
+
-<p><code>define('RSSFILE', '');</code></p>
-<p>You want to define where the RSS file we'll be working with is, for example: </p>
-<p><code>define('RSSFILE', 'rss.xml');</code></p>
-
-
-
-
-
-
-
+
+
+
-        }
-
-        function get_posts() {
+                global $wpdb;
+                
-                set_magic_quotes_runtime(0);
-                $datalines = file(RSSFILE); // Read the file into an array
@@ -36 +42 @@
-                $importdata = str_replace(array ("\r\n", "\r"), "\n", $importdata);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        function import_posts() {
-                echo '<ol>';
-                foreach ($this->posts as $post)
-                        : $title = $date = $categories = $content = $post_id = '';
-                echo "<li>Importing post... ";
-
-
-
-
+
+
-
-preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $date
+       extract($post
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                $post_date = gmdate('Y-m-d H:i:s', $date);
-
-                preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
-                $categories = $categories[1];
-
-                if (!$categories)
-                        : preg_match_all('|<dc:subject>(.*?)</dc:subject>|is', $post, $categories);
-                $categories = $categories[1];
-                endif;
-
-                preg_match('|<guid.+?>(.*?)</guid>|is', $post, $guid);
-                if ($guid)
-                        $guid = $wpdb->escape(trim($guid[1]));
-                else
-                        $guid = '';
-
-                preg_match('|<content:encoded>(.*?)</content:encoded>|is', $post, $content);
-                $content = str_replace(array ('<![CDATA[', ']]>'), '', $wpdb->escape(trim($content[1])));
-
-                if (!$content)
-                        : // This is for feeds that put content in description
-                        preg_match('|<description>(.*?)</description>|is', $post, $content);
-                $content = $wpdb->escape(unhtmlentities(trim($content[1])));
-                endif;
-
-                // Clean up content
-                $content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $content);
-                $content = str_replace('<br>', '<br />', $content);
-                $content = str_replace('<hr>', '<hr />', $content);
-
-                // This can mess up on posts with no titles, but checking content is much slower
-                // So we do it as a last resort
-                if ('' == $title)
-                        : $dupe = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' AND post_date = '$post_date'");
-                else
-                        : $dupe = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' AND post_date = '$post_date'");
-                endif;
-
-                // Now lets put it in the DB
-                if ($dupe)
-                        : echo 'Post already imported';
-                else
-                        : $wpdb->query("INSERT INTO $wpdb->posts 
-                                        (post_author, post_date, post_date_gmt, post_content, post_title,post_status, comment_status, ping_status, post_name, guid)
-                                        VALUES 
-                                        ('$post_author', '$post_date', DATE_ADD('$post_date', INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE), '$content', '$title', 'publish', '$comment_status', '$ping_status', '$post_name', '$guid')");
-                $post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' AND post_date = '$post_date'");
-                if (!$post_id)
-                        die("couldn't get post ID");
-                if (0 != count($categories))
-                        : foreach ($categories as $post_category)
-                                : $post_category = unhtmlentities($post_category);
-                // See if the category exists yet
-                $cat_id = $wpdb->get_var("SELECT cat_ID from $wpdb->categories WHERE cat_name = '$post_category'");
-                if (!$cat_id && '' != trim($post_category)) {
-                        $cat_nicename = sanitize_title($post_category);
-                        $wpdb->query("INSERT INTO $wpdb->categories (cat_name, category_nicename) VALUES ('$post_category', '$cat_nicename')");
-                        $cat_id = $wpdb->get_var("SELECT cat_ID from $wpdb->categories WHERE cat_name = '$post_category'");
-                }
-                if ('' == trim($post_category))
-                        $cat_id = 1;
-                // Double check it's not there already
-                $exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_id AND category_id = $cat_id");
-
-                if (!$exists) {
-                        $wpdb->query("
-                                                INSERT INTO $wpdb->post2cat
-                                                (post_id, category_id)
-                                                VALUES
-                                                ($post_id, $cat_id)
-                                                ");
-                }
-                endforeach;
-                else
-                        : $exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_id AND category_id = 1");
-                if (!$exists)
-                        $wpdb->query("INSERT INTO $wpdb->post2cat (post_id, category_id) VALUES ($post_id, 1) ");
-                endif;
-                echo 'Done!</li>';
-                endif;
-
-                endforeach;
-                echo '</ol>';
-
-        }
-
-
+
-        function import() {
-
-
-
-
+
+
+
+
+
+
+
-                $this->get_posts();
-                $this->import_posts();
-../
+' . get_option('home') . '
-        }
-
+
-        function dispatch() {
-
+ 
-                        $step = 0;
-                else
-                        $step = (int) $_GET['step'];
+
+                $this->header();
-                
-                switch ($step) {
-
+ 
-                                $this->greet();
-                                break;
-
+ 
-                                $this->import();
-                                break;
-                }
+                
+                $this->footer();
-        }
-
+
-        function RSS_Import() {
-                // Nothing.     
@@ -182 +171 @@
-$rss_import = new RSS_Import();
-
-
-
+
-?>

trunk/wp-inst/wp-admin/link-import.php

@@ -98 +98 @@
-
-                if (isset($opml_url) && $opml_url != '') {
-implode('', file($opml_url)
+wp_remote_fopen($opml_url
-                    include_once('link-parse-opml.php');
-

trunk/wp-inst/wp-admin/list-manipulation.js

@@ -45 +45 @@
-        else if ( 0 == response ) { ajaxDel.myResponseElement.interHTML = "Something odd happened.  Try refreshing the page? Either that or what you tried to delete never existed in the first place."; }
-        else if ( 1 == response ) {
-i
-tem.i
-item.parentNode.removeChild(i
+theI
+
+theItem.parentNode.removeChild(theI
-                var pos = getListPos(id);
-                listItems.splice(pos,1);

trunk/wp-inst/wp-admin/options-personal.php

@@ -11 +11 @@
-<h2><?php _e('Personal Options') ?></h2> 
-<form id="personal-options" method="post" action="options-personal-update.php"> 
+<fieldset>
-<p><?php _e('Personal options are just for you, they don&#8217;t affect other users on blog.'); ?><input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="'rich_editing'<?php do_action('personal_option_list'); ?>" /></p>

trunk/wp-inst/wp-admin/post.php

@@ -93 +93 @@
-
-case 'editpost':
-
+$post_ID = 
-
-        if ($_POST['save']) {

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

@@ -31 +31 @@
-
-                <div class="navigation">
-previous
-next
+next
+previous
-                </div>
-
@@ -51 +51 @@
-
-                <div class="navigation">
-previous
-next
+next
+previous
-                </div>
-        

trunk/wp-inst/wp-includes/capabilities.php

@@ -190 +190 @@
-
-        function remove_cap($cap) {
-role
+cap
-                unset($this->caps[$cap]);
-                update_usermeta($this->id, $this->cap_key, $this->caps);

trunk/wp-inst/wp-includes/classes.php

@@ -1366 +1366 @@
-                                // The requested permalink is in $pathinfo for path info requests and
-                                //  $req_uri for other requests.
-
+ && ($wp_rewrite->index != $pathinfo)
-                                        $request = $pathinfo;
-                                } else {

trunk/wp-inst/wp-includes/functions-post.php

@@ -155 +155 @@
-        if ($post_status == 'publish') {
-                do_action('publish_post', $post_ID);
-
+ && !defined('WP_IMPORTING')
-                        $result = $wpdb->query("
-                                INSERT INTO $wpdb->postmeta 

trunk/wp-inst/wp-includes/functions.php

@@ -371 +371 @@
-// thx Alex Stapleton, http://alex.vort-x.net/blog/
-function add_option($name, $value = '', $description = '', $autoload = 'yes') {
-
+
+
+
+
+
+
-        $original = $value;
-        if ( is_array($value) || is_object($value) )

trunk/wp-inst/wp-includes/template-functions-author.php

@@ -3 +3 @@
-function get_the_author($idmode = '') {
-    global $authordata;
-$authordata->display_name
+apply_filters('the_author', $authordata->display_name)
-}
-

trunk/wp-inst/wp-includes/template-functions-links.php

@@ -180 +180 @@
-
-    $location = get_settings('siteurl') . "/wp-admin/post.php?action=edit&post=$post->ID";
-"$before <a href=\"$location\">$link</a> $after"
+$before . "<a href=\"$location\">$link</a>" . $after
-}
-
@@ -193 +193 @@
-
-    $location = get_settings('siteurl') . "/wp-admin/post.php?action=editcomment&amp;comment=$comment->comment_ID";
-"$before <a href='$location'>$link</a> $after"
+$before . "<a href='$location'>$link</a>" . $after
-}
-
@@ -438 +438 @@
-                                $max_page = $max_num_pages;
-                        } else {
- (.*) GROUP BY#
+\s(.*)\sGROUP BY#siU
-        $fromwhere = $matches[1];
-
+DISTINCT 
-        $max_page = $max_num_pages = ceil($numposts / $posts_per_page);
-                        }
@@ -480 +480 @@
-                if (get_query_var('what_to_show') == 'posts') {
-                        if ( ! isset($max_num_pages) ) {
- (.*) GROUP BY#
+\s(.*)\sGROUP BY#siU
-                                $fromwhere = $matches[1];
-
+DISTINCT 
-                                $max_num_pages = ceil($numposts / $posts_per_page);
-                        }

trunk/wp-inst/wp-rdf.php

@@ -33 +33 @@
-        <items>
-                <rdf:Seq>
-$items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp
+while (have_posts()): the_post
-                        <rdf:li rdf:resource="<?php permalink_single_rss() ?>"/>
-$wp_items[] = $row; $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } }
+endwhile;
-                </rdf:Seq>
-        </items>
-</channel>
-if ($posts) { foreach ($posts as $post) { start_wp
+rewind_posts(); while (have_posts()): the_post
-<item rdf:about="<?php permalink_single_rss() ?>">
-        <title><?php the_title_rss() ?></title>
@@ -54 +54 @@
-        <?php do_action('rdf_item'); ?>
-</item>
-} }
+endwhile;
-</rdf:RDF>