Changeset 8103

Timestamp:

06/16/2008 09:08:49 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with trunk [8072:8102]

Location:

branches/crazyhorse

Files:

• wp-admin/categories.php (modified) (3 diffs)
• wp-admin/css/press-this.css (modified) (1 diff)
• wp-admin/edit-pages.php (modified) (3 diffs)
• wp-admin/gears-manifest.php (modified) (2 diffs)
• wp-admin/import/wp-cat2tag.php (modified) (12 diffs)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/file.php (modified) (1 diff)
• wp-admin/includes/plugin.php (modified) (3 diffs)
• wp-admin/includes/template.php (modified) (5 diffs)
• wp-admin/plugins.php (modified) (8 diffs)
• wp-admin/press-this.php (modified) (9 diffs)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/atomlib.php (modified) (1 diff)
• wp-includes/category.php (modified) (12 diffs)
• wp-includes/class-IXR.php (modified) (10 diffs)
• wp-includes/class-phpass.php (modified) (2 diffs)
• wp-includes/class-phpmailer.php (modified) (1 diff)
• wp-includes/class-pop3.php (modified) (1 diff)
• wp-includes/class-smtp.php (modified) (2 diffs)
• wp-includes/class-snoopy.php (modified) (2 diffs)
• wp-includes/comment.php (modified) (38 diffs)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/functions.php (modified) (38 diffs)
• wp-includes/js/thickbox/thickbox.css (modified) (1 diff)
• wp-includes/js/tinymce/langs/wp-langs.php (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css (copied) (copied from trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css)
• wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css (modified) (6 diffs)
• wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (14 diffs)
• wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (12 diffs)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (2 diffs)
• wp-includes/post.php (modified) (4 diffs)
• wp-includes/script-loader.php (modified) (2 diffs)
• wp-load.php (modified) (1 diff)
• xmlrpc.php (modified) (3 diffs)

branches/crazyhorse/wp-admin/categories.php

@@ -135 +135 @@
 
 <div class="tablenav">
+
+<?php
+$pagenum = absint( $_GET['pagenum'] );
+if ( empty($pagenum) )
+    $pagenum = 1;
+if( !$catsperpage || $catsperpage < 0 )
+    $catsperpage = 20;
+
+$page_links = paginate_links( array(
+    'base' => add_query_arg( 'pagenum', '%#%' ),
+    'format' => '',
+    'total' => ceil(wp_count_terms('category') / $catsperpage),
+    'current' => $pagenum
+));
+
+if ( $page_links )
+    echo "<div class='tablenav-pages'>$page_links</div>";
+?>
 
 <div class="alignleft">
@@ -157 +175 @@
     <tbody id="the-list" class="list:cat">
 <?php
-cat_rows();
+cat_rows(0, 0, 0, $pagenum, $catsperpage);
 ?>
     </tbody>
@@ -164 +182 @@
 
 <div class="tablenav">
+
+<?php
+if ( $page_links )
+    echo "<div class='tablenav-pages'>$page_links</div>";
+?>
 <br class="clear" />
 </div>

branches/crazyhorse/wp-admin/css/press-this.css

@@ -450 +450 @@
     padding-bottom: 2px;
 }
+#photo_saving {
+margin-bottom: 8px;
+}

branches/crazyhorse/wp-admin/edit-pages.php

@@ -118 +118 @@
 
 <div class="tablenav">
+
+<?php
+$pagenum = absint( $_GET['pagenum'] );
+if ( empty($pagenum) )
+    $pagenum = 1;
+if( !$per_page || $pre_page < 0 )
+    $per_page = 20;
+
+$num_pages = ceil(count($posts) / $per_page);
+$page_links = paginate_links( array(
+    'base' => add_query_arg( 'pagenum', '%#%' ),
+    'format' => '',
+    'total' => $num_pages,
+    'current' => $pagenum
+));
+
+if ( $page_links )
+    echo "<div class='tablenav-pages'>$page_links</div>";
+?>
 
 <div class="alignleft">
@@ -152 +171 @@
   </thead>
   <tbody>
-  <?php page_rows($posts); ?>
+  <?php page_rows($posts, $pagenum, $per_page); ?>
   </tbody>
 </table>
@@ -170 +189 @@
 
 <div class="tablenav">
+<?php
+if ( $page_links )
+    echo "<div class='tablenav-pages'>$page_links</div>";
+?>
 <br class="clear" />
 </div>

branches/crazyhorse/wp-admin/gears-manifest.php

@@ -88 +88 @@
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>_20080606",
+"version" : "<?php echo $man_version; ?>_20080613",
 "entries" : [
 <?php echo $defaults; ?>
@@ -178 +178 @@
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=3091" },
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=3091" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=3091" },
 { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=3091" },
 

branches/crazyhorse/wp-admin/import/wp-cat2tag.php

@@ -25 +25 @@
 
     function populate_cats() {
-        global $wpdb;
 
         $categories = get_categories('get=all');
         foreach ( $categories as $category ) {
             $this->all_categories[] = $category;
-            if ( tag_exists( $wpdb->escape($category->name) ) )
+            if ( is_term( $category->slug, 'post_tag' ) )
                 $this->hybrids_ids[] = $category->term_id;
         }
@@ -36 +35 @@
 
     function populate_tags() {
-        global $wpdb;
 
         $tags = get_terms( array('post_tag'), 'get=all' );
         foreach ( $tags as $tag ) {
             $this->all_tags[] = $tag;
-            if ( $this->_category_exists($tag->term_id) )
+            if ( is_term( $tag->slug, 'category' ) )
                 $this->hybrids_ids[] = $tag->term_id;
         }
@@ -53 +51 @@
 
         if ( $cat_num > 0 ) {
-            echo '<h2>Convert Categories (' . $cat_num . ') to Tags.</h2>';
+            echo '<h2>' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '</h2>';
             echo '<div class="narrow">';
             echo '<p>' . __('Hey there. Here you can selectively converts existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>';
@@ -59 +57 @@
 
             $this->categories_form();
-        } elseif ( $hyb_num > 0 ) {
-             echo '<p>' . __('You have no categories that can be converted. However some of your categories are both a tag and a category.') . '</p>';
         } else {
             echo '<p>'.__('You have no categories to convert!').'</p>';
@@ -93 +89 @@
 
 <form name="catlist" id="catlist" action="admin.php?import=wp-cat2tag&amp;step=2" method="post">
-<p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_rows()">
+<p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_rows()" />
 <?php wp_nonce_field('import-cat2tag'); ?></p>
 <ul style="list-style:none">
-<?php
-        $hier = _get_term_hierarchy('category');
+
+<?php   $hier = _get_term_hierarchy('category');
 
         foreach ($this->all_categories as $category) {
             $category = sanitize_term( $category, 'category', 'display' );
 
-            if ( (int) $category->parent == 0 ) {
-                if ( in_array( intval($category->term_id),  $this->hybrids_ids ) ) {
-?>
-    <li style="color:#777;padding-left:1.3em;"><?php echo $category->name . ' (' . $category->count . ') *'; ?></li>
-<?php
-                } else {
-?>
+            if ( (int) $category->parent == 0 ) { ?>
+
     <li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($category->term_id); ?>" /> <?php echo $category->name . ' (' . $category->count . ')'; ?></label><?php
 
-                    if ( isset($hier[$category->term_id]) )
-                        $this->_category_children($category, $hier);
-?></li>
-<?php
-                }
-            }
-        }
-?>
+                 if ( in_array( intval($category->term_id),  $this->hybrids_ids ) )
+                    echo ' <a href="#note"> * </a>';
+                
+                if ( isset($hier[$category->term_id]) )
+                    $this->_category_children($category, $hier); ?></li>
+<?php       }
+        } ?>
 </ul>
 
-<?php
-        if ( ! empty($this->hybrids_ids) ) {
-            echo '<p>' . __('* This category is also a tag. It cannot be convert again.') . '</p>';
-        }
-?>
+<?php   if ( ! empty($this->hybrids_ids) )
+            echo '<p><a name="note"></a>' . __('* This category is also a tag. Converting it will add that tag to all posts that are currently in the category.') . '</p>'; ?>
+
 <p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Convert Categories to Tags'); ?>" /></p>
 </form>
 
-<?php
-    }
+<?php }
 
     function tags_tab() {
@@ -139 +126 @@
 
         if ( $tags_num > 0 ) {
-            echo '<h2>Convert Tags (' . $tags_num . ') to Categories.</h2>';
+            echo '<h2>' . sprintf( __ngettext( 'Convert Tag to Category.', 'Convert Tags (%d) to Categories.', $tags_num ), $tags_num ) . '</h2>';
             echo '<div class="narrow">';
             echo '<p>' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '</p>';
             echo '<p>' . __('The newly created categories will still be associated with the same posts.') . '</p></div>';
-            
-            
+
             $this->tags_form();
-        } elseif ( $hyb_num > 0 ) {
-             echo '<p>' . __('You have no tags that can be converted. However some of your tags are both a tag and a category.') . '</p>';
         } else {
             echo '<p>'.__('You have no tags to convert!').'</p>';
@@ -180 +164 @@
 
 <form name="taglist" id="taglist" action="admin.php?import=wp-cat2tag&amp;step=4" method="post">
-<p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_tagrows()">
+<p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_tagrows()" />
 <?php wp_nonce_field('import-cat2tag'); ?></p>
 <ul style="list-style:none">
-<?php
-        foreach ( $this->all_tags as $tag ) {
-            if ( in_array( intval($tag->term_id),  $this->hybrids_ids ) ) {
-?>
-    <li style="color:#777;padding-left:1.3em;"><?php echo attribute_escape($tag->name) . ' (' . $tag->count . ') *'; ?></li>
-<?php
-            } else {
-?>
-    <li><label><input type="checkbox" name="tags_to_convert[]" value="<?php echo intval($tag->term_id); ?>" /> <?php echo attribute_escape($tag->name) . ' (' . $tag->count . ')'; ?></label></li>
-
-<?php
-            }
-        }
-?>
+
+<?php   foreach ( $this->all_tags as $tag ) { ?>
+    <li><label><input type="checkbox" name="tags_to_convert[]" value="<?php echo intval($tag->term_id); ?>" /> <?php echo attribute_escape($tag->name) . ' (' . $tag->count . ')'; ?></label><?php if ( in_array( intval($tag->term_id),  $this->hybrids_ids ) ) echo ' <a href="#note"> * </a>'; ?></li>
+
+<?php   } ?>
 </ul>
 
-<?php   
-        if ( ! empty($this->hybrids_ids) )
-            echo '<p>' . __('* This tag is also a category. It cannot be converted again.') . '</p>';
-?>
+<?php   if ( ! empty($this->hybrids_ids) )
+            echo '<p><a name="note"></a>' . __('* This tag is also a category. When converted, all posts associated with the tag will also be in the category.') . '</p>'; ?>
 
 <p class="submit"><input type="submit" name="submit_tags" class="button" value="<?php _e('Convert Tags to Categories'); ?>" /></p>
 </form>
 
-<?php
-    }
-
-    function _category_children($parent, $hier) {
-?>
+<?php }
+
+    function _category_children($parent, $hier) { ?>
 
         <ul style="list-style:none">
-<?php
-        foreach ($hier[$parent->term_id] as $child_id) {
-            $child =& get_category($child_id);
-            
-            if ( in_array( intval($child->term_id), $this->hybrids_ids ) ) {
-?>
-        <li style="color:#777;padding-left:1.3em;"><?php echo $child->name . ' (' . $child->count . ') *'; ?></li>
-<?php
-            } else {
-?>
-        <li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($child->term_id); ?>" /> <?php echo $child->name . ' (' . $child->count . ')'; ?></label>
-<?php
+<?php   foreach ($hier[$parent->term_id] as $child_id) {
+            $child =& get_category($child_id); ?>
+        <li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($child->term_id); ?>" /> <?php echo $child->name . ' (' . $child->count . ')'; ?></label><?php
+
+            if ( in_array( intval($child->term_id), $this->hybrids_ids ) )
+                echo ' <a href="#note"> * </a>';
 
             if ( isset($hier[$child->term_id]) )
-                $this->_category_children($child, $hier);
-?>      </li>
-<?php
-            }
-        }
-?>
-        </ul>
-<?php
+                $this->_category_children($child, $hier); ?></li>
+<?php   } ?>
+        </ul><?php
     }
 
@@ -253 +213 @@
         global $wpdb;
 
-        if ( (!isset($_POST['cats_to_convert']) || !is_array($_POST['cats_to_convert'])) && empty($this->categories_to_convert)) {
-            echo '<div class="narrow">';
-            echo '<p>' . sprintf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag') . '</p>';
-            echo '</div>';
-            return;
+        if ( (!isset($_POST['cats_to_convert']) || !is_array($_POST['cats_to_convert'])) && empty($this->categories_to_convert)) { ?>
+            <div class="narrow">
+            <p><?php printf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag'); ?></p>
+            </div>
+<?php       return;
         }
 
         if ( empty($this->categories_to_convert) )
             $this->categories_to_convert = $_POST['cats_to_convert'];
+
         $hier = _get_term_hierarchy('category');
+        $hybrid_cats = $clear_parents = $parents = false;
+        $clean_term_cache = $clean_cat_cache = array();
+        $default_cat = get_option('default_category');
 
         echo '<ul>';
@@ -269 +233 @@
             $cat_id = (int) $cat_id;
 
-            echo '<li>' . sprintf(__('Converting category #%s ... '),  $cat_id);
-
-            if (!$this->_category_exists($cat_id)) {
-                _e('Category doesn\'t exist!');
+            if ( ! $this->_category_exists($cat_id) ) {
+                echo '<li>' . sprintf( __('Category %s doesn\'t exist!'),  $cat_id ) . "</li>\n";
             } else {
                 $category =& get_category($cat_id);
-
-                if ( tag_exists($wpdb->escape($category->name)) ) {
-                    _e('Category is already a tag.');
-                    echo '</li>';
+                echo '<li>' . sprintf(__('Converting category <strong>%s</strong> ... '),  $category->name);
+
+                // If the category is the default, leave category in place and create tag.
+                if ( $default_cat == $category->term_id ) {
+
+                    if ( ! ($id = is_term( $category->slug, 'post_tag' ) ) )
+                        $id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug));
+                    
+                    $id = $id['term_taxonomy_id'];
+                    $posts = get_objects_in_term($category->term_id, 'category');
+                    $term_order = 0;
+
+                    foreach ( $posts as $post ) {
+                        $values[] = $wpdb->prepare( "(%d, %d, %d)", $post, $id, $term_order);
+                        clean_post_cache($post);
+                    }
+                    
+                    if ( $values ) {
+                        $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
+
+                        $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET count = %d WHERE term_id = %d AND taxonomy = 'post_tag'", $category->count, $category->term_id) );
+                    }
+
+                    echo __('Converted successfully.') . "</li>\n";
                     continue;
                 }
-
-                // If the category is the default, leave category in place and create tag.
-                if ( get_option('default_category') == $category->term_id ) {
-                    $id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug));
-                    $id = $id['term_taxonomy_id'];
-                    $posts = get_objects_in_term($category->term_id, 'category');
-                    foreach ( $posts as $post ) {
-                        if ( !$wpdb->get_var( $wpdb->prepare("SELECT object_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $post, $id) ) )
-                            $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id) VALUES (%d, %d)", $post, $id) );
+                
+                // if tag already exists, add it to all posts in the category
+                if ( $tag_ttid = $wpdb->get_var( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $category->term_id) ) ) {
+                    $objects_ids = get_objects_in_term($category->term_id, 'category');
+                    $tag_ttid = (int) $tag_ttid;
+                    $term_order = 0;
+
+                    foreach ( $objects_ids as $object_id )
+                        $values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tag_ttid, $term_order);
+
+                    if ( $values ) {
+                        $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
+
+                        $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tag_ttid) );
+                        $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET count = %d WHERE term_id = %d AND taxonomy = 'post_tag'", $count, $category->term_id) );
+                    }
+                    echo __('Tag added to all posts in this category.') . " *</li>\n";
+
+                    $hybrid_cats = true;
+                    $clean_term_cache[] = $category->term_id;
+                    $clean_cat_cache[] = $category->term_id;
+
+                    continue;
+                }
+
+                $tt_ids = $wpdb->get_col( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'category'", $category->term_id) );
+                if ( $tt_ids ) {
+                    $posts = $wpdb->get_col("SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id IN (" . join(',', $tt_ids) . ") GROUP BY object_id");
+                    foreach ( (array) $posts as $post )
                         clean_post_cache($post);
-                    }
-                } else {
-                    $tt_ids = $wpdb->get_col( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'category'", $category->term_id) );
-                    if ( $tt_ids ) {
-                        $posts = $wpdb->get_col("SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id IN (" . join(',', $tt_ids) . ") GROUP BY object_id");
-                        foreach ( (array) $posts as $post )
-                            clean_post_cache($post);
-                    }
-
-                    // Change the category to a tag.
-                    $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET taxonomy = 'post_tag' WHERE term_id = %d AND taxonomy = 'category'", $category->term_id) );
-
-                    $terms = $wpdb->get_col( $wpdb->prepare("SELECT term_id FROM $wpdb->term_taxonomy WHERE parent = %d AND taxonomy = 'category'", $category->term_id) );
-                    foreach ( (array) $terms as $term )
-                        clean_category_cache($term);
-
-                    // Set all parents to 0 (root-level) if their parent was the converted tag
-                    $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET parent = 0 WHERE parent = %d AND taxonomy = 'category'", $category->term_id) );
                 }
-                // Clean the cache
-                clean_category_cache($category->term_id);
-
-                _e('Converted successfully.');
+
+                // Change the category to a tag.
+                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET taxonomy = 'post_tag' WHERE term_id = %d AND taxonomy = 'category'", $category->term_id) );
+
+                // Set all parents to 0 (root-level) if their parent was the converted tag
+                $parents = $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET parent = 0 WHERE parent = %d AND taxonomy = 'category'", $category->term_id) );
+
+                if ( $parents ) $clear_parents = true;
+                $clean_cat_cache[] = $category->term_id;
+                echo __('Converted successfully.') . "</li>\n";
             }
-
-            echo '</li>';
-        }
-
+        }
         echo '</ul>';
+
+        if ( ! empty($clean_term_cache) ) {
+            $clean_term_cache = array_unique(array_values($clean_term_cache));
+            foreach ( $clean_term_cache as $id )
+                wp_cache_delete($id, 'post_tag');
+        }
+
+        if ( ! empty($clean_cat_cache) ) {
+            $clean_cat_cache = array_unique(array_values($clean_cat_cache));
+            foreach ( $clean_cat_cache as $id )
+                wp_cache_delete($id, 'category');
+        }
+
+        if ( $clear_parents ) delete_option('category_children');
+
+        if ( $hybrid_cats )
+            echo '<p>' . sprintf( __('* This category is also a tag. The converter has added that tag to all posts currently in the category. If you want to remove it, please confirm that all tags were added successfully, then delete it from the <a href="%s">Manage Categories</a> page.'), 'categories.php') . '</p>';
         echo '<p>' . sprintf( __('We&#8217;re all done here, but you can always <a href="%s">convert more</a>.'), 'admin.php?import=wp-cat2tag' ) . '</p>';
     }
