Changeset 873

Timestamp:

01/30/07 17:46:07 (2 years ago)

Author:

donncha

Message:

WP Merge to rev 3834 and reverted to novalueindb option code

Files:

• trunk/wp-admin/custom-header.php (modified) (1 diff)
• trunk/wp-admin/options-reading.php (modified) (4 diffs)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-includes/capabilities.php (modified) (2 diffs)
• trunk/wp-includes/cron.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (5 diffs)
• trunk/wp-includes/js/interface.js (added)
• trunk/wp-includes/js/jquery-latest.pack.js (added)
• trunk/wp-includes/post.php (modified) (2 diffs)
• trunk/xmlrpc.php (modified) (11 diffs)

trunk/wp-admin/custom-header.php

@@ -224 +224 @@
-                if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) {
-                        set_theme_mod('header_image', $url);
-header
+file, $id
-                        return $this->finished();
-                } elseif ( $width > HEADER_IMAGE_WIDTH ) {
-                        $oitar = $width / HEADER_IMAGE_WIDTH;
-                        $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-
+, $id
-
-                        $url = str_replace(basename($url), basename($image), $url);

trunk/wp-admin/options-reading.php

@@ -51 +51 @@
-</div>
-<?php endif; ?>
-</fieldset>
-</td> 
-</tr> 
@@ -65 +64 @@
-<td>
-<input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> <?php _e('posts') ?>
-</select>
-</td> 
-</tr> 
@@ -83 +81 @@
-<p><label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>     /> <?php _e('Full text') ?></label><br />
-<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label></p>
-
+!
-</td>
-</tr> 
@@ -97 +95 @@
-<p class="submit"> 
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" /> 
-<input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,show_on_front,page_on_front,page_for_posts" /> 
-<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 

trunk/wp-admin/wp-admin.css

@@ -889 +889 @@
-        letter-spacing: -.05em;
-        margin: 0;
-
+;
-}
-

trunk/wp-includes/capabilities.php

@@ -56 +56 @@
-                unset($this->role_names[$role]);
-                unset($this->roles[$role]);
-
+
-                if ( $this->use_db )
-                        update_option($this->role_key, $this->roles);
@@ -428 +428 @@
-
-                $author_data = get_userdata($user_id);
-ost
+age
-                if ($user_id == $page_author_data->ID)
-                        $caps[] = 'read';

trunk/wp-includes/cron.php

@@ -94 +94 @@
-
-function wp_cron() {
+        // Prevent infinite loops caused by lack of wp-cron.php
+        if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false )
+                return;
+
-        $crons = _get_cron_array();
-        

trunk/wp-includes/functions.php

