Changeset 840

Timestamp:

01/11/07 15:57:00 (2 years ago)

Author:

donncha

Message:

WP Merge to rev 4721

Files:

• trunk/wp-admin/upload-functions.php (modified) (1 diff)
• trunk/wp-includes/category.php (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce.js (modified) (1 diff)
• trunk/wp-includes/link-template.php (modified) (2 diffs)
• trunk/wp-includes/rss.php (modified) (10 diffs)
• trunk/wp-settings.php (modified) (1 diff)

trunk/wp-admin/upload-functions.php

@@ -202 +202 @@
-                if ( isset($file['error']) )
-                        wp_die($file['error'] . "<br /><a href='" . get_option('siteurl')
-'
+
-                );
-

trunk/wp-includes/category.php

@@ -295 +295 @@
-
-        // Transfer the touched cells 
-
+(array) 
-                if ( isset($cats[$id]) )
-                        $cats[$id]->{'link' == $type ? 'link_count' : 'category_count'} = count($items);

trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js

@@ -559 +559 @@
-
-        mcWindows.setDocumentLock(false);
+
+        tinyMCE.selectedInstance.getWin().focus();
-};
-

trunk/wp-includes/js/tinymce/tiny_mce.js

@@ -2814 +2814 @@
-                                        focusElm = tinyMCE.getParentElement(focusElm, 'A');
-
-
+ && this.getRng(0).endOffset > 0 && this.getRng(0).endOffset != focusElm.innerHTML.length
-                                                this.selection.selectNode(focusElm, false);
-                                }

trunk/wp-includes/link-template.php

@@ -297 +297 @@
-        }
-
-
+
+
+
+
+
-}
-
@@ -330 +334 @@
-        }
-
-
+
+
+
+
+
-}
-

trunk/wp-includes/rss.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
+
+
+
+
+
+
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -111 +653 @@
-        }
-
+/*=======================================================================*\
+        Function:       set
+        Purpose:        add an item to the cache, keyed on url
+        Input:          url from wich the rss file was fetched
+        Output:         true on sucess
+\*=======================================================================*/
-        function set ($url, $rss) {
-                global $wpdb;
@@ -127 +675 @@
-        }
-
+/*=======================================================================*\
+        Function:       get
+        Purpose:        fetch an item from the cache
+        Input:          url from wich the rss file was fetched
+        Output:         cached object on HIT, false on MISS
+\*=======================================================================*/
-        function get ($url) {
-                $this->ERROR = "";
@@ -132 +686 @@
-
-                if ( ! get_option( $cache_option ) ) {
- 
+
-                                "Cache doesn't contain: $url (cache option: $cache_option)"
-                        );
@@ -143 +697 @@
-        }
-
+/*=======================================================================*\
+        Function:       check_cache
+        Purpose:        check a url for membership in the cache
+                                and whether the object is older then MAX_AGE (ie. STALE)
+        Input:          url from wich the rss file was fetched
+        Output:         cached object on HIT, false on MISS
+\*=======================================================================*/
-        function check_cache ( $url ) {
-                $this->ERROR = "";
@@ -167 +728 @@
-        }
-
+/*=======================================================================*\
+        Function:       serialize
+\*=======================================================================*/
-        function serialize ( $rss ) {
-                return serialize( $rss );
-        }
-
+/*=======================================================================*\
+        Function:       unserialize
+\*=======================================================================*/
-        function unserialize ( $data ) {
-                return unserialize( $data );
-        }
-
+/*=======================================================================*\
+        Function:       file_name
+        Purpose:        map url to location in cache
+        Input:          url from wich the rss file was fetched
+        Output:         a file name
+\*=======================================================================*/
-        function file_name ($url) {
-                return md5( $url );
-        }
-
-
-
-
-
-
-
-
-
-
-