@@ -333 +337 @@
         }
 
-        if ( empty($this->categories_to_convert) )
+        if ( empty($this->tags_to_convert) )
             $this->tags_to_convert = $_POST['tags_to_convert'];
 
-        $clean_cache = array();
+        $hybrid_tags = $clear_parents = false;
+        $clean_cat_cache = $clean_term_cache = array();
+        $default_cat = get_option('default_category');
         echo '<ul>';
 
@@ -342 +348 @@
             $tag_id = (int) $tag_id;
 
-            echo '<li>' . sprintf(__('Converting tag #%s ... '),  $tag_id);
-
-            if ( ! is_term($tag_id, 'post_tag') ) {
-                _e('Tag doesn\'t exist!');
-            } else {
-
-                if ( is_term($tag_id, 'category') ) {
-                    _e('This Tag is already a Category.');
-                    echo '</li>';
+            if ( $tag = get_term( $tag_id, 'post_tag' ) ) {
+                printf('<li>' . __('Converting tag <strong>%s</strong> ... '),  $tag->name);
+
+                if ( $cat_ttid = $wpdb->get_var( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'category'", $tag->term_id) ) ) {
+                    $objects_ids = get_objects_in_term($tag->term_id, 'post_tag');
+                    $cat_ttid = (int) $cat_ttid;
+                    $term_order = 0;
+
+                    foreach ( $objects_ids as $object_id ) {
+                        $values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $cat_ttid, $term_order);
+                        clean_post_cache($object_id);
+                    }
+
+                    if ( $values ) {
+                        $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
+
+                        if ( $default_cat != $tag->term_id ) {
+                            $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tag->term_id) );
+                            $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET count = %d WHERE term_id = %d AND taxonomy = 'category'", $count, $tag->term_id) );
+                        }
+                    }
+
+                    $hybrid_tags = true;
+                    $clean_term_cache[] = $tag->term_id;
+                    $clean_cat_cache[] = $tag->term_id;
+                    echo __('All posts were added to the category with the same name.') . " *</li>\n";
+
                     continue;
                 }
 
-                $tt_ids = $wpdb->get_col( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $tag_id) );
-                if ( $tt_ids ) {
-                        $posts = $wpdb->get_col("SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id IN (" . join(',', $tt_ids) . ") GROUP BY object_id");
-                    foreach ( (array) $posts as $post )
-                        clean_post_cache($post);
-                }
-
                 // Change the tag to a category.
-                $parent = $wpdb->get_var( $wpdb->prepare("SELECT parent FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $tag_id) );
-                if ( 0 == $parent || (0 < (int) $parent && $this->_category_exists($parent)) )
+                $parent = $wpdb->get_var( $wpdb->prepare("SELECT parent FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $tag->term_id) );
+                if ( 0 == $parent || (0 < (int) $parent && $this->_category_exists($parent)) ) {
                     $reset_parent = '';
-                else $reset_parent = ", parent = '0'";
-
-                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET taxonomy = 'category' $reset_parent WHERE term_id = %d AND taxonomy = 'post_tag'", $tag_id) );
-
-                // Clean the cache
-                $clean_cache[] = $tag_id;
-
-                _e('Converted successfully.');
+                    $clear_parents = true;
+                } else
+                    $reset_parent = ", parent = '0'";
+
+                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET taxonomy = 'category' $reset_parent WHERE term_id = %d AND taxonomy = 'post_tag'", $tag->term_id) );
+
+                $clean_term_cache[] = $tag->term_id;
+                $clean_cat_cache[] = $cat['term_id'];
+                echo __('Converted successfully.') . "</li>\n";
+
+            } else {
+                printf( '<li>' . __('Tag #%s doesn\'t exist!') . "</li>\n",  $tag_id );
             }
-
-            echo '</li>';
-        }
-
-        clean_term_cache( $clean_cache, 'post_tag' );
-        delete_option('category_children');
-        
+        }
+
+        if ( ! empty($clean_term_cache) ) {
+            $clean_term_cache = array_unique(array_values($clean_term_cache));
+            foreach ( $clean_term_cache as $id )
+                wp_cache_delete($id, 'post_tag');
+        }
+
+        if ( ! empty($clean_cat_cache) ) {
+            $clean_cat_cache = array_unique(array_values($clean_cat_cache));
+            foreach ( $clean_cat_cache as $id )
+                wp_cache_delete($id, 'category');
+        }
+
+        if ( $clear_parents ) delete_option('category_children');
+
         echo '</ul>';
+        if ( $hybrid_tags )
+            echo '<p>' . sprintf( __('* This tag is also a category. The converter has added all posts from it to the category. If you want to remove it, please confirm that all posts were added successfully, then delete it from the <a href="%s">Manage Tags</a> page.'), 'edit-tags.php') . '</p>';
         echo '<p>' . sprintf( __('We&#8217;re all done here, but you can always <a href="%s">convert more</a>.'), 'admin.php?import=wp-cat2tag&amp;step=3' ) . '</p>';
     }
@@ -402 +434 @@
                     $this->convert_categories();
                 break;
-                
+
                 case 3 :
                     $this->tags_tab();
                 break;
-                
+
                 case 4 :
                     check_admin_referer('import-cat2tag');

branches/crazyhorse/wp-admin/includes/dashboard.php

@@ -316 +316 @@
     @extract( @$widgets['dashboard_incoming_links'], EXTR_SKIP );
     $rss = @fetch_rss( $url );
-    if ( isset($rss->items) && 1 < count($rss->items) )  {// Technorati returns a 1-item feed when it has no results
+    if ( isset($rss->items) && 0 < count($rss->items) )  {
 
         echo "<ul>\n";

branches/crazyhorse/wp-admin/includes/file.php

@@ -41 +41 @@
 
     return $real_file;
+}
+//$folder = Full path to folder
+//$levels = Levels of folders to follow, Default: 100 (PHP Loop limit)
+function list_files( $folder = '', $levels = 100 ) {
+    if( empty($folder) )
+        return false;
+
+    if( ! $levels )
+        return false;
+
+    $files = array();
+    if ( $dir = @opendir( $folder ) ) {
+        while (($file = readdir( $dir ) ) !== false ) {
+            if ( in_array($file, array('.', '..') ) )
+                continue;
+            if ( is_dir( $folder . '/' . $file ) ) {
+                $files2 = list_files( $folder . '/' . $file, $levels - 1);
+                if( $files2 )
+                    $files = array_merge($files, $files2 );
+                else
+                    $files[] = $folder . '/' . $file . '/';
+            } else {
+                $files[] = $folder . '/' . $file;
+            }
+        }
+    }
+    @closedir( $dir );
+    return $files;
 }
 

branches/crazyhorse/wp-admin/includes/plugin.php

@@ -137 +137 @@
 }
 