@@ -204 +204 @@
-        global $wpdb, $switched, $current_blog;
-
+        $pre = apply_filters( 'pre_option_' . $setting, false ); 
+        if ( $pre ) 
+                return $pre; 
+
-        if ( $switched == false && defined('WP_INSTALLING') == false ) {
-        // prevent non-existent options from triggering multiple queries
-        if ( true === wp_cache_get($setting, 'notoptions') )
-                return false;
-                $value = wp_cache_get($setting, 'options');
-        } else {
@@ -213 +214 @@
-                wp_cache_delete($setting, 'options');
-        }
+
+// Uncomment if we get any page not found or rewrite errors     
+//      if( $setting == 'rewrite_rules' )
+//              $value = false;
-
-        if ( $value == 'novalueindb' )
@@ -228 +233 @@
-                if( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
-                        $value = $row->option_value;
-
- // option does not exist, so we must cache its non-existence
-true, 'not
+($value=='')?'emptystringindb':
+
+'novalueindb', '
-                        return false;
-                }
@@ -290 +295 @@
-                return true;
-        }
-
-        if ( true === wp_cache_get($option_name, 'notoptions') )
-                wp_cache_delete($option_name, 'notoptions');
-
-        $_newvalue = $newvalue;
@@ -1212 +1214 @@
-        $adminurl = get_option('siteurl') . '/wp-admin';
-        if ( wp_get_referer() )
-get_referer(
+specialchars(wp_get_referer(), 1
-
-        $title = __('WordPress Confirmation');

trunk/wp-includes/post.php

@@ -75 +75 @@
-function get_extended($post) {
-        //Match the new style more links
-preg_match('/<!--more(.+?)?-->/', $post, $matches)
-$extended) = explode($matches[0],$post,
+ preg_match('/<!--more(.*?)-->/', $post, $matches) 
+ $extended) = explode($matches[0], $post, 
-        } else {
-                $main = $post;
@@ -83 +83 @@
-        
-        // Strip leading and trailing whitespace
-'\\1',
-'\\1',
+ '\\1', 
+ '\\1', 
-
-        return array('main' => $main, 'extended' => $extended);

trunk/xmlrpc.php

@@ -23 +23 @@
-    <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
-    <apis>
+      <api name="WordPress" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
-      <api name="Movable Type" blogID="1" preferred="true" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
-      <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
@@ -184 +185 @@
-                        $link = post_permalink($page->ID);
-
+                        // Get info the page parent if there is one.
+                        $parent_title = "";
+                        if(!empty($page->post_parent)) {
+                                $parent = get_page($page->post_parent);
+                                $parent_title = $parent->post_title;
+                        }
+
-                        // Determine comment and ping settings.
-                        $allow_comments = ("open" == $page->comment_status) ? 1 : 0;
@@ -197 +205 @@
-                        }
-
-users nicename
-nicename = get_profile("user_nicename", $username
+author info
+author = get_userdata($page->post_author
-
-                        $page_struct = array(
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        );
-
@@ -409 +419 @@
-                $page_list = $wpdb->get_results("
-                        SELECT ID page_id,
-
+
+
-                        FROM {$wpdb->posts}
-                        WHERE post_type = 'page'
@@ -1075 +1086 @@
-                }
-
-te
+et
-                if(!empty($content_struct["wp_page_order"])) {
-                        $menu_order = $content_struct["wp_page_order"];
+                }
+
+                // Only set the post_author if one is set.
+                if(!empty($content_struct["wp_author"])) {
+                        $post_author = $content_struct["wp_author"];
-                }
-
@@ -1122 +1138 @@
-
-          // We've got all the data -- post it:
-
+, 'post_author'
-
-          $result = wp_update_post($newpost);
@@ -1165 +1181 @@
-            $post = get_extended($postdata['post_content']);
-            $link = post_permalink($postdata['ID']);
+
+                // Get the author info.
+                $author = get_userdata($postdata['post_author']);
-
-            $allow_comments = ('open' == $postdata['comment_status']) ? 1 : 0;
@@ -1183 +1202 @@
-              'mt_text_more' => $post['extended'],
-              'mt_allow_comments' => $allow_comments,
-
+
+
+
+
+
-            );
-
@@ -1225 +1248 @@
-                        $post = get_extended($entry['post_content']);
-                        $link = post_permalink($entry['ID']);
+
+                        // Get the post author info.
+                        $author = get_userdata($entry['ID']);
-
-                        $allow_comments = ('open' == $entry['comment_status']) ? 1 : 0;
@@ -1243 +1269 @@
-                                'mt_text_more' => $post['extended'],
-                                'mt_allow_comments' => $allow_comments,
-
+
+
+
+
+
-                        );
-
@@ -1275 +1305 @@
-
-                // FIXME: can we avoid using direct SQL there?
-
+,category_parent
-                        foreach ($cats as $cat) {
-                                $struct['categoryId'] = $cat['cat_ID'];
+                                $struct['parentId'] = $cat['category_parent'];
-                                $struct['description'] = $cat['cat_name'];
-                                $struct['categoryName'] = $cat['cat_name'];