-//Replaces reactivate_all_plugins() / deactivate_all_plugins()  = 'deactivated_plugins' is now useless
 function activate_plugins($plugins, $redirect = '') {
     if ( !is_array($plugins) )
@@ -168 +167 @@
 
     ob_start();
-    $url = wp_nonce_url('plugins.php?action=delete-selected&' . implode('&', $checked), 'mass-manage-plugins');
+    $url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-manage-plugins');
     if ( false === ($credentials = request_filesystem_credentials($url)) ) {
         $data = ob_get_contents();
@@ -244 +243 @@
     // plugins.
     foreach ( $check_plugins as $check_plugin ) {
-        if ( !file_exists(WP_PLUGIN_DIR . '/' . $check_plugin) ) {
-            $current = get_option('active_plugins');
-            $key = array_search($check_plugin, $current);
-            if ( false !== $key && NULL !== $key ) {
-                unset($current[$key]);
-                update_option('active_plugins', $current);
-            }
+        $result = validate_plugin($check_plugin);
+        if ( is_wp_error( $result ) ) {
+            deactivate_plugins( $check_plugin, true);
         }
     }

branches/crazyhorse/wp-admin/includes/template.php

@@ -5 +5 @@
 //
 
-// Dandy new recursive multiple category stuff.
-function cat_rows( $parent = 0, $level = 0, $categories = 0 ) {
-    if ( !$categories ) {
+// Ugly recursive category stuff.
+function cat_rows( $parent = 0, $level = 0, $categories = 0, $page = 1, $per_page = 20 ) {
+    $count = 0;
+    _cat_rows($categories, $count, $parent, $level, $page, $per_page);
+}
+
+function _cat_rows( $categories, &$count, $parent = 0, $level = 0, $page = 1, $per_page = 20 ) {
+    if ( empty($categories) ) {
         $args = array('hide_empty' => 0);
         if ( !empty($_GET['s']) )
@@ -14 +19 @@
     }
 
+    if ( !$categories )
+        return false;
+
     $children = _get_term_hierarchy('category');
 
-    if ( $categories ) {
-        ob_start();
-        foreach ( $categories as $category ) {
-            if ( $category->parent == $parent) {
-                echo "\t" . _cat_row( $category, $level );
-                if ( isset($children[$category->term_id]) )
-                    cat_rows( $category->term_id, $level +1, $categories );
+    $start = ($page - 1) * $per_page;
+    $end = $start + $per_page;
+    $i = -1;
+    ob_start();
+    foreach ( $categories as $category ) {
+        if ( $count >= $end )
+            break;
+
+        $i++;
+
+        if ( $category->parent != $parent )
+            continue;
+
+        // If the page starts in a subtree, print the parents.
+        if ( $count == $start && $category->parent > 0 ) {
+            $my_parents = array();
+            $my_parent = $category->parent;
+            while ( $my_parent) {
+                $my_parent = get_category($my_parent);
+                $my_parents[] = $my_parent;
+                if ( !$my_parent->parent )
+                    break;
+                $my_parent = $my_parent->parent;
             }
-        }
-        $output = ob_get_contents();
-        ob_end_clean();
-
-        $output = apply_filters('cat_rows', $output);
-
-        echo $output;
-    } else {
-        return false;
-    }
+            $num_parents = count($my_parents);
+            while( $my_parent = array_pop($my_parents) ) {
+                echo "\t" . _cat_row( $my_parent, $level - $num_parents );
+                $num_parents--;
+            }
+        }
+
+        if ( $count >= $start )
+            echo "\t" . _cat_row( $category, $level );
+
+        unset($categories[$i]); // Prune the working set        
+        $count++;
+
+        if ( isset($children[$category->term_id]) )
+            _cat_rows( $categories, $count, $category->term_id, $level + 1, $page, $per_page );
+
+    }
+
+    $output = ob_get_contents();
+    ob_end_clean();
+
+    $output = apply_filters('cat_rows', $output);
+
+    echo $output;
 }
 
@@ -361 +399 @@
  * otherwise, display the row and its children in subsequent rows
  */
-function display_page_row( $page, &$children_pages, $level = 0 ) {
+function display_page_row( $page, $level = 0 ) {
     global $post;
     static $class;
@@ -485 +523 @@
 
 <?php
-
-    if ( ! $children_pages )
-        return true;
-
-    for ( $i = 0; $i < count($children_pages); $i++ ) {
-
-        $child = $children_pages[$i];
-
-        if ( $child->post_parent == $id ) {
-            array_splice($children_pages, $i, 1);
-            display_page_row($child, $children_pages, $level+1);
-            $i = -1; //as numeric keys in $children_pages are not preserved after splice
-        }
-    }
 }
 
@@ -504 +528 @@
  * displays pages in hierarchical order
  */
-function page_rows( $pages ) {
-    if ( ! $pages )
+
+function page_rows($pages, $pagenum = 1, $per_page = 20) {
+    $level = 0;
+
+    if ( ! $pages ) {
         $pages = get_pages( array('sort_column' => 'menu_order') );
 
-    if ( ! $pages )
-        return false;
+        if ( ! $pages )
+            return false;
+    }
 
     // splice pages into two parts: those without parent and those with parent
-
     $top_level_pages = array();
     $children_pages  = array();
 
+    // If searching, ignore hierarchy and treat everything as top level, otherwise split
+    // into top level and children
+    if ( empty($_GET['s']) )  {
+        foreach ( $pages as $page ) {
+            // catch and repair bad pages
+            if ( $page->post_parent == $page->ID ) {
+                $page->post_parent = 0;
+                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_parent = '0' WHERE ID = %d", $page->ID) );
+                clean_page_cache( $page->ID );
+            }
+    
+            if ( 0 == $page->post_parent )
+                $top_level_pages[] = $page;
+            else
+                $children_pages[] = $page;
+        }
+
+        $pages = &$top_level_pages;
+    }
+
+    $count = 0;
+    $start = ($pagenum - 1) * $per_page;
+    $end = $start + $per_page;
     foreach ( $pages as $page ) {
-
-        // catch and repair bad pages
-        if ( $page->post_parent == $page->ID ) {
-            $page->post_parent = 0;
-            $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_parent = '0' WHERE ID = %d", $page->ID) );
-            clean_page_cache( $page->ID );
-        }
-
-        if ( 0 == $page->post_parent )
-            $top_level_pages[] = $page;
-        else
-            $children_pages[] = $page;
-    }
-
-    foreach ( $top_level_pages as $page )
-        display_page_row($page, $children_pages, 0);
-
-    /*
-     * display the remaining children_pages which are orphans
-     * having orphan requires parental attention
-     */
-     if ( count($children_pages) > 0 ) {
-        $empty_array = array();
-        foreach ( $children_pages as $orphan_page ) {
-            clean_page_cache( $orphan_page->ID);
-            display_page_row( $orphan_page, $empty_array, 0 );
-        }
-     }
+        if ( $count >= $end )
+            break;
+
+        $i++;
+
+        if ( $count >= $start )
+            echo "\t" . display_page_row( $page, $level );
+
+        $count++;
+
+        if ( isset($children_pages) )
+            _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+    }
+}
+
+function _page_rows( $pages, &$count, $parent, $level, $pagenum, $per_page ) {
+    $start = ($pagenum - 1) * $per_page;
+    $end = $start + $per_page;
+    $i = -1;
+    foreach ( $pages as $page ) {
+        if ( $count >= $end )
+            break;
+
+        $i++;
+
+        if ( $page->post_parent != $parent )
+            continue;
+
+        // If the page starts in a subtree, print the parents.
+        if ( $count == $start && $page->post_parent > 0 ) {
+            $my_parents = array();
+            $my_parent = $page->post_parent;
+            while ( $my_parent) {
+                $my_parent = get_post($my_parent);
+                $my_parents[] = $my_parent;
+                if ( !$my_parent->post_parent )
+                    break;
+                $my_parent = $my_parent->post_parent;
+            }
+            $num_parents = count($my_parents);
+            while( $my_parent = array_pop($my_parents) ) {
+                echo "\t" . display_page_row( $my_parent, $level - $num_parents );
+                $num_parents--;
+            }
+        }
+
+        if ( $count >= $start )
+            echo "\t" . display_page_row( $page, $level );
+
+        unset($pages[$i]); // Prune the working set     
+        $count++;
+
+        _page_rows( $pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+    }
 }
 

branches/crazyhorse/wp-admin/plugins.php

@@ -31 +31 @@
             break;
         case 'activate-selected':
-            check_admin_referer('mass-manage-plugins');
+            check_admin_referer('bulk-manage-plugins');
             activate_plugins($_POST['checked'], 'plugins.php?error=true');
 
@@ -63 +63 @@
             break;
         case 'deactivate-selected':
-            check_admin_referer('mass-manage-plugins');
+            check_admin_referer('bulk-manage-plugins');
             deactivate_plugins($_POST['checked']);
             $deactivated = array();
@@ -75 +75 @@
             if( ! current_user_can('delete_plugins') )
                 wp_die(__('You do not have sufficient permissions to delete plugins for this blog.'));
-            check_admin_referer('mass-manage-plugins');
-            $plugins = $_REQUEST['checked'];
+            
+            check_admin_referer('bulk-manage-plugins');
+            
+            $plugins = $_REQUEST['checked']; //$_POST = from the plugin form; $_GET = from the FTP details screen.
             include(ABSPATH . 'wp-admin/update.php');
 
             $title = __('Delete Plugin');
             $parent_file = 'plugins.php';
-
+            
+            if( ! isset($_REQUEST['verify-delete']) ) {
+                wp_enqueue_script('jquery');
+                require_once('admin-header.php');
+                ?>
+            <div class="wrap">
+                <h2><?php _e('Delete Plugin(s)'); ?></h2>       
+                <?php
+                    $files_to_delete = $plugin_info = array();
+                    foreach( (array) $plugins as $plugin ) {
+                        if( '.' == dirname($plugin) ) {
+                            $files_to_delete[] = WP_PLUGIN_DIR . '/' . $plugin;
+                            if( $data = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin) )
+                                $plugin_info[ $plugin ] = $data;
+                        } else {
+                            //Locate all the files in that folder:
+                            $files = list_files( WP_PLUGIN_DIR . '/' . dirname($plugin) );
+                            if( $files ) {
+                                $files_to_delete = array_merge($files_to_delete, $files);
+                            }
+                            //Get plugins list from that folder
+                            if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) )
+                                $plugin_info = array_merge($plugin_info, $folder_plugins);
+                        }
+                    }
+                ?>
+                <p><?php _e('Deleting the selected plugins will remove the following plugin(s) and their files:'); ?></p>
+                <p>
+                    <ul>
+                        <?php 
+                        foreach( $plugin_info as $plugin )
+                            echo '<li>', $plugin['Title'], ' ', __('By'), ' ', $plugin['Author'], '</li>';
+                        ?>
+                    </ul>
+                </p>
+                <p><?php _e('Are you sure you wish to delete these files?') ?></p>
+                <form method="post" action="<?php echo clean_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
+                    <input type="hidden" name="verify-delete" value="1" />
+                    <input type="hidden" name="delete-selected" value="1" />
+                    <?php
+                        foreach( (array)$plugins as $plugin ) {
+                            $plugin = attribute_escape($plugin);
+                            echo "<input type='hidden' name='checked[]' value='$plugin' />";
+                        }
+                    ?>
+                    <?php wp_nonce_field('bulk-manage-plugins') ?>
+                    <input type="submit" name="submit" value="<?php _e('Yes, Delete these files') ?>" class="button" />
+                </form>
+                <form method="post" action="<?php echo clean_url(wp_get_referer()); ?>" style="display:inline;">
+                    <input type="submit" name="submit" value="<?php _e('No, Return me to the plugin list') ?>" class="button" />
+                </form>
+
+                <p><a href="#" onclick="jQuery('#files-list').toggle(); return false;"><?php _e('Click to view entire list of files which will be deleted'); ?></a></p>
+                <div id="files-list" style="display:none;">
+                    <ul>
+                    <?php
+                        foreach( (array)$files_to_delete as $file ) {
+                            $file = str_replace(ABSPATH, '', $file);
+                            echo "<li>$file</li>";
+                        }
+                    ?>
+                    </ul>
+                </div>              
+            </div>
+                <?php
+                require_once('admin-footer.php');
+                exit;
+            }
             $delete_result = delete_plugins($plugins);
 
@@ -87 +156 @@
 
             break;
-        default:
-            var_dump("Unknown Action $action");
     }
 }
@@ -225 +292 @@
 <h3 id="currently-active"><?php _e('Currently Active Plugins') ?></h3>
 <form method="post" action="<?php echo admin_url('plugins.php') ?>">
-<?php wp_nonce_field('mass-manage-plugins') ?>
+<?php wp_nonce_field('bulk-manage-plugins') ?>
 
 <div class="tablenav">
@@ -241 +308 @@
 <h3 id="recent-plugins"><?php _e('Recently Active Plugins') ?></h3>
 <form method="post" action="<?php echo admin_url('plugins.php') ?>">
-<?php wp_nonce_field('mass-manage-plugins') ?>
+<?php wp_nonce_field('bulk-manage-plugins') ?>
 
 <div class="tablenav">
@@ -258 +325 @@
 <h3 id="available-plugins"><?php _e('Available Plugins') ?></h3>
 <form method="post" action="<?php echo admin_url('plugins.php') ?>">
-<?php wp_nonce_field('mass-manage-plugins') ?>
-
+<?php wp_nonce_field('bulk-manage-plugins') ?>
+
+<?php if ( ! empty($available_plugins) ) : ?>
 <div class="tablenav">
     <div class="alignleft">
@@ -271 +339 @@
 <?php print_plugins_table($available_plugins, 'available') ?>
 </form>
+<?php endif; ?>
 
 <h2><?php _e('Get More Plugins'); ?></h2>

branches/crazyhorse/wp-admin/press-this.php

@@ -77 +77 @@
             <p class="submit">         
             <input type="submit" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
-            <img src="images/loading.gif" alt="" id="photo_saving" style="width:16px; height:16px; vertical-align:-4px; display:none;"/>
+            <img src="images/loading-publish.gif" alt="" id="photo_saving" style="display:none;"/>
             </p>
         </div>  
@@ -155 +155 @@
 
 if($_REQUEST['ajax'] == 'photo_images') {
-$url = urldecode($url);
-$url = str_replace(' ', '%20', $url);
-
+    error_log('photo images');
     function get_images_from_uri($uri) {
-        if(preg_match('/\.(jpg|png|gif)/', $uri)) return "'".$uri."'";
+        if(preg_match('/\.(jpg|png|gif)/', $uri)) 
+            return "'".$uri."'";
+        
         $content = wp_remote_fopen($uri);
         $host = parse_url($uri);
+        
         if ( false === $content ) return '';
-
-        $pattern = '/<img[^>]+src=[\'"]([^\'" >]+?)[\'" >]/is';
+        
+        $pattern = '/<img ([^>]*)src=(\"|\')(.+?)(\2)([^>\/]*)\/*>/is';
         preg_match_all($pattern, $content, $matches);
-        if ( empty($matches[1]) ) return '';
-    
+        if ( empty($matches[1]) ) { error_log('empty'); return ''; };
         $sources = array();
 
-        foreach ($matches[1] as $src) {
-            if ( false !== strpos($src, '&') ) continue;
+        foreach ($matches[3] as $src) {
+            error_log($src);
+            #if ( false !== strpos($src, '&') ) continue;
                 if(strpos($src, 'http') === false) {
                     if(strpos($src, '../') === false && strpos($src, './') === false) {
@@ -179 +180 @@
                     }
                 }
+                
                 $sources[] = $src;
         }
@@ -184 +186 @@
     } 
     
-        
+    $url = urldecode($url);
+    $url = str_replace(' ', '%20', $url);
     echo 'new Array('.get_images_from_uri($url).')'; 
 die;        
@@ -367 +370 @@
                 set_menu('text');
                 set_title('<?php _e('Text') ?>');
-                set_editor("<?php echo $selection; ?>");
+                <?php if($selection) { ?>
+                set_editor('<?php echo '<p><a href="'.$url.'">'.$selection.'</a> </p> '; ?>');
+                <?php } else { ?>
+                set_editor('<?php echo '<p><a href="'.$url.'">'.$title.'</a> </p> '; ?>');
+                <?php } ?>
                 return false;
             break;
@@ -376 +383 @@
                 set_menu('quote');
                 set_title('<?php _e('Quote') ?>');
-                set_editor("<blockquote><p><?php echo $selection; ?> </p><p><cite><a href='<?php echo ''; ?>'><?php echo ''; ?></a></cite> </p></blockquote>");
+                set_editor("<blockquote><p><?php echo $selection; ?> </p><p><cite><a href='<?php echo $url; ?>'><?php echo $title; ?></a></cite> </p></blockquote>");
 
                 return false;
@@ -422 +429 @@
                 <?php if($selection) { ?>
                     set_editor("<?php echo $selection; ?>");
-                <?php } else { ?>
-                    set_editor('')
                 <?php } ?>
                 jQuery('#extra_fields').show();
-                jQuery('#extra_fields').prepend('<h2 id="waiting"><img src="images/loading.gif" alt="" /> Loading...</h2>');
+                jQuery('#extra_fields').before('<h2 id="waiting"><img src="images/loading.gif" alt="" /> Loading...</h2>');
                 jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']).'/?ajax=photo&u='.attribute_escape($url); ?>');
                 jQuery.ajax({
@@ -435 +440 @@
                     dataType : "script",
                     success : function() {
-                        jQuery('#waiting').innerHTML('');
+                        jQuery('#waiting').remove();
                     }
                 });
@@ -490 +495 @@
                     <h2 id="content_type"><label for="content"><?php _e('Post') ?></label></h2>
                     <div class="editor-container">
-                        <textarea name="content" id="content" style="width:100%;" class="mceEditor">
-                        <?php echo $selection; ?>
-                        </textarea>
+                        <textarea name="content" id="content" style="width:100%;" class="mceEditor"><?php if($selection) { ?><a href='<?php echo $url ?>'><?php echo $selection ?></a><?php } else { ?><a href='<?php echo $url ?>'><?php echo $title; ?></a><?php } ?></textarea>
                     </div>
                     </div>

branches/crazyhorse/wp-admin/wp-admin.css

@@ -601 +601 @@
 }
 
-#wphead a, #dashmenu a, #adminmenu a, #submenu a, #sidemenu a {
+#wphead a, #dashmenu a, #adminmenu a, #submenu a, #sidemenu a, #taglist a, #catlist a {
     text-decoration: none;
 }

branches/crazyhorse/wp-includes/atomlib.php

@@ -1 +1 @@
 <?php
-/*
+/**
  * Atom Syndication Format PHP Library
  *

branches/crazyhorse/wp-includes/category.php

@@ -1 +1 @@
 <?php
-
+/**
+ * WordPress Category API
+ *
+ * @package WordPress
+ */
+
+/**
+ * Retrieves all category IDs.
+ *
+ * @since 2.0.0
+ * @link http://codex.wordpress.org/Function_Reference/get_all_category_ids
+ *
+ * @return object List of all of the category IDs.
+ */
 function get_all_category_ids() {
     if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category') ) {
@@ -10 +23 @@
 }
 
+/**
+ * Retrieve list of category objects.
+ *
+ * If you change the type to 'link' in the arguments, then the link categories
+ * will be returned instead. Also all categories will be updated to be backwards
+ * compatible with pre-2.3 plugins and themes.
+ *
+ * @since 2.1.0
+ * @see get_terms() Type of arguments that can be changed.
+ * @link http://codex.wordpress.org/Function_Reference/get_categories
+ *
+ * @param string|array $args Optional. Change the defaults retrieving categories.
+ * @return array List of categories.
+ */
 function &get_categories($args = '') {
     $defaults = array('type' => 'category');
@@ -25 +52 @@
 }
 
-// Retrieves category data given a category ID or category object.
-// Handles category caching.
+/**
+ * Retrieves category data given a category ID or category object.
+ *
+ * If you pass the $category parameter an object, which is assumed to be the
+ * category row object retrieved the database. It will cache the category data.
+ *
+ * If you pass $category an integer of the category ID, then that category will
+ * be retrieved from the database, if it isn't already cached, and pass it back.
+ *
+ * If you look at get_term(), then both types will be passed through several
+ * filters and finally sanitized based on the $filter parameter value.
+ *
+ * The category will converted to maintain backwards compatibility.
+ *
+ * @since 2.1.0
+ * @uses get_term() Used to get the category data from the taxonomy.
+ *
+ * @param int|object $category Category ID or Category row object
+ * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
+ * @param string $filter Optional. Default is raw or no WordPress defined filter will applied.
+ * @return mixed Category data in type defined by $output parameter.
+ */
 function &get_category($category, $output = OBJECT, $filter = 'raw') {
     $category = get_term($category, 'category', $output, $filter);
@@ -37 +84 @@
 }
 
+/**
+ * Retrieve category based on URL containing the category slug.
+ *
+ * Breaks the $category_path parameter up to get the category slug.
+ *
+ * Tries to find the child path and will return it. If it doesn't find a
+ * match, then it will return the first category matching slug, if $full_match,
+ * is set to false. If it does not, then it will return null.
+ *
+ * It is also possible that it will return a WP_Error object on failure. Check
+ * for it when using this function.
+ *
+ * @since 2.1.0
+ *
+ * @param string $category_path URL containing category slugs.
+ * @param bool $full_match Optional. Whether should match full path or not.
+ * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
+ * @return null|object|array Null on failure. Type is based on $output value.
+ */
 function get_category_by_path($category_path, $full_match = true, $output = OBJECT) {
     $category_path = rawurlencode(urldecode($category_path));
@@ -51 +117 @@
 
     if ( empty($categories) )
-        return NULL;
+        return null;
 
     foreach ($categories as $category) {
@@ -71 +137 @@
         return get_category($categories[0]->term_id, $output);
 
-    return NULL;
-}
-
+    return null;
+}
+
+/**
+ * Retrieve category object by category slug.
+ *
+ * @since 2.3.0
+ *
+ * @param string $slug The category slug.
+ * @return object Category data object
+ */
 function get_category_by_slug( $slug  ) {
     $category = get_term_by('slug', $slug, 'category');
@@ -82 +156 @@
 }
 
-// Get the ID of a category from its name
+
+/**
+ * Retrieve the ID of a category from its name.
+ *
+ * @since 1.0.0
+ *
+ * @param string $cat_name Optional. Default is 'General' and can be any category name.
+ * @return int 0, if failure and ID of category on success.
+ */
 function get_cat_ID($cat_name='General') {
     $cat = get_term_by('name', $cat_name, 'category');
@@ -90 +172 @@
 }
 
-// Deprecate
+
+/**
+ * Retrieve the category name by the category ID.
+ *
+ * @since 0.71
+ * @deprecated Use get_cat_name()
+ * @see get_cat_name() get_catname() is deprecated in favor of get_cat_name().
+ *
+ * @param int $cat_ID Category ID
+ * @return string category name
+ */
 function get_catname($cat_ID) {
     return get_cat_name($cat_ID);
 }
 
-// Get the name of a category from its ID
+
+/**
+ * Retrieve the name of a category from its ID.
+ *
+ * @since 1.0.0
+ *
+ * @param int $cat_id Category ID
+ * @return string Category name
+ */
 function get_cat_name($cat_id) {
     $cat_id = (int) $cat_id;
@@ -102 +202 @@
 }
 
+
+/**
+ * Check if a category is an ancestor of another category.
+ *
+ * You can use either an id or the category object for both parameters. If you
+ * use an integer the category will be retrieved.
+ *
+ * @since 2.1.0
+ *
+ * @param int|object $cat1 ID or object to check if this is the parent category.
+ * @param int|object $cat2 The child category.
+ * @return bool Whether $cat2 is child of $cat1
+ */
 function cat_is_ancestor_of($cat1, $cat2) {
     if ( is_int($cat1) )
@@ -117 +230 @@
 }
 
+
+/**
+ * Sanitizes category data based on context.
+ *
+ * @since 2.3.0
+ * @uses sanitize_term() See this function for what context are supported.
+ *
+ * @param object|array $category Category data
+ * @param string $context Optional. Default is 'display'.
+ * @return object|array Same type as $category with sanitized data for safe use.
+ */
 function sanitize_category($category, $context = 'display') {
     return sanitize_term($category, 'category', $context);
 }
 
+
+/**
+ * Sanitizes data in single category key field.
+ *
+ * @since 2.3.0
+ * @uses sanitize_term_field() See function for more details.
+ *
+ * @param string $field Category key to sanitize
+ * @param mixed $value Category value to sanitize
+ * @param int $cat_id Category ID
+ * @param string $context What filter to use, 'raw', 'display', etc.
+ * @return mixed Same type as $value after $value has been sanitized.
+ */
 function sanitize_category_field($field, $value, $cat_id, $context) {
     return sanitize_term_field($field, $value, $cat_id, 'category', $context);
 }
 
-// Tags
-
+/* Tags */
+
+
+/**
+ * Retrieves all post tags.
+ *
+ * @since 2.3.0
+ * @see get_terms() For list of arguments to pass.
+ * @uses apply_filters() Calls 'get_tags' hook on array of tags and with $args.
+ *
+ * @param string|array $args Tag arguments to use when retrieving tags.
+ * @return array List of tags.
+ */
 function &get_tags($args = '') {
     $tags = get_terms('post_tag', $args);
@@ -137 +285 @@
 }
 
+
+/**
+ * Retrieve post tag by tag ID or tag object.
+ *
+ * If you pass the $tag parameter an object, which is assumed to be the tag row
+ * object retrieved the database. It will cache the tag data.
+ *
+ * If you pass $tag an integer of the tag ID, then that tag will
+ * be retrieved from the database, if it isn't already cached, and pass it back.
+ *
+ * If you look at get_term(), then both types will be passed through several
+ * filters and finally sanitized based on the $filter parameter value.
+ *
+ * @since 2.3.0
+ *
+ * @param int|object $tag
+ * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
+ * @param string $filter Optional. Default is raw or no WordPress defined filter will applied.
+ * @return object|array Return type based on $output value.
+ */
 function &get_tag($tag, $output = OBJECT, $filter = 'raw') {
     return get_term($tag, 'post_tag', $output, $filter);
 }
 
-//
-// Cache
-//
-
+
+/* Cache */
+
+
+/**
+ * Update the categories cache.
+ *
+ * This function does not appear to be used anymore or does not appear to be
+ * needed. It might be a legacy function left over from when there was a need
+ * for updating the category cache.
+ *
+ * @since 1.5.0
+ *
+ * @return bool Always return True
+ */
 function update_category_cache() {
     return true;
 }
 
+
+/**
+ * Remove the category cache data based on ID.
+ *
+ * @since 2.1.0
+ * @uses clean_term_cache() Clears the cache for the category based on ID
+ *
+ * @param int $id Category ID
+ */
 function clean_category_cache($id) {
     clean_term_cache($id, 'category');
 }
 
-//
-// Private helpers
-//
-
+
+/**
+ * Update category structure to old pre 2.3 from new taxonomy structure.
+ *
+ * This function was added for the taxonomy support to update the new category
+ * structure with the old category one. This will maintain compatibility with
+ * plugins and themes which depend on the old key or property names.
+ *
+ * The parameter should only be passed a variable and not create the array or
+ * object inline to the parameter. The reason for this is that parameter is
+ * passed by reference and PHP will fail unless it has the variable.
+ *
+ * There is no return value, because everything is updated on the variable you
+ * pass to it. This is one of the features with using pass by reference in PHP.
+ *
+ * @since 2.3.0
+ * @access private
+ *
+ * @param array|object $category Category Row object or array
+ */
 function _make_cat_compat( &$category) {
     if ( is_object($category) ) {
@@ -175 +379 @@
 }
 
+
 ?>

branches/crazyhorse/wp-includes/class-IXR.php

@@ -14 +14 @@
  */
 
+/**
+ * IXR_Value
+ *
+ * @package IXR
+ * @since 1.5
+ */
 class IXR_Value {
     var $data;
@@ -121 +127 @@
 }
 
-
+/**
+ * IXR_Message
+ *
+ * @package IXR
+ * @since 1.5
+ */
 class IXR_Message {
     var $message;
@@ -264 +275 @@
 }
 
-
+/**
+ * IXR_Server
+ *
+ * @package IXR
+ * @since 1.5
+ */
 class IXR_Server {
     var $data;
@@ -425 +441 @@
 }
 
+/**
+ * IXR_Request
+ *
+ * @package IXR
+ * @since 1.5
+ */
 class IXR_Request {
     var $method;
@@ -455 +477 @@
 }
 
-
+/**
+ * IXR_Client
+ *
+ * @package IXR
+ * @since 1.5
+ */
 class IXR_Client {
     var $server;
@@ -566 +593 @@
 }
 
-
+/**
+ * IXR_Error
+ *
+ * @package IXR
+ * @since 1.5
+ */
 class IXR_Error {
     var $code;
@@ -598 +630 @@
 }
 
-
+/**
+ * IXR_Date
+ *
+ * @package IXR
+ * @since 1.5
+ */
 class IXR_Date {
     var $year;
@@ -642 +679 @@
 }
 
-
+/**
+ * IXR_Base64
+ *
+ * @package IXR
+ * @since 1.5
+ */
 class IXR_Base64 {
     var $data;
@@ -653 +695 @@
 }
 
-
+/**
+ * IXR_IntrospectionServer
+ *
+ * @package IXR
+ * @since 1.5
+ */
 class IXR_IntrospectionServer extends IXR_Server {
     var $signatures;
@@ -797 +844 @@
 }
 
-
+/**
+ * IXR_ClientMulticall
+ *
+ * @package IXR
+ * @since 1.5
+ */
 class IXR_ClientMulticall extends IXR_Client {
     var $calls = array();

branches/crazyhorse/wp-includes/class-phpass.php

@@ -9 +9 @@
 
 #
-# Portable PHP password hashing framework.
-#
-# Version 0.1 / genuine.
-#
 # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
 # the public domain.
 #
 # There's absolutely no warranty.
-#
-# The homepage URL for this framework is:
-#
-#   http://www.openwall.com/phpass/
 #
 # Please be sure to update the Version line if you edit this file in any way.
@@ -33 +25 @@
 # requirements (there can be none), but merely suggestions.
 #
+
+/**
+ * Portable PHP password hashing framework.
+ *
+ * @package phpass
+ * @version 0.1 / genuine
+ * @link http://www.openwall.com/phpass/
+ * @since 2.5
+ */
 class PasswordHash {
     var $itoa64;

branches/crazyhorse/wp-includes/class-phpmailer.php

@@ -1 +1 @@
 <?php
-////////////////////////////////////////////////////
-// PHPMailer - PHP email class
-//
-// Class for sending email using either
-// sendmail, PHP mail(), or SMTP.  Methods are
-// based upon the standard AspEmail(tm) classes.
-//
-// Copyright (C) 2001 - 2003  Brent R. Matzelle
-//
-// License: LGPL, see LICENSE
-////////////////////////////////////////////////////
+/**
+ * PHPMailer - PHP email class
+ *
+ * Class for sending email using either sendmail, PHP mail(), or SMTP. Methods
+ * are based upon the standard AspEmail(tm) classes.
+ *
+ * @copyright 2001 - 2003 Brent R. Matzelle
+ * @license LGPL
+ * @package PHPMailer
+ */
 
 /**

branches/crazyhorse/wp-includes/class-pop3.php

@@ -18 +18 @@
  */
 
+/**
+ * POP3
+ *
+ * @package SquirrelMail
+ */
 class POP3 {
     var $ERROR      = '';       //  Error string.

branches/crazyhorse/wp-includes/class-smtp.php

@@ -1 +1 @@
 <?php
-////////////////////////////////////////////////////
-// SMTP - PHP SMTP class
-//
-// Version 1.02
-//
-// Define an SMTP class that can be used to connect
-// and communicate with any SMTP server. It implements
-// all the SMTP functions defined in RFC821 except TURN.
-//
-// Author: Chris Ryan
-//
-// License: LGPL, see LICENSE
-////////////////////////////////////////////////////
+/**
+ * SMTP - PHP SMTP class
+ *
+ * Define an SMTP class that can be used to connect and communicate with any
+ * SMTP server. It implements all the SMTP functions defined in RFC821 except
+ * TURN.
+ *
+ * @version 1.02
+ * @author Chris Ryan
+ * @license LGPL
+ * @package PHPMailer
+ */
 
 /**
@@ -19 +18 @@
  * error. SMTP also provides some utility methods for sending mail
  * to an SMTP server.
+ *
  * @package PHPMailer
  * @author Chris Ryan

branches/crazyhorse/wp-includes/class-snoopy.php

@@ -9 +9 @@
  * @package Snoopy
  */
-/*************************************************
-
-Snoopy - the PHP net client
-Author: Monte Ohrt <monte@ispi.net>
-Copyright (c): 1999-2000 ispi, all rights reserved
-Version: 1.01
-
+
+if ( !in_array('Snoopy', get_declared_classes() ) ) :
+/**
+ * Snoopy - the PHP net client
+ *
+ * @author Monte Ohrt <monte@ispi.net>
+ * @copyright (c): 1999-2000 ispi, all rights reserved
+ * @version 1.01
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29 +31 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-You may contact the author of Snoopy by e-mail at:
-monte@ispi.net
-
-Or, write to:
-Monte Ohrt
-CTO, ispi
-237 S. 70th suite 220
-Lincoln, NE 68510
-
-The latest version of Snoopy can be obtained from:
-http://snoopy.sourceforge.net/
-
-*************************************************/
-
-if ( !in_array('Snoopy', get_declared_classes() ) ) :
+ *
+ * You may contact the author of Snoopy by e-mail at:
+ * monte@ispi.net
+ *
+ * Or, write to:
+ * Monte Ohrt
+ * CTO, ispi
+ * 237 S. 70th suite 220
+ * Lincoln, NE 68510
+ *
+ * @link http://snoopy.sourceforge.net/ The latest version of Snoopy can be
+ *      obtained
+ */
 class Snoopy
 {

branches/crazyhorse/wp-includes/comment.php

@@ -7 +7 @@
 
 /**
- * check_comment() - Checks whether a comment passes internal checks to be allowed to add
- *
- * {@internal Missing Long Description}}
+ * Checks whether a comment passes internal checks to be allowed to add.
+ *
+ * If comment moderation is set in the administration, then all comments,
+ * regardless of their type and whitelist will be set to false.
+ *
+ * If the number of links exceeds the amount in the administration, then the
+ * check fails.
+ *
+ * If any of the parameter contents match the blacklist of words, then the check
+ * fails.
+ *
+ * If the comment is a trackback and part of the blogroll, then the trackback is
+ * automatically whitelisted. If the comment author was approved before, then
+ * the comment is automatically whitelisted.
+ *
+ * If none of the checks fail, then the failback is to set the check to pass
+ * (return true).
  *
  * @since 1.2
  * @uses $wpdb
  *
- * @param string $author {@internal Missing Description }}
- * @param string $email {@internal Missing Description }}
- * @param string $url {@internal Missing Description }}
- * @param string $comment {@internal Missing Description }}
- * @param string $user_ip {@internal Missing Description }}
- * @param string $user_agent {@internal Missing Description }}
- * @param string $comment_type {@internal Missing Description }}
- * @return bool {@internal Missing Description }}
+ * @param string $author Comment Author's name
+ * @param string $email Comment Author's email
+ * @param string $url Comment Author's URL
+ * @param string $comment Comment contents
+ * @param string $user_ip Comment Author's IP address
+ * @param string $user_agent Comment Author's User Agent
+ * @param string $comment_type Comment type, either user submitted comment,
+ *      trackback, or pingback
+ * @return bool Whether the checks passed (true) and the comments should be
+ *      displayed or set to moderated
  */
 function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $comment_type) {
@@ -84 +100 @@
 
 /**
- * get_approved_comments() - Returns the approved comments for post $post_id
+ * Retrieve the approved comments for post $post_id.
  *
  * @since 2.0
@@ -98 +114 @@
 
 /**
- * get_comment() - Retrieves comment data given a comment ID or comment object.
- *
- * {@internal Missing Long Description}}
+ * Retrieves comment data given a comment ID or comment object.
+ *
+ * If an object is passed then the comment data will be cached and then returned
+ * after being passed through a filter.
+ *
+ * If the comment is empty, then the global comment variable will be used, if it
+ * is set.
  *
  * @since 2.0
  * @uses $wpdb
  *
- * @param object|string|int $comment {@internal Missing Description}}
- * @param string $output OBJECT or ARRAY_A or ARRAY_N constants
+ * @param object|string|int $comment Comment to retrieve.
+ * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants
  * @return object|array|null Depends on $output value.
  */
@@ -143 +163 @@
 
 /**
- * get_commentdata() - Returns an array of comment data about comment $comment_ID
- *
- * get_comment() technically does the same thing as this function. This function also
- * appears to reference variables and then not use them or not update them when needed.
- * It is advised to switch to get_comment(), since this function might be deprecated in
- * favor of using get_comment().
+ * Retrieve an array of comment data about comment $comment_ID.
+ *
+ * get_comment() technically does the same thing as this function. This function
+ * also appears to reference variables and then not use them or not update them
+ * when needed. It is advised to switch to get_comment(), since this function
+ * might be deprecated in favor of using get_comment().
  *
  * @deprecated Use get_comment()
@@ -163 +183 @@
  * @return array The comment data
  */
-function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) { // less flexible, but saves DB queries
+function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) {
     global $postc, $wpdb;
     if ( $no_cache ) {
@@ -187 +207 @@
 
 /**
- * get_lastcommentmodified() - The date the last comment was modified
+ * The date the last comment was modified.
  *
  * {@internal Missing Long Description}}
@@ -195 +215 @@
  * @global array $cache_lastcommentmodified
  *
- * @param string $timezone Which timezone to use in reference to 'gmt', 'blog', or 'server' locations
+ * @param string $timezone Which timezone to use in reference to 'gmt', 'blog',
+ *      or 'server' locations
  * @return string Last comment modified date
  */
@@ -224 +245 @@
 
 /**
- * get_comment_count() - The amount of comments in a post or total comments
+ * The amount of comments in a post or total comments.
  *
  * {@internal Missing Long Description}}
@@ -231 +252 @@
  * @uses $wpdb
  *
- * @param int $post_id Optional. Comment amount in post if > 0, else total com
-ments blog wide
+ * @param int $post_id Optional. Comment amount in post if > 0, else total comments blog wide
  * @return array The amount of spam, approved, awaiting moderation, and total
  */
@@ -282 +302 @@
 
 /**
- * sanitize_comment_cookies() - {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
+ * Sanitizes the cookies sent to the user already.
+ *
+ * Will only do anything if the cookies have already been created for the user.
+ * Mostly used after cookies had been sent to use elsewhere.
  *
  * @since 2.0.4
- *
  */
 function sanitize_comment_cookies() {
@@ -312 +332 @@
 
 /**
- * wp_allow_comment() - Validates whether this comment is allowed to be made or not
+ * Validates whether this comment is allowed to be made or not.
  *
  * {@internal Missing Long Description}}
@@ -363 +383 @@
 
 /**
- * check_comment_flood_db() - {@internal Missing Short Description}}
+ * {@internal Missing Short Description}}
  *
  * {@internal Missing Long Description}}
@@ -392 +412 @@
 
 /**
- * wp_blacklist_check() - Does comment contain blacklisted characters or words
+ * Does comment contain blacklisted characters or words.
  *
  * {@internal Missing Long Description}}
@@ -449 +469 @@
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * {@internal Missing Long Description}}
+ *
+ * @param unknown_type $post_id
+ * @return unknown
+ */
 function wp_count_comments( $post_id = 0 ) {
     global $wpdb;
@@ -486 +514 @@
 
 /**
- * wp_delete_comment() - Removes comment ID and maybe updates post comment count
- *
- * The post comment count will be updated if the comment was approved and has a post
- * ID available.
+ * Removes comment ID and maybe updates post comment count.
+ *
+ * The post comment count will be updated if the comment was approved and has a
+ * post ID available.
  *
  * @since 2.0.0
@@ -519 +547 @@
 
 /**
- * wp_get_comment_status() - The status of a comment by ID
+ * The status of a comment by ID.
  *
  * @since 1.0.0
@@ -546 +574 @@
 
 /**
- * wp_get_current_commenter() - Get current commenter's name, email, and URL
+ * Get current commenter's name, email, and URL.
  *
  * Expects cookies content to already be sanitized. User of this function
@@ -576 +604 @@
 
 /**
- * wp_insert_comment() - Inserts a comment to the database
+ * Inserts a comment to the database.
  *
  * {@internal Missing Long Description}}
@@ -617 +645 @@
 
 /**
- * wp_filter_comment() - Parses and returns comment information
- *
- * Sets the comment data 'filtered' field to true when finished. This
- * can be checked as to whether the comment should be filtered and to
- * keep from filtering the same comment more than once.
+ * Parses and returns comment information.
+ *
+ * Sets the comment data 'filtered' field to true when finished. This can be
+ * checked as to whether the comment should be filtered and to keep from
+ * filtering the same comment more than once.
  *
  * @since 2.0.0
@@ -648 +676 @@
 
 /**
- * wp_throttle_comment_flood() - {@internal Missing Short Description}}
+ * {@internal Missing Short Description}}
  *
  * {@internal Missing Long Description}}
@@ -668 +696 @@
 
 /**
- * wp_new_comment() - Parses and adds a new comment to the database
+ * Parses and adds a new comment to the database.
  *
  * {@internal Missing Long Description}}
@@ -716 +744 @@
 
 /**
- * wp_set_comment_status() - Sets the status of comment ID
+ * Sets the status of comment ID.
  *
  * {@internal Missing Long Description}}
@@ -763 +791 @@
 
 /**
- * wp_update_comment() - Parses and updates an existing comment in the database
+ * Parses and updates an existing comment in the database.
  *
  * {@internal Missing Long Description}}
@@ -822 +850 @@
 
 /**
- * wp_defer_comment_counting() - Whether to defer comment counting
+ * Whether to defer comment counting.
  *
  * When setting $defer to true, all post comment counts will not be updated
@@ -849 +877 @@
 
 /**
- * wp_update_comment_count() - Updates the comment count for post(s)
- *
- * When $do_deferred is false (is by default) and the comments have been
- * set to be deferred, the post_id will be added to a queue, which will
- * be updated at a later date and only updated once per post ID.
- *
- * If the comments have not be set up to be deferred, then the post will
- * be updated. When $do_deferred is set to true, then all previous deferred
- * post IDs will be updated along with the current $post_id.
+ * Updates the comment count for post(s).
+ *
+ * When $do_deferred is false (is by default) and the comments have been set to
+ * be deferred, the post_id will be added to a queue, which will be updated at a
+ * later date and only updated once per post ID.
+ *
+ * If the comments have not be set up to be deferred, then the post will be
+ * updated. When $do_deferred is set to true, then all previous deferred post
+ * IDs will be updated along with the current $post_id.
  *
  * @since 2.1.0
@@ -888 +916 @@
 
 /**
- * wp_update_comment_count_now() - Updates the comment count for the post
+ * Updates the comment count for the post.
  *
  * @since 2.5
@@ -926 +954 @@
 
 /**
- * discover_pingback_server_uri() - Finds a pingback server URI based on the given URL
+ * Finds a pingback server URI based on the given URL.
  *
  * {@internal Missing Long Description}}
@@ -1022 +1050 @@
 
 /**
- * do_all_pings() - {@internal Missing Short Description}}
+ * {@internal Missing Short Description}}
  *
  * {@internal Missing Long Description}}
@@ -1055 +1083 @@
 
 /**
- * do_trackbacks() - {@internal Missing Short Description}}
+ * {@internal Missing Short Description}}
  *
  * {@internal Missing Long Description}}
@@ -1099 +1127 @@
 
 /**
- * generic_ping() - {@internal Missing Short Description}}
+ * {@internal Missing Short Description}}
  *
  * {@internal Missing Long Description}}
@@ -1122 +1150 @@
 
 /**
- * pingback() - Pings back the links found in a post
+ * Pings back the links found in a post.
  *
  * {@internal Missing Long Description}}
@@ -1199 +1227 @@
 
 /**
- * privacy_ping_filter() - {@internal Missing Short Description}}
+ * {@internal Missing Short Description}}
  *
  * {@internal Missing Long Description}}
@@ -1216 +1244 @@
 
 /**
- * trackback() - Send a Trackback
- *
- * {@internal Missing Long Description}}
+ * Send a Trackback.
+ *
+ * Updates database when sending trackback to prevent duplicates.
  *
  * @since 0.71
@@ -1224 +1252 @@
  * @uses $wp_version WordPress version
  *
- * @param string $trackback_url {@internal Missing Description}}
- * @param string $title {@internal Missing Description}}
- * @param string $excerpt {@internal Missing Description}}
- * @param int $ID {@internal Missing Description}}
- * @return unknown {@internal Missing Description}}
+ * @param string $trackback_url URL to send trackbacks.
+ * @param string $title Title of post
+ * @param string $excerpt Excerpt of post
+ * @param int $ID Post ID
+ * @return mixed Database query from update
  */
 function trackback($trackback_url, $title, $excerpt, $ID) {
@@ -1262 +1290 @@
 
 /**
- * weblog_ping() - {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
+ * Send a pingback.
  *
  * @since 1.2.0
@@ -1270 +1296 @@
  * @uses IXR_Client
  *
- * @param unknown_type $server
- * @param unknown_type $path
+ * @param string $server Host of blog to connect to.
+ * @param string $path Path to send the ping.
  */
 function weblog_ping($server = '', $path = '') {
@@ -1294 +1320 @@
 
 /**
- * clean_comment_cache() - Removes comment ID from the comment cache
+ * Removes comment ID from the comment cache.
  *
  * @since 2.3.0
@@ -1307 +1333 @@
 
 /**
- * update_comment_cache() - Updates the comment cache of given comments
+ * Updates the comment cache of given comments.
  *
  * Will add the comments in $comments to the cache. If comment ID already

branches/crazyhorse/wp-includes/formatting.php

@@ -1133 +1133 @@
     $output = str_replace('>', '>', $output);
 
+    // These should be entities too
+    $output = str_replace('<', '&lt;', $output);
+    $output = str_replace('>', '&gt;', $output);
+    
     return apply_filters('richedit_pre', $output);
 }

branches/crazyhorse/wp-includes/functions.php

@@ -1 +1 @@
 <?php
-
+/**
+ * Main WordPress API
+ *
+ * @package WordPress
+ */
+
+/**
+ * Converts MySQL DATETIME field to user specified date format.
+ *
+ * If $dateformatstring has 'G' value, then gmmktime() function will be used to
+ * make the time. If $dateformatstring is set to 'U', then mktime() function
+ * will be used to make the time.
+ *
+ * The $translate will only be used, if it is set to true and it is by default
+ * and if the $wp_locale object has the month and weekday set.
+ *
+ * @since 0.71
+ *
+ * @param string $dateformatstring Either 'G', 'U', or php date format.
+ * @param string $mysqlstring Time from mysql DATETIME field.
+ * @param bool $translate Optional. Default is true. Will switch format to locale.
+ * @return string Date formated by $dateformatstring or locale (if available).
+ */
 function mysql2date( $dateformatstring, $mysqlstring, $translate = true ) {
     global $wp_locale;
@@ -52 +74 @@
 }
 
-
+/**
+ * Retrieve the current time based on specified type.
+ *
+ * The 'mysql' type will return the time in the format for MySQL DATETIME field.
+ * The 'timestamp' type will return the current timestamp.
+ *
+ * If the $gmt is set to either '1' or 'true', then both types will use the
+ * GMT offset in the WordPress option to add the GMT offset to the time.
+ *
+ * @since 1.0.0
+ *
+ * @param string $type Either 'mysql' or 'timestamp'.
+ * @param int|bool $gmt Optional. Whether to use $gmt offset. Default is false.
+ * @return unknown
+ */
 function current_time( $type, $gmt = 0 ) {
     switch ( $type ) {
@@ -89 +125 @@
 }
 
-
+/**
+ * Convert number to format based on the locale.
+ *
+ * @since 2.3.0
+ *
+ * @param mixed $number The number to convert based on locale.
+ * @param int $decimals Precision of the number of decimal places.
+ * @return string Converted number in string format.
+ */
 function number_format_i18n( $number, $decimals = null ) {
     global $wp_locale;
@@ -98 +142 @@
 }
 
-
+/**
+ * Convert number of bytes largest unit bytes will fit into.
+ *
+ * It is easier to read 1kB than 1024 bytes and 1MB than 1048576 bytes. Converts
+ * number of bytes to human readable number by taking the number of that unit
+ * that the bytes will go into it. Supports TB value.
+ *
+ * Please note that integers in PHP are limited to 32 bits, unless they are on
+ * 64 bit architecture, then they have 64 bit size. If you need to place the
+ * larger size then what PHP integer type will hold, then use a string. It will
+ * be converted to a double, which should always have 64 bit length.
+ *
+ * Technically the correct unit names for powers of 1024 are KiB, MiB etc.
+ * @link http://en.wikipedia.org/wiki/Byte
+ *
+ * @since 2.3.0
+ *
+ * @param int|string $bytes Number of bytes. Note max integer size for integers.
+ * @param int $decimals Precision of number of decimal places.
+ * @return unknown
+ */
 function size_format( $bytes, $decimals = null ) {
-    // technically the correct unit names for powers of 1024 are KiB, MiB etc
-    // see http://en.wikipedia.org/wiki/Byte
     $quant = array(
         // ========================= Origin ====
@@ -145 +207 @@
 }
 
-
+/**
+ * Unserialize value only if it was serialized.
+ *
+ * @since 2.0.0
+ *
+ * @param string $original Maybe unserialized original, if is needed.
+ * @return mixed Unserialized data can be any type.
+ */
 function maybe_unserialize( $original ) {
     if ( is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
@@ -153 +222 @@
 }
 
-
+/**
+ * Check value to find if it was serialized.
+ *
+ * If $data is not an string, then returned value will always be false.
+ * Serialized data is always a string.
+ *
+ * @since 2.0.5
+ *
+ * @param mixed $data Value to check to see if was serialized.
+ * @return bool False if not serialized and true if it was.
+ */
 function is_serialized( $data ) {
     // if it isn't a string, it isn't serialized
@@ -180 +259 @@
 }
 
-
+/**
+ * Check whether serialized data is of string type.
+ *
+ * @since 2.0.5
+ *
+ * @param mixed $data Serialized data
+ * @return bool False if not a serialized string, true if it is.
+ */
 function is_serialized_string( $data ) {
     // if it isn't a string, it isn't a serialized string
@@ -191 +277 @@
 }
 
-
 /* Options functions */
 
-// expects $setting to already be SQL-escaped
+/**
+ * Retrieve option value based on setting name.
+ *
+ * {@internal Missing Long Description}}
+ *
+ * @since 1.5.0
+ * @package WordPress
+ * @subpackage Option
+ *
+ * @param string $setting Name of option to retrieve. Should already be SQL-escaped
+ * @return mixed Value set for the option.
+ */
 function get_option( $setting ) {
     global $wpdb;
@@ -244 +340 @@
 }
 
-
+/**
+ * Protect WordPress special option from being modified.
+ *
+ * Will die if $option is in protected list.
+ *
+ * @since 2.2.0
+ * @package WordPress
+ * @subpackage Option
+ *
+ * @param string $option Option name.
+ */
 function wp_protect_special_option( $option ) {
     $protected = array( 'alloptions', 'notoptions' );
@@ -251 +357 @@
 }
 
+/**
+ * Print option value after sanitizing for forms.
+ *
+ * @uses attribute_escape Sanitizes value.
+ * @since 1.5.0
+ * @package WordPress
+ * @subpackage Option
+ *
+ * @param string $option Option name.
+ */
 function form_option( $option ) {
     echo attribute_escape (get_option( $option ) );
@@ -405 +521 @@
 function maybe_serialize( $data ) {
     if ( is_string( $data ) )
-        $data = trim( $data );
+        return $data;
     elseif ( is_array( $data ) || is_object( $data ) )
         return serialize( $data );
@@ -537 +653 @@
 }
 
-// perform a HTTP HEAD or GET request
-// if $file_path is a writable filename, this will do a GET request and write the file to that path
-// returns a list of HTTP headers
+/**
+ * Perform a HTTP HEAD or GET request.
+ *
+ * If $file_path is a writable filename, this will do a GET request and write
+ * the file to that path.
+ *
+ * @since unknown
+ *
+ * @param string $url
+ * @param string|bool $file_path Optional. File path to write request to.
+ * @param int $red Optional. Number of Redirects. Stops at 5 redirects.
+ * @return bool|string False on failure and string of headers if HEAD request.
+ */
 function wp_get_http( $url, $file_path = false, $red = 1 ) {
     global $wp_version;
@@ -611 +737 @@
 }
 
+/**
+ * Retrieve HTTP Headers from URL.
+ *
+ * @since 1.5.1
+ *
+ * @param string $url
+ * @param int $red Optional. Number of redirects.
+ * @return bool|string False on failure, headers on success.
+ */
 function wp_get_http_headers( $url, $red = 1 ) {
     return wp_get_http( $url, false, $red );
 }
 
-
+/**
+ * Whether today is a new day.
+ *
+ * {@internal Need to find out how this function is used.}}
+ *
+ * @since 0.71
+ * @uses $day Today
+ * @uses $previousday Previous day
+ *
+ * @return int 1 when new day, 0 if not a new day.
+ */
 function is_new_day() {
     global $day, $previousday;
@@ -629 +774 @@
 }
 
-
-/*
-add_query_arg: Returns a modified querystring by adding
-a single key & value or an associative array.
-Setting a key value to emptystring removes the key.
-Omitting oldquery_or_uri uses the $_SERVER value.
-
-Parameters:
-add_query_arg(newkey, newvalue, oldquery_or_uri) or
-add_query_arg(associative_array, oldquery_or_uri)
-*/
+/**
+ * Retrieve a modified query string.
+ *
+ * {@internal Missing Long Description}}
+ *
+ * Adding a single key & value or an associative array.
+ * Setting a key value to emptystring removes the key.
+ * Omitting oldquery_or_uri uses the $_SERVER value.
+ *
+ * @since 1.5.0
+ *
+ * @param mixed $param1 Either newkey or an associative_array
+ * @param mixed $param2 Either newvalue or oldquery or uri
+ * @param mixed $param3 Optional. Old query or uri
+ * @return unknown
+ */
 function add_query_arg() {
     $ret = '';
@@ -705 +855 @@
 }
 
-
-/*
-remove_query_arg: Returns a modified querystring by removing
-a single key or an array of keys.
-Omitting oldquery_or_uri uses the $_SERVER value.
-
-Parameters:
-remove_query_arg(removekey, [oldquery_or_uri]) or
-remove_query_arg(removekeyarray, [oldquery_or_uri])
-*/
-
-function remove_query_arg( $key, $query=FALSE ) {
+/**
+ * Removes an item or list from the query string.
+ *
+ * @since 1.5.0
+ *
+ * @param string|array $key Query key or keys to remove.
+ * @param bool $query When false uses the $_SERVER value.
+ * @return unknown
+ */
+function remove_query_arg( $key, $query=false ) {
     if ( is_array( $key ) ) { // removing multiple keys
         foreach ( (array) $key as $k )
-            $query = add_query_arg( $k, FALSE, $query );
+            $query = add_query_arg( $k, false, $query );
         return $query;
     }
-    return add_query_arg( $key, FALSE, $query );
-}
-
-
+    return add_query_arg( $key, false, $query );
+}
+
+/**
+ * Walks the array while sanitizing the contents.
+ *
+ * @uses $wpdb Used to sanitize values
+ *
+ * @param array $array Array to used to walk while sanitizing contents.
+ * @return array Sanitized $array.
+ */
 function add_magic_quotes( $array ) {
     global $wpdb;
@@ -783 +938 @@
 }
 
-
+/**
+ * Retrieve the description for the HTTP status.
+ *
+ * @since 2.3.0
+ *
+ * @param int $code HTTP status code.
+ * @return string Empty string if not found, or description if found.
+ */
 function get_status_header_desc( $code ) {
     global $wp_header_to_desc;
@@ -863 +1025 @@
 }
 
-
+/**
+ * Sets the headers to prevent caching for the different browsers.
+ *
+ * Different browsers support different nocache headers, so several headers must
+ * be sent so that all of them get the point that no caching should occur.
+ *
+ * @since 2.0.0
+ */
 function nocache_headers() {
     // why are these @-silenced when other header calls aren't?
@@ -872 +1041 @@
 }
 
-
+/**
+ * Set the headers for caching for 10 days with JavaScript content type.
+ *
+ * @since 2.1.0
+ */
 function cache_javascript_headers() {
     $expiresOffset = 864000; // 10 days
@@ -880 +1053 @@
 }
 
-
+/**
+ * Retrieve the number of database queries during the WordPress execution.
+ *
+ * @since 2.0.0
+ *
+ * @return int Number of database queries
+ */
 function get_num_queries() {
     global $wpdb;
@@ -886 +1065 @@
 }
 
-
+/**
+ * Whether input is yes or no. Must be 'y' to be true.
+ *
+ * @since 1.0.0
+ *
+ * @param string $yn Character string containing either 'y' or 'n'
+ * @return bool True if yes, false on anything else
+ */
 function bool_from_yn( $yn ) {
     return ( strtolower( $yn ) == 'y' );
@@ -912 +1098 @@
 }
 
-
+/**
+ * Load the RDF RSS 0.91 Feed template.
+ *
+ * @since 2.1.0
+ */
 function do_feed_rdf() {
     load_template( ABSPATH . WPINC . '/feed-rdf.php' );
 }
 
-
+/**
+ * Load the RSS 1.0 Feed Template
+ *
+ * @since 2.1.0
+ */
 function do_feed_rss() {
     load_template( ABSPATH . WPINC . '/feed-rss.php' );
 }
 
-
+/**
+ * Load either the RSS2 comment feed or the RSS2 posts feed.
+ *
+ * @since 2.1.0
+ *
+ * @param bool $for_comments True for the comment feed, false for normal feed.
+ */
 function do_feed_rss2( $for_comments ) {
     if ( $for_comments )
@@ -930 +1130 @@
 }
 
-
+/**
+ * Load either Atom comment feed or Atom posts feed.
+ *
+ * @since 2.1.0
+ *
+ * @param bool $for_comments True for the comment feed, false for normal feed.
+ */
 function do_feed_atom( $for_comments ) {
     if ($for_comments)
@@ -938 +1144 @@
 }
 
+/**
+ * Display the robot.txt file content.
+ *
+ * The echo content should be with usage of the permalinks or for creating the
+ * robot.txt file.
+ *
+ * @since 2.1.0
+ * @uses do_action() Calls 'do_robotstxt' hook for displaying robot.txt rules.
+ */
 function do_robots() {
     header( 'Content-Type: text/plain; charset=utf-8' );
@@ -1512 +1727 @@
 }
 
-
+/**
+ * Merge user defined arguments into defaults array.
+ *
+ * This function is used throughout WordPress to allow for both string or array
+ * to be merged into another array.
+ *
+ * @since 2.2.0
+ *
+ * @param string|array $args Value to merge with $defaults
+ * @param array $defaults Array that serves as the defaults.
+ * @return array Merged user defined values with defaults.
+ */
 function wp_parse_args( $args, $defaults = '' ) {
     if ( is_object( $args ) )
@@ -1526 +1752 @@
 }
 
-
+/**
+ * Determines if Widgets library should be loaded.
+ *
+ * Checks to make sure that the widgets library hasn't already been loaded. If
+ * it hasn't, then it will load the widgets library and run an action hook.
+ *
+ * @since 2.2.0
+ * @uses add_action() Calls '_admin_menu' hook with 'wp_widgets_add_menu' value.
+ */
 function wp_maybe_load_widgets() {
     if ( !function_exists( 'dynamic_sidebar' ) ) {
@@ -1534 +1768 @@
 }
 
-
+/**
+ * Append the Widgets menu to the themes main menu.
+ *
+ * @since 2.2.0
+ * @uses $submenu The administration submenu list.
+ */
 function wp_widgets_add_menu() {
     global $submenu;
@@ -1541 +1780 @@
 }
 
-
-// For PHP 5.2, make sure all output buffers are flushed
-// before our singletons our destroyed.
+/**
+ * Flush all output buffers for PHP 5.2.
+ *
+ * Make sure all output buffers are flushed before our singletons our destroyed.
+ *
+ * @since 2.2.0
+ */
 function wp_ob_end_flush_all() {
     while ( @ob_end_flush() );
@@ -1549 +1792 @@
 
 
-/*
- * require_wp_db() - require_once the correct database class file.
- *
- * This function is used to load the database class file either at runtime or by wp-admin/setup-config.php
- * We must globalise $wpdb to ensure that it is defined globally by the inline code in wp-db.php
- *
- * @global $wpdb
+/**
+ * Load the correct database class file.
+ *
+ * This function is used to load the database class file either at runtime or by
+ * wp-admin/setup-config.php We must globalise $wpdb to ensure that it is
+ * defined globally by the inline code in wp-db.php.
+ *
+ * @since 2.5
+ * @global $wpdb WordPress Database Object
  */
 function require_wp_db() {
@@ -1565 +1810 @@
 }
 
+
+/**
+ * Load custom DB error or display WordPress DB error.
+ *
+ * If a file exists in the wp-content directory named db-error.php, then it will
+ * be loaded instead of displaying the WordPress DB error. If it is not found,
+ * then the WordPress DB error will be displayed instead.
+ *
+ * The WordPress DB error sets the HTTP status header to 500 to try to prevent
+ * search engines from caching the message. Custom DB messages should do the
+ * same.
+ *
+ * @since 2.5
+ * @uses $wpdb
+ */
 function dead_db() {
     global $wpdb;
@@ -1598 +1858 @@
 }
 
-/**
- * Converts input to an absolute integer
+
+/**
+ * Converts value to positive integer.
+ *
+ * @since 2.5
+ * 
  * @param mixed $maybeint data you wish to have convered to an absolute integer
  * @return int an absolute integer
@@ -1607 +1871 @@
 }
 
-/**
- * Determines if the blog can be accessed over SSL
- * @return bool whether of not SSL access is available
+
+/**
+ * Determines if the blog can be accessed over SSL.
+ *
+ * Determines if blog can be accessed over SSL by using cURL to access the site
+ * using the https in the siteurl. Requires cURL extension to work correctly.
+ *
+ * @since 2.5
+ *
+ * @return bool Whether or not SSL access is available
  */
 function url_is_accessable_via_ssl($url)
@@ -1634 +1905 @@
 }
 
+
+/**
+ * Secure URL, if available or the given URL.
+ *
+ * @since 2.5
+ *
+ * @param string $url Complete URL path with transport.
+ * @return string Secure or regular URL path.
+ */
 function atom_service_url_filter($url)
 {
     if ( url_is_accessable_via_ssl($url) )
-        return  preg_replace( '/^http:\/\//', 'https://',  $url );
+        return preg_replace( '/^http:\/\//', 'https://',  $url );
     else
         return $url;
 }
 
-/**
- * _deprecated_function() - Marks a function as deprecated and informs when it has been used.
- *
- * There is a hook deprecated_function_run that will be called that can be used to get the backtrace
- * up to what file and function called the deprecated function.
- *
- * The current behavior is to trigger an user error if WP_DEBUG is defined and is true.
+
+/**
+ * Marks a function as deprecated and informs when it has been used.
+ *
+ * There is a hook deprecated_function_run that will be called that can be used
+ * to get the backtrace up to what file and function called the deprecated
+ * function.
+ *
+ * The current behavior is to trigger an user error if WP_DEBUG is defined and
+ * is true.
  *
  * This function is to be used in every function in depreceated.php
@@ -1677 +1960 @@
 }
 
-/**
- * _deprecated_file() - Marks a file as deprecated and informs when it has been used.
- *
- * There is a hook deprecated_file_included that will be called that can be used to get the backtrace
- * up to what file and function included the deprecated file.
- *
- * The current behavior is to trigger an user error if WP_DEBUG is defined and is true.
+
+/**
+ * Marks a file as deprecated and informs when it has been used.
+ *
+ * There is a hook deprecated_file_included that will be called that can be used
+ * to get the backtrace up to what file and function included the deprecated
+ * file.
+ *
+ * The current behavior is to trigger an user error if WP_DEBUG is defined and
+ * is true.
  *
  * This function is to be used in every file that is depreceated
@@ -1712 +1998 @@
 }
 
-/**
- * is_lighttpd_before_150() - Is the server running earlier than 1.5.0 version of lighttpd
+
+/**
+ * Is the server running earlier than 1.5.0 version of lighttpd
+ *
+ * @since unknown
  *
  * @return bool Whether the server is running lighttpd < 1.5.0
@@ -1723 +2012 @@
 }
 
-/**
- * apache_mod_loaded() - Does the specified module exist in the apache config?
+
+/**
+ * Does the specified module exist in the apache config?
+ *
+ * @since unknown
  *
  * @param string $mod e.g. mod_rewrite
@@ -1750 +2042 @@
 }
 
+
+/**
+ * File validates against allowed set of defined rules.
+ *
+ * A return value of '1' means that the $file contains either '..' or './'. A
+ * return value of '2' means that the $file contains ':' after the first
+ * character. A return value of '3' means that the file is not in the allowed
+ * files list.
+ *
+ * @since 2.6
+ *
+ * @param string $file File path.
+ * @param array $allowed_files List of allowed files.
+ * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
+ */
 function validate_file( $file, $allowed_files = '' ) {
     if ( false !== strpos( $file, '..' ))
@@ -1766 +2073 @@
 }
 
+
+/**
+ * Determine if SSL is used.
+ *
+ * @since 2.6
+ *
+ * @return bool True if SSL, false if not used.
+ */
 function is_ssl() {
     return ( 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
 }
 
+
+/**
+ * Whether SSL login should be forced.
+ *
+ * @since 2.6
+ *
+ * @param string|bool $force Optional.
+ * @return bool True if forced, false if not forced.
+ */
 function force_ssl_login($force = '') {
     static $forced;
 
     if ( '' != $force ) {
-        $old_forcded = $forced;
+        $old_forced = $forced;
         $forced = $force;
         return $old_forced;
@@ -1782 +2106 @@
 }
 
+
+/**
+ * Whether to force SSL used for the Administration Panels.
+ *
+ * @since 2.6
+ *
+ * @param string|bool $force
+ * @return bool True if forced, false if not forced.
+ */
 function force_ssl_admin($force = '') {
     static $forced;
 
     if ( '' != $force ) {
-        $old_forcded = $forced;
+        $old_forced = $forced;
         $forced = $force;
         return $old_forced;

branches/crazyhorse/wp-includes/js/thickbox/thickbox.css

@@ -117 +117 @@
     position: fixed;
     display:none;
-    height:13px;
-    width:208px;
     z-index:103;
     top: 50%;
     left: 50%;
-    margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
+    background-color: #E8E8E8;
+    border: 4px solid #525252;
+    margin: -45px 0pt 0pt -125px;
+    padding: 40px 15px 15px;
 }
 

branches/crazyhorse/wp-includes/js/tinymce/langs/wp-langs.php

@@ -398 +398 @@
 wp_page_alt:"' . mce_escape( __('Next page...') ) . '"
 });
+
+tinyMCE.addI18n("' . $language . '.wpeditimage",{
+edit_img:"' . mce_escape( __('Edit Image') )  . '",
+adv_settings:"' . mce_escape( __('Advanced Settings') )  . '",
+none:"' . mce_escape( __('None') )  . '",
+size:"' . mce_escape( __('Size') ) . '",
+thumbnail:"' . mce_escape( __('Thumbnail') ) . '",
+medium:"' . mce_escape( __('Medium') ) . '",
+full_size:"' . mce_escape( __('Full Size') ) . '",
+alt_help:"' . js_escape( __('Alternate text, e.g. "The Mona Lisa"') )  . '",
+current_link:"' . mce_escape( __('Current Link') ) . '",
+link_to_img:"' . mce_escape( __('Link to Image') ) . '",
+link_help:"' . mce_escape( __('Enter a link URL or click above for presets.') ) . '",
+adv_img_settings:"' . mce_escape( __('Advanced Image Settings') ) . '",
+source:"' . mce_escape( __('Source') )  . '",
+width:"' . mce_escape( __('Width') ) . '",
+height:"' . mce_escape( __('Height') ) . '",
+orig_size:"' . mce_escape( __('Original Size') ) . '",
+css:"' . mce_escape( __('CSS Class') ) . '",
+adv_link_settings:"' . mce_escape( __('Advanced Link Settings') )  . '",
+link_rel:"' . mce_escape( __('Link Rel') ) . '",
+height:"' . mce_escape( __('Height') ) . '",
+orig_size:"' . mce_escape( __('Original Size') ) . '",
+css:"' . mce_escape( __('CSS Class') ) . '",
+caption:"' . mce_escape( __('Caption') ) . '"
+});
 '; 
 ?>

branches/crazyhorse/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css

@@ -39 +39 @@
 }
 
+img.alignright,
 .alignright {
     float: right;
 }
 
+img.alignleft,
 .alignleft {
     float: left;
 }
 
-.aligncenter {
+img.aligncenter {
     display: block;
     margin-left: auto;
@@ -62 +64 @@
 
 .show-align {
-    padding: 8px;
     height: 200px;
+    width: 480px;
+    float: right;
     background-color: #f1f1f1;
     cursor: default;
@@ -74 +77 @@
     border: 1px solid #c0c0c0;
     width: 623px;
-    margin: 20px auto auto;
+    margin: 15px auto;
 }
 
@@ -91 +94 @@
 
 #img_demo {
-    padding: 0 5px 4px;
+    padding: 0;
 }
 
@@ -138 +141 @@
 
 #media-upload h3 {
-    clear:both;
-    padding:0pt 0pt 3px;
-    border-bottom-style:solid;
-    border-bottom-width:1px;
-    font-family:Georgia,"Times New Roman",Times,serif;
-    font-size:20px;
-    font-weight:normal;
-    line-height:normal;
-    margin:20px 0 15px -4px;
-    padding:0 0 3px 0;
-    border-bottom-color:#DADADA;
-    color:#5A5A5A;
+    clear: both;
+    padding: 0pt 0pt 3px;
+    border-bottom-style: solid;
+    border-bottom-width: 1px;
+    font-family: Georgia,"Times New Roman",Times,serif;
+    font-size: 20px;
+    font-weight: normal;
+    line-height: normal;
+    margin: 0 0 10px -4px;
+    padding: 15px 0 3px;
+    border-bottom-color: #DADADA;
+    color: #5A5A5A;
 }
 
 #img_dim #width,
-#img_dim #height {
-    width:40px;
+#img_dim #height,
+#img_prop #border,
+#img_prop #vspace,
+#img_prop #hspace {
+    width: 36px;
 }
 
@@ -161 +167 @@
 }
 
-#basic .align .field label {
-    margin: 0 10px 0 0;
-    padding: 0 0 0 25px;
+#show_align_sp {
+    width: 115px;
 }
 
+#img_dim input,
+#img_prop input {
+    margin-right: 10px;
+}
+

branches/crazyhorse/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

@@ -1 +1 @@
 <!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"  dir="ltr" lang="en-US">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10 +10 @@
 <link rel="stylesheet" href="css/editimage.css?ver=3091" type="text/css" media="all" />
 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-bleeding2" type="text/css" media="all" />
+<script type="text/javascript">
+if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
+    document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=3091" type="text/css" media="all" />');
+</script>
 <base target="_self" />
 </head>
@@ -16 +20 @@
 <div id="media-upload-header">
     <ul id="sidemenu">
-    <li><a href="javascript:;" id="tab_basic" class="current" onclick="wpImage.setTabs(this);">Edit image</a></li>
-    <li><a href="javascript:;" id="tab_advanced" onclick="wpImage.setTabs(this);">Advanced settings</a></li>
-    <li><a href="javascript:;" id="tab_attachment" style="display:none" target="_blanc" onclick="tinyMCEPopup.close();">Edit Attachment</a></li>
+    <li><a href="javascript:;" id="tab_basic" class="current" onclick="wpImage.setTabs(this);">{#wpeditimage.edit_img}</a></li>
+    <li><a href="javascript:;" id="tab_advanced" onclick="wpImage.setTabs(this);">{#wpeditimage.adv_settings}</a></li>
     </ul>
 </div>
 
 <div id="img-edit">
-    <form class="media-upload-form" action="" onsubmit="wpImage.update();">
-    <div id="div_basic">
-
-    <div class="show-align">
+<form class="media-upload-form" action="" onsubmit="wpImage.update();">
+
+    <label for="show_align">
+        <span id="show_align_sp" class="alignleft">{#preview.preview_desc}</span>
+    </label>
+    <div class="show-align" id="show_align">
         <img id="img_demo" src="img/image.png" alt="" />
         <span id="img_demo_txt">
@@ -32 +37 @@
         Ut lorem In penatibus libero id ipsum sagittis nec elit Sed. Condimentum eget Vivamus vel consectetuer lorem molestie turpis amet tellus id. Condimentum vel ridiculus Fusce sed pede Nam nunc sodales eros tempor. Sit lacus magna dictumst Curabitur fringilla auctor id vitae wisi facilisi. Fermentum eget turpis felis velit leo Nunc Proin orci molestie Praesent. Curabitur tellus scelerisque suscipit ut sem amet cursus mi Morbi eu. Donec libero Vestibulum augue et mollis accumsan ornare condimentum In enim. Leo eget ac consectetuer quis condimentum malesuada.
         Condimentum commodo et Lorem fringilla malesuada libero volutpat sem tellus enim. Tincidunt sed at Aenean nec nonummy porttitor Nam Sed Nulla ut. Auctor leo In aliquet Curabitur eros et velit Quisque justo morbi. Et vel mauris sit nulla semper vitae et quis at dui. Id at elit laoreet justo eu mauris Quisque et interdum pharetra. Nullam accumsan interdum Maecenas condimentum quis quis Fusce a sollicitudin Sed. Non Quisque Vivamus congue porttitor non semper ipsum porttitor quis vel. Donec eros lacus volutpat et tincidunt sem convallis id venenatis sit. Consectetuer odio.
-        Semper faucibus Morbi nulla convallis orci Aliquam Sed porttitor et Pellentesque. Venenatis laoreet lorem id a a Morbi augue turpis id semper. Arcu volutpat ac mauris Vestibulum fringilla Aenean condimentum nibh sed id. Sagittis eu lacus orci urna tellus tellus pretium Curabitur dui nunc. Et nibh eu eu nibh adipiscing at lorem Vestibulum adipiscing augue. Magna convallis Phasellus dolor malesuada Curabitur ornare adipiscing tellus Aliquam tempus. Id Aliquam Integer augue Nulla consectetuer ac Donec Curabitur tincidunt et. Id vel Nunc amet lacus dui magna ridiculus penatibus laoreet Duis. Enim sagittis nibh quis Nulla nec laoreet vel Maecenas mattis vel. Nullam velit est Curabitur gravida Vestibulum justo.
+        Semper faucibus Morbi nulla convallis orci Aliquam Sed porttitor et Pellentesque. Venenatis laoreet lorem id a a Morbi augue turpis id semper. Arcu volutpat ac mauris Vestibulum fringilla Aenean condimentum nibh sed id. Sagittis eu lacus orci urna tellus tellus pretium Curabitur dui nunc. Et nibh eu eu nibh adipiscing at lorem Vestibulum adipiscing augue. Magna convallis Phasellus dolor malesuada Curabitur ornare adipiscing tellus Aliquam tempus. Id Aliquam Integer augue Nulla consectetuer ac Donec Curabitur tincidunt et. Id vel Nunc amet lacus dui magna ridiculus penatibus laoreet Duis. Enim sagittis nibh quis Nulla nec laoreet vel Maecenas mattis vel.
         </span>
     </div>
 
-    <table id="basic" class="describe"> 
+    <div id="div_basic">
+    <table id="basic" class="describe">
         <tbody>
-        <tr class="">
-            <th valign="top" scope="row" class="label">
-                <label for="img_title">
-                <span class="alignleft">Title</span>
-                <span class="alignright"><abbr title="required" class="required">*</abbr></span>
-                </label>
-            </th>
-            <td class="field">
-                <input type="text" id="img_title" name="img_title" value="" aria-required="true" size="60" />
-            </td>
-        </tr>
-
-        <tr class="post_excerpt">
-            <th valign="top" scope="row" class="label">
-                <label for="img_alt">
-                <span class="alignleft">Caption</span>
-                </label>
-            </th>
-            <td class="field">
-                <input type="text" id="img_alt" name="img_alt" value="" size="60" />
-                <p class="help">Alternate text, e.g. "The Mona Lisa"</p>
-            </td>
-        </tr>
-
-        <tr class="url">
-            <th valign="top" scope="row" class="label">
-                <label for="link_href">
-                <span class="alignleft" id="lb_link_href">Link URL</span>
-                </label>
-            </th>
-            <td class="field">
-                <input type="text" id="link_href" name="link_href" value="" /><br />
-                <input type="button" class="button" onclick="wpImage.I('link_href').value='';" value="None" />
-                <input type="button" class="button" id="img_url_current" onclick="wpImage.img_seturl('current')" value="Current Link" />
-                <input type="button" class="button" id="img_url_img" onclick="wpImage.img_seturl('link')" value="Link to Image" />
-                <p class="help">Enter a link URL or click above for presets.</p>
-            </td>
-        </tr>
 
         <tr class="align">
             <th valign="top" scope="row" class="label">
                 <label for="img_align_td">
-                <span class="alignleft">{#advanced_dlg.image_align}</span>
+                <span class="alignleft">{#contextmenu.align}</span>
                 </label>
             </th>
             <td class="field" id="img_align_td">
                 <input type="radio" onclick="wpImage.imgAlignCls('alignnone')" name="img_align" id="alignnone" value="alignnone" />
-                <label for="alignnone" class="align image-align-none-label">None</label>
+                <label for="alignnone" class="align image-align-none-label">{#wpeditimage.none}</label>
 
                 <input type="radio" onclick="wpImage.imgAlignCls('alignleft')" name="img_align" id="alignleft" value="alignleft" />
-                <label for="alignleft" class="align image-align-left-label">{#advanced_dlg.image_align_left}</label>
+                <label for="alignleft" class="align image-align-left-label">{#contextmenu.left}</label>
 
                 <input type="radio" onclick="wpImage.imgAlignCls('aligncenter')" name="img_align" id="aligncenter" value="aligncenter" />
-                <label for="aligncenter" class="align image-align-center-label">Center</label>
+                <label for="aligncenter" class="align image-align-center-label">{#contextmenu.center}</label>
 
                 <input type="radio" onclick="wpImage.imgAlignCls('alignright')" name="img_align" id="alignright" value="alignright" />
-                <label for="alignright" class="align image-align-right-label">{#advanced_dlg.image_align_right}</label>
+                <label for="alignright" class="align image-align-right-label">{#contextmenu.right}</label>
             </td>
         </tr>
@@ -101 +69 @@
             <th valign="top" scope="row" class="label">
                 <label for="img_size">
-                <span class="alignleft">Size</span>
+                <span class="alignleft">{#wpeditimage.size}</span>
                 </label>
             </th>
             <td class="field" id="img_size">
                 <input onclick="wpImage.imgEditSize('thumbnail')" type="radio" name="img_size" id="thumbnail" value="thumbnail" />
-                <label for="thumbnail" id="lb_sizethumb">Thumbnail</label>
+                <label for="thumbnail" id="lb_sizethumb">{#wpeditimage.thumbnail}</label>
 
                 <input onclick="wpImage.imgEditSize('medium')" type="radio" name="img_size" id="medium" value="medium" />
-                <label for="medium" id="lb_sizemedium">Medium</label>
+                <label for="medium" id="lb_sizemedium">{#wpeditimage.medium}</label>
 
                 <input onclick="wpImage.imgEditSize('full')" type="radio" name="img_size" id="full" value="full" />
-                <label for="full" id="lb_sizefull">Full_size</label>
+                <label for="full" id="lb_sizefull">{#wpeditimage.full_size}</label>
+            </td>
+        </tr>
+
+        <tr class="">
+            <th valign="top" scope="row" class="label">
+                <label for="img_title">
+                <span class="alignleft">{#advanced_dlg.link_titlefield}</span>
+                <span class="alignright"><abbr title="required" class="required">*</abbr></span>
+                </label>
+            </th>
+            <td class="field">
+                <input type="text" id="img_title" name="img_title" value="" aria-required="true" size="60" />
+            </td>
+        </tr>
+
+        <tr class="post_excerpt">
+            <th valign="top" scope="row" class="label">
+                <label for="img_alt">
+                <span class="alignleft">{#wpeditimage.caption}</span>
+                </label>
+            </th>
+            <td class="field">
+                <input type="text" id="img_alt" name="img_alt" value="" size="60" />
+                <p class="help">{#wpeditimage.alt_help}</p>
+            </td>
+        </tr>
+
+        <tr class="url">
+            <th valign="top" scope="row" class="label">
+                <label for="link_href">
+                <span class="alignleft" id="lb_link_href">{#advanced_dlg.link_url}</span>
+                </label>
+            </th>
+            <td class="field">
+                <input type="text" id="link_href" name="link_href" value="" /><br />
+                <input type="button" class="button" onclick="wpImage.I('link_href').value='';" value="{#wpeditimage.none}" />
+                <input type="button" class="button" id="img_url_current" onclick="wpImage.img_seturl('current')" value="{#wpeditimage.current_link}" />
+                <input type="button" class="button" id="img_url_img" onclick="wpImage.img_seturl('link')" value="{#wpeditimage.link_to_img}" />
+                <p class="help">{#wpeditimage.link_help}</p>
             </td>
         </tr>
@@ -119 +126 @@
 
     <div id="div_advanced" style="display:none;">
-    <h3>Advanced Image Settings</h3>
-    <table id="adv_settings_img" class="describe">  
+    <h3>{#wpeditimage.adv_img_settings}</h3>
+    <table id="adv_settings_img" class="describe">
         <tbody>
         <tr>
             <th valign="top" scope="row" class="label">
                 <label for="img_src">
-                <span class="alignleft">Source</span>
+                <span class="alignleft">{#wpeditimage.source}</span>
                 <span class="alignright"><abbr title="required" class="required">*</abbr></span>
                 </label>
             </th>
             <td class="field">
-                <input type="text" id="img_src" name="img_src" value="" onblur="wpImage.checkVal(this)" size="60" />
-            </td>
-        </tr>
-
-        <tr>
-            <th valign="top" scope="row" class="label">
-                <label for="img_dim">
-                <span class="alignleft">Size</span>
-                <span class="alignright"></span>
-                </label>
-            </th>
-            <td class="field" id="img_dim">
-                <label for="width">Width</label>
-                <input type="text" id="width" name="width" value="" />
-                
-                <label for="height">Height</label>
-                <input type="text" id="height" name="height" value="" />
-                <input type="button" class="button" id="orig_size" name="orig_size" value="Original Size" onclick="wpImage.origSize();" />
-                
+                <input type="text" id="img_src" name="img_src" value="" onblur="wpImage.checkVal(this)" aria-required="true" size="60" />
+            </td>
+        </tr>
+
+        <tr id="img_dim">
+            <th valign="top" scope="row" class="label">
+                <label>
+                <span class="alignleft">{#wpeditimage.size}</span>
+                </label>
+            </th>
+            <td class="field">
+                <label for="width">{#wpeditimage.width}</label>
+                <input type="text" maxlength="5" id="width" name="width"  value="" />
+
+                <label for="height">{#wpeditimage.height}</label>
+                <input type="text" maxlength="5" id="height" name="height" value="" />
+
+                <input type="button" class="button" id="orig_size" name="orig_size" value="{#wpeditimage.orig_size}" onclick="wpImage.origSize();" />
             </td>
         </tr>
@@ -155 +161 @@
             <th valign="top" scope="row" class="label">
                 <label for="img_classes">
-                <span class="alignleft">CSS Class</span>
+                <span class="alignleft">{#wpeditimage.css}</span>
                 </label>
             </th>
@@ -166 +172 @@
             <th valign="top" scope="row" class="label">
                 <label for="img_style">
-                <span class="alignleft">Style</span>
-                </label>
-            </th>
-            <td class="field">
-                <input type="text" id="img_style" name="img_style" value="" size="60" />
+                <span class="alignleft">{#advanced.style_select}</span>
+                </label>
+            </th>
+            <td class="field">
+                <input type="text" id="img_style" name="img_style" value="" size="60" onblur="wpImage.demoSetStyle();" />
+            </td>
+        </tr>
+
+        <tr id="img_prop">
+            <th valign="top" scope="row" class="label">
+                <label for="img_prop">
+                    <span class="alignleft">{#advanced.image_props_desc}</span>
+                </label>
+            </th>
+            <td class="field">
+                <label for="border">{#advanced_dlg.image_border}</label>
+                <input type="text" maxlength="5" id="border" name="border" value="" onblur="wpImage.updateStyle('border')" />
+
+                <label for="vspace">{#advanced_dlg.image_vspace}</label>
+                <input type="text" maxlength="5" id="vspace" name="vspace" value="" onblur="wpImage.updateStyle('vspace')" />
+
+                <label for="hspace">{#advanced_dlg.image_hspace}</label>
+                <input type="text" maxlength="5" id="hspace" name="hspace" value="" onblur="wpImage.updateStyle('hspace')" />
             </td>
         </tr>
@@ -176 +200 @@
     </table>
 
-    <h3>Advanced Link Settings</h3>
-    <table id="adv_settings_img" class="describe">  
+    <h3>{#wpeditimage.adv_link_settings}</h3>
+    <table id="adv_settings_link" class="describe">
         <tbody>
         <tr>
             <th valign="top" scope="row" class="label">
                 <label for="link_title">
-                <span class="alignleft">Link Title</span>
+                <span class="alignleft">{#advanced_dlg.link_titlefield}</span>
                 </label>
             </th>
@@ -193 +217 @@
             <th valign="top" scope="row" class="label">
                 <label for="link_rel">
-                <span class="alignleft">Link Rel</span>
+                <span class="alignleft">{#wpeditimage.link_rel}</span>
                 </label>
             </th>
@@ -203 +227 @@
         <tr>
             <th valign="top" scope="row" class="label">
-                <label for="link_rev">
-                <span class="alignleft">Link Rev</span>
-                </label>
-            </th>
-            <td class="field">
-                <input type="text" id="link_rev" name="link_rev" value="" size="60" />
-            </td>
-        </tr>
-
-        <tr>
-            <th valign="top" scope="row" class="label">
                 <label for="link_classes">
-                <span class="alignleft">CSS Class</span>
+                <span class="alignleft">{#wpeditimage.css}</span>
                 </label>
             </th>
@@ -226 +239 @@
             <th valign="top" scope="row" class="label">
                 <label for="link_style">
-                <span class="alignleft">Style</span>
+                <span class="alignleft">{#advanced.style_select}</span>
                 </label>
             </th>
@@ -236 +249 @@
         <tr>
             <th valign="top" scope="row" class="label">
+                <label>
+                <span class="alignleft">{#advanced_dlg.link_target}</span>
+                </label>
+            </th>
+            <td class="field">
                 <label for="link_target">
-                <span class="alignleft">Target</span>
-                </label>
-            </th>
-            <td class="field">
-                <input type="text" id="link_target" name="link_target" value="" size="60" />
+                {#advanced_dlg.link_target_blank}
+                </label>
+                <input type="checkbox" id="link_target" name="link_target" value="_blank" />
             </td>
         </tr>
@@ -248 +264 @@
 
     <div id="saveeditimg">
-        <input type="hidden" id="border" name="border" value="" />
-        <input type="hidden" id="hspace" name="hspace" value="" />
-        <input type="hidden" id="vspace" name="vspace" value="" />
         <input type="hidden" id="align" name="align" value="" />
 

branches/crazyhorse/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js

@@ -95 +95 @@
     link : '',
     link_rel : '',
+    target_value : '',
 
     setTabs : function(tab) {
@@ -180 +181 @@
                 m = Math.min(W, m);
                 f.width.value = m;
-                f.height.value = Math.floor((m / W) * H);
+                f.height.value = Math.round((m / W) * H);
             } else {
                 m = Math.min(H, m);
                 f.height.value = m;
-                f.width.value = Math.floor((m / H) * W);
+                f.width.value = Math.round((m / H) * W);
             }
 
@@ -196 +197 @@
         var demo = this.I('img_demo'), f = document.forms[0];
 
-        demo.style.width = f.width.value ? Math.floor(f.width.value * 0.6) + 'px' : '';
-        demo.style.height = f.height.value ? Math.floor(f.height.value * 0.6) + 'px' : '60%';
+        demo.width = f.width.value ? Math.floor(f.width.value * 0.5) : '';
+        demo.height = f.height.value ? Math.floor(f.height.value * 0.5) : '';
+    },
+    
+    demoSetStyle : function() {
+        var f = document.forms[0], demo = this.I('img_demo');
+
+        if (demo)
+            tinyMCEPopup.editor.dom.setAttrib(demo, 'style', f.img_style.value);
     },
     
@@ -218 +226 @@
             h = h.replace(/ (value|title|alt)=([^"][^\s>]+)/gi, ' $1="$2"')
 
-        document.dir = ed.getParam('directionality','');
         document.body.innerHTML = ed.translate(h);
         window.setTimeout( function(){wpImage.setup();}, 100 );
@@ -224 +231 @@
 
     setup : function() {
-        var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), tr = ed.translate;
-
+        var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom;
+    document.dir = tinyMCEPopup.editor.getParam('directionality','');
         tinyMCEPopup.restoreSelection();
         el = ed.selection.getNode();
@@ -242 +249 @@
         f.img_classes.value = c = ed.dom.getAttrib(el, 'class');
         f.img_style.value = ed.dom.getAttrib(el, 'style');
-        this.updateStyle();
+        
+        // Move attribs to styles
+        if (dom.getAttrib(el, 'align'))
+            t.updateStyle('align');
+
+        if (dom.getAttrib(el, 'hspace'))
+            t.updateStyle('hspace');
+
+        if (dom.getAttrib(el, 'border'))
+            t.updateStyle('border');
+
+        if (dom.getAttrib(el, 'vspace'))
+            t.updateStyle('vspace');
 
         if (pa = ed.dom.getParent(el, 'A')) {
@@ -248 +267 @@
             f.link_title.value = ed.dom.getAttrib(pa, 'title');
             f.link_rel.value = t.link_rel = ed.dom.getAttrib(pa, 'rel');
-            f.link_rev.value = ed.dom.getAttrib(pa, 'rev');
             f.link_style.value = ed.dom.getAttrib(pa, 'style');
-            f.link_target.value = ed.dom.getAttrib(pa, 'target');
+            t.target_value = ed.dom.getAttrib(pa, 'target');
             f.link_classes.value = ed.dom.getAttrib(pa, 'class');
         }
 
+        f.link_target.checked = ( t.target_value && t.target_value == '_blank' ) ? 'checked' : '';
+        
         fname = link.substring( link.lastIndexOf('/') );
         fname = fname.replace(/-[0-9]{2,4}x[0-9]{2,4}/, '' );
@@ -281 +301 @@
         document.body.style.display = '';
         t.getImageData();
-
-        if ( (id = c.match( /wp-image-([0-9]{1,6})/ )) && id[1] ) {
-            t.I('tab_attachment').href = tinymce.documentBaseURL + 'media.php?action=edit&attachment_id=' + id[1];
-            t.I('tab_attachment').style.display = 'inline';
-        }
+        t.demoSetStyle();
+
+        // Test if is attachment
+//      if ( (id = c.match( /wp-image-([0-9]{1,6})/ )) && id[1] ) {
+//          t.I('tab_attachment').href = tinymce.documentBaseURL + 'media.php?action=edit&attachment_id=' + id[1];
+//          t.I('tab_attachment').style.display = 'inline';
+//      }
     },
 
@@ -351 +373 @@
                         title : f.link_title.value,
                         rel : f.link_rel.value,
-                        rev : f.link_rev.value,
-                        target : f.link_target.value,
+                        target : (f.link_target.checked == true) ? '_blank' : '',
                         'class' : f.link_classes.value,
                         style : f.link_style.value
@@ -363 +384 @@
                 title : f.link_title.value,
                 rel : f.link_rel.value,
-                rev : f.link_rev.value,
-                target : f.link_target.value,
+                target : (f.link_target.checked == true) ? '_blank' : '',
                 'class' : f.link_classes.value,
                 style : f.link_style.value
@@ -373 +393 @@
         tinyMCEPopup.close();
     },
-
-    updateStyle : function() {
-        var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];
+    
+    updateStyle : function(ty) {
+        var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : f.img_style.value});
 
         if (tinyMCEPopup.editor.settings.inline_styles) {
-            st = tinyMCEPopup.dom.parseStyle(f.img_style.value);
-
             // Handle align
-            v = f.align.value;
-            if (v) {
-                if (v == 'left' || v == 'right') {
-                    st['float'] = v;
-                    delete st['vertical-align'];
-                } else {
-                    st['vertical-align'] = v;
-                    delete st['float'];
+            if (ty == 'align') {
+                dom.setStyle(img, 'float', '');
+                dom.setStyle(img, 'vertical-align', '');
+
+                v = f.align.value;
+                if (v) {
+                    if (v == 'left' || v == 'right')
+                        dom.setStyle(img, 'float', v);
+                    else
+                        img.style.verticalAlign = v;
                 }
-            } else {
-                delete st['float'];
-                delete st['vertical-align'];
             }
 
             // Handle border
-            v = f.border.value;
-            if (v || v == '0') {
-                if (v == '0')
-                    st['border'] = '0';
-                else
-                    st['border'] = v + 'px solid black';
-            } else
-                delete st['border'];
+            if (ty == 'border') {
+                dom.setStyle(img, 'border', '');
+
+                v = f.border.value;
+                if (v || v == '0') {
+                    if (v == '0')
+                        img.style.border = '0';
+                    else
+                        img.style.border = v + 'px solid black';
+                }
+            }
 
             // Handle hspace
-            v = f.hspace.value;
-            if (v) {
-                delete st['margin'];
-                st['margin-left'] = v + 'px';
-                st['margin-right'] = v + 'px';
-            } else {
-                delete st['margin-left'];
-                delete st['margin-right'];
+            if (ty == 'hspace') {
+                dom.setStyle(img, 'marginLeft', '');
+                dom.setStyle(img, 'marginRight', '');
+
+                v = f.hspace.value;
+                if (v) {
+                    img.style.marginLeft = v + 'px';
+                    img.style.marginRight = v + 'px';
+                }
             }
 
             // Handle vspace
-            v = f.vspace.value;
-            if (v) {
-                delete st['margin'];
-                st['margin-top'] = v + 'px';
-                st['margin-bottom'] = v + 'px';
-            } else {
-                delete st['margin-top'];
-                delete st['margin-bottom'];
+            if (ty == 'vspace') {
+                dom.setStyle(img, 'marginTop', '');
+                dom.setStyle(img, 'marginBottom', '');
+
+                v = f.vspace.value;
+                if (v) {
+                    img.style.marginTop = v + 'px';
+                    img.style.marginBottom = v + 'px';
+                }
             }
 
             // Merge
-            st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st));
-            f.img_style.value = dom.serializeStyle(st);
+            f.img_style.value = dom.serializeStyle(dom.parseStyle(img.style.cssText));
+            this.demoSetStyle();
         }
     },
@@ -445 +467 @@
         var f = document.forms[0];
 
-        f.width.value = f.height.value = "";    
+        f.width.value = f.height.value = '';    
     },
 

branches/crazyhorse/wp-includes/js/tinymce/tiny_mce_config.php

@@ -227 +227 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080606');
+    $cacheKey = apply_filters('tiny_mce_version', '20080613');
 
     foreach ( $initArray as $v )

branches/crazyhorse/wp-includes/pluggable.php

@@ -316 +316 @@
                         $content_type = trim( $content );
                     }
+                } elseif ( 'cc' == strtolower($name) ) {
+                    $cc = explode(",", $content);
+                } elseif ( 'bcc' == strtolower($name) ) {
+                    $bcc = explode(",", $content);
                 } else {
                     // Add it to our grand headers array
@@ -360 +364 @@
     $phpmailer->Subject = $subject;
     $phpmailer->Body = $message;
+
+    // Add any CC and BCC recipients
+    if ( !empty($cc) ) {
+        foreach ($cc as $recipient) {
+            $phpmailer->AddCc( trim($recipient) );
+        }
+    }
+    if ( !empty($bcc) ) {
+        foreach ($bcc as $recipient) {
+            $phpmailer->AddBcc( trim($recipient) );
+        }
+    }
 
     // Set to use PHP's mail()

branches/crazyhorse/wp-includes/post.php

@@ -1 +1 @@
 <?php
 /**
- * Post functions and post utility function
+ * Post functions and post utility function.
+ *
+ * Warning: The inline documentation for the functions contained
+ * in this file might be inaccurate, so the documentation is not
+ * authoritative at the moment.
  *
  * @package WordPress
@@ -751 +755 @@
 
 /**
- * wp_count_posts() - Count number of posts with a given type
- *
- * {@internal Missing Long Description}}
+ * Count number of posts of a post type and is permissible.
+ *
+ * This function provides an efficient method of finding the amount
+ * of post's type a blog has. Another method is to count the amount
+ * of items in get_posts(), but that method has a lot of overhead
+ * with doing so. Therefore, when developing for 2.5+, use this
+ * function instead.
+ *
+ * The $perm parameter checks for 'readable' value and if the user
+ * can read private posts, it will display that for the user that
+ * is signed in.
  *
  * @package WordPress
  * @subpackage Post
  * @since 2.5
- *
- * @param string $type Post type
- * @return array Number of posts for each status
+ * @link http://codex.wordpress.org/Template_Tags/wp_count_posts
+ *
+ * @param string $type Optional. Post type to retrieve count
+ * @param string $perm Optional. 'readable' or empty.
+ * @return object Number of posts for each status
  */
 function wp_count_posts( $type = 'post', $perm = '' ) {
@@ -1814 +1828 @@
 function get_page_uri($page_id) {
     $page = get_page($page_id);
-    $uri = urldecode($page->post_name);
+    $uri = $page->post_name;
 
     // A page cannot be it's own parent.
@@ -1822 +1836 @@
     while ($page->post_parent != 0) {
         $page = get_page($page->post_parent);
-        $uri = urldecode($page->post_name) . "/" . $uri;
+        $uri = $page->post_name . "/" . $uri;
     }
 

branches/crazyhorse/wp-includes/script-loader.php

@@ -36 +36 @@
 
     // Modify this version when tinyMCE plugins are changed.
-    $mce_version = apply_filters('tiny_mce_version', '20080606');
+    $mce_version = apply_filters('tiny_mce_version', '20080613');
     $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
 
@@ -227 +227 @@
     $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
     $styles->add( 'press-this', '/wp-admin/css/press-this.css' );
-    $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css' );
+    $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20080613' );
     $styles->add( 'login', '/wp-admin/css/login.css' );
 

branches/crazyhorse/wp-load.php

@@ -10 +10 @@
  * wp-config.php file.
  *
- * Also made to work in the wp-admin/ folder, because it
- * will look in the parent directory if the file is not
- * found in the current directory.
+ * Will also search for wp-config.php in WordPress' parent
+ * directory to allow the WordPress directory to remain
+ * untouched.
  *
  * @package WordPress

branches/crazyhorse/xmlrpc.php

@@ -111 +111 @@
         $this->methods = array(
             // WordPress API
+            'wp.getUsersBlogs'      => 'this:wp_getUsersBlogs',
             'wp.getPage'            => 'this:wp_getPage',
             'wp.getPages'           => 'this:wp_getPages',
@@ -253 +254 @@
             }
         }
+    }
+
+    /**
+     * WordPress XML-RPC API
+     * wp_getUsersBlogs
+     */
+    function wp_getUsersBlogs( $args ) {
+        // If this isn't on WPMU then just use blogger_getUsersBlogs
+        if( !function_exists( 'is_site_admin' ) ) {
+            array_unshift( $args, 1 );
+            return $this->blogger_getUsersBlogs( $args );
+        }
+
+        $this->escape( $args );
+
+        $username = $args[0];
+        $password = $args[1];
+
+        if( !$this->login_pass_ok( $username, $password ) )
+            return $this->error;
+
+        do_action( 'xmlrpc_call', 'wp.getUsersBlogs' );
+
+        $user = set_current_user( 0, $username );
+
+        $blogs = (array) get_blogs_of_user( $user->ID );
+        $struct = array( );
+
+        foreach( $blogs as $blog ) {
+            // Don't include blogs that aren't hosted at this site
+            if( $blog->site_id != 1 )
+                continue;
+
+            $blog_id = $blog->userblog_id;
+            switch_to_blog($blog_id);
+            $is_admin = current_user_can('level_8');
+
+            $struct[] = array(
+                'isAdmin'       => $is_admin,
+                'url'           => get_option( 'home' ) . '/',
+                'blogid'        => $blog_id,
+                'blogName'      => get_option( 'blogname' ),
+                'xmlrpc'        => get_option( 'home' ) . '/xmlrpc.php'
+            );
+        }
+
+        return $struct;
     }
 
@@ -842 +890 @@
             'url'      => get_option('home') . '/',
             'blogid'   => '1',
-            'blogName' => get_option('blogname')
+            'blogName' => get_option('blogname'),
+            'xmlrpc'   => get_option('home') . '/xmlrpc.php',
         );