Changeset 8335

Timestamp:

07/15/2008 02:01:08 AM (18 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8240:8334

Location:

branches/crazyhorse

Files:

• readme.html (modified) (2 diffs)
• wp-admin/admin-ajax.php (modified) (8 diffs)
• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/admin-post.php (copied) (copied from trunk/wp-admin/admin-post.php )
• wp-admin/admin.php (modified) (1 diff)
• wp-admin/css/colors-classic.css (modified) (2 diffs)
• wp-admin/css/colors-fresh.css (modified) (1 diff)
• wp-admin/css/dashboard-rtl.css (modified) (2 diffs)
• wp-admin/css/global-rtl.css (modified) (2 diffs)
• wp-admin/css/install-rtl.css (modified) (2 diffs)
• wp-admin/css/install.css (modified) (8 diffs)
• wp-admin/css/login-rtl.css (modified) (1 diff)
• wp-admin/css/media.css (modified) (3 diffs)
• wp-admin/css/press-this-ie-rtl.css (copied) (copied from trunk/wp-admin/css/press-this-ie-rtl.css )
• wp-admin/css/press-this-ie.css (copied) (copied from trunk/wp-admin/css/press-this-ie.css )
• wp-admin/css/press-this-rtl.css (copied) (copied from trunk/wp-admin/css/press-this-rtl.css )
• wp-admin/css/press-this.css (modified) (16 diffs)
• wp-admin/css/theme-editor-rtl.css (modified) (1 diff)
• wp-admin/gears-manifest.php (modified) (6 diffs)
• wp-admin/images/no.png (copied) (copied from trunk/wp-admin/images/no.png )
• wp-admin/images/required.gif (copied) (copied from trunk/wp-admin/images/required.gif )
• wp-admin/images/yes.png (copied) (copied from trunk/wp-admin/images/yes.png )
• wp-admin/import/wp-cat2tag.php (modified) (2 diffs)
• wp-admin/includes/class-wp-filesystem-base.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (21 diffs)
• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (2 diffs)
• wp-admin/includes/template.php (modified) (7 diffs)
• wp-admin/includes/update.php (modified) (1 diff)
• wp-admin/includes/widgets.php (modified) (1 diff)
• wp-admin/install.php (modified) (2 diffs)
• wp-admin/js/editor.js (modified) (2 diffs)
• wp-admin/js/gallery.js (modified) (3 diffs)
• wp-admin/js/media-upload.js (modified) (1 diff)
• wp-admin/js/revisions-js.php (copied) (copied from trunk/wp-admin/js/revisions-js.php )
• wp-admin/press-this.php (modified) (33 diffs)
• wp-admin/revision.php (modified) (1 diff)
• wp-admin/rtl.css (modified) (3 diffs)
• wp-admin/setup-config.php (modified) (3 diffs)
• wp-admin/upgrade.php (modified) (3 diffs)
• wp-admin/wp-admin.css (modified) (3 diffs)
• wp-app.php (modified) (2 diffs)
• wp-config-sample.php (modified) (1 diff)
• wp-content/themes/classic/style.css (modified) (4 diffs)
• wp-content/themes/default/style.css (modified) (5 diffs)
• wp-includes/category-template.php (modified) (5 diffs)
• wp-includes/class.wp-scripts.php (modified) (1 diff)
• wp-includes/class.wp-styles.php (modified) (1 diff)
• wp-includes/classes.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (2 diffs)
• wp-includes/feed.php (modified) (15 diffs)
• wp-includes/formatting.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (4 diffs)
• wp-includes/js/tinymce/langs/wp-langs.php (modified) (3 diffs)
• wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/wordpress/img/audio.gif (copied) (copied from trunk/wp-includes/js/tinymce/plugins/wordpress/img/audio.gif )
• wp-includes/js/tinymce/plugins/wordpress/img/image.gif (copied) (copied from trunk/wp-includes/js/tinymce/plugins/wordpress/img/image.gif )
• wp-includes/js/tinymce/plugins/wordpress/img/media.gif (copied) (copied from trunk/wp-includes/js/tinymce/plugins/wordpress/img/media.gif )
• wp-includes/js/tinymce/plugins/wordpress/img/video.gif (copied) (copied from trunk/wp-includes/js/tinymce/plugins/wordpress/img/video.gif )
• wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (4 diffs)
• wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (9 diffs)
• wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (9 diffs)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (3 diffs)
• wp-includes/js/tinymce/wordpress.css (modified) (3 diffs)
• wp-includes/link-template.php (modified) (5 diffs)
• wp-includes/media.php (modified) (4 diffs)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (5 diffs)
• wp-includes/theme.php (modified) (2 diffs)
• wp-includes/update.php (modified) (3 diffs)
• wp-includes/widgets.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)
• wp-includes/wp-diff.php (modified) (1 diff)
• wp-login.php (modified) (4 diffs)

branches/crazyhorse/readme.html

@@ -9 +9 @@
 <h1 id="logo" style="text-align: center">
         <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
-        <br /> Version 2.5
+        <br /> Version 2.6
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
@@ -30 +30 @@
 <h1>Upgrading</h1>
 <p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p>
-<h2>Upgrading from any previous WordPress to 2.5:</h2>
+<h2>Upgrading from any previous WordPress to 2.6:</h2>
 <ol>
         <li>Delete your old WP files, saving ones you've modified.</li>

branches/crazyhorse/wp-admin/admin-ajax.php

@@ -31 +31 @@
         check_ajax_referer( "delete-comment_$id" );
         if ( !$comment = get_comment( $id ) )
-                die('0');
+                die('1');
         if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
                 die('-1');
 
-        if ( isset($_POST['spam']) && 1 == $_POST['spam'] )
+        if ( isset($_POST['spam']) && 1 == $_POST['spam'] ) {
+                if ( 'spam' == wp_get_comment_status( $comment->comment_ID ) )
+                        die('1');
                 $r = wp_set_comment_status( $comment->comment_ID, 'spam' );
-        else
+        } else {
                 $r = wp_delete_comment( $comment->comment_ID );
+        }
 
         die( $r ? '1' : '0' );
@@ -47 +50 @@
                 die('-1');
 
+        $cat = get_category( $id );
+        if ( !$cat || is_wp_error( $cat ) )
+                die('1');
+
         if ( wp_delete_category( $id ) )
                 die('1');
-        else    die('0');
+        else
+                die('0');
         break;
 case 'delete-tag' :
@@ -56 +64 @@
                 die('-1');
 
+        $tag = get_term( $id, 'post_tag' );
+        if ( !$tag || is_wp_error( $tag ) )
+                die('1');
+
         if ( wp_delete_term($id, 'post_tag'))
                 die('1');
-        else    die('0');
+        else
+                die('0');
         break;
 case 'delete-link-cat' :
@@ -64 +77 @@
         if ( !current_user_can( 'manage_categories' ) )
                 die('-1');
+
+        $cat = get_term( $id, 'link_category' );
+        if ( !$cat || is_wp_error( $cat ) )
+                die('1');
 
         $cat_name = get_term_field('name', $id, 'link_category');
@@ -95 +112 @@
                 die('-1');
 
+        $link = get_bookmark( $id );
+        if ( !$link || is_wp_error( $link ) )
+                die('1');
+
         if ( wp_delete_link( $id ) )
                 die('1');
-        else    die('0');
+        else
+                die('0');
         break;
 case 'delete-meta' :
         check_ajax_referer( "delete-meta_$id" );
         if ( !$meta = get_post_meta_by_id( $id ) )
-                die('0');
+                die('1');
+
         if ( !current_user_can( 'edit_post', $meta->post_id ) )
                 die('-1');
@@ -114 +137 @@
                 die('-1');
 
+        if ( !get_post( $id ) )
+                die('1');
+
         if ( wp_delete_post( $id ) )
                 die('1');
@@ -124 +150 @@
                 die('-1');
 
+        if ( !get_page( $id ) )
+                die('1');
+
         if ( wp_delete_post( $id ) )
                 die('1');
-        else    die('0');
+        else
+                die('0');
         break;
 case 'dim-comment' :
         if ( !$comment = get_comment( $id ) )
                 die('0');
+
         if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
                 die('-1');
@@ -136 +167 @@
                 die('-1');
 
-        if ( in_array( wp_get_comment_status($comment->comment_ID), array( 'unapproved', 'spam' ) ) ) {
+        $current = wp_get_comment_status( $comment->comment_ID );
+        if ( $_POST['new'] == $current )
+                die('1');
+
+        if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
                 check_ajax_referer( "approve-comment_$id" );
                 if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )

branches/crazyhorse/wp-admin/admin-header.php

@@ -67 +67 @@
 <div id="wpcontent">
 <div id="wphead">
-<h1><a href="<?php echo clean_url( admin_url() ); ?>"><?php if ( '' == get_bloginfo('name') ) echo '&nbsp;'; else echo get_bloginfo('name'); ?></a><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1>
+<h1><a href="<?php echo clean_url( admin_url() ); ?>"><?php if ( '' == get_bloginfo('name', 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display'); ?></a><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1>
 </div>
 

branches/crazyhorse/wp-admin/admin.php

@@ -114 +114 @@
 }
 
+if ( !empty($_REQUEST['action']) )
+        do_action('admin_action_' . $_REQUEST['action']);
+
 ?>

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

@@ -325 +325 @@
 }
 
-#adminmenu li a #awaiting-mod span {
+#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
         background-color: #d54e21;
         color: #fff;
@@ -336 +336 @@
 
 
-#adminmenu li a:hover #awaiting-mod span {
+#adminmenu li a:hover #awaiting-mod span, #sidemenu li a:hover #update-plugins span {
         background-color: #07273E;
 }

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

@@ -302 +302 @@
 }
 
-#adminmenu li a #awaiting-mod span, #rightnow .reallynow {
+#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span, #rightnow .reallynow {
         background-color: #d54e21;
         color: #fff;
 }
 
-#adminmenu li a:hover #awaiting-mod span {
+#adminmenu li a:hover #awaiting-mod span, #sidemenu li a:hover #update-plugins span {
         background-color: #264761;
 }

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

@@ -23 +23 @@
 }
 
+div.dashboard-widget-submit input {
+        font-family: sans-serif !important;
+}
+        
 #dashboard-widgets .widget_rss ul li a {
         float:right;
@@ -64 +68 @@
         float: right;
 }
+#dashboard_secondary div.dashboard-widget-content ul li .post {
+        font-family: sans-serif !important;
+}
 #dashboard_secondary div.dashboard-widget-content ul li a {
         border-right:0 none;
         border-left:1px solid #DADADA;
 }
+#dashboard_secondary div.dashboard-widget-content ul li a cite {
+        font-family: sans-serif;
+}

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

@@ -1 @@
-/* styles for use by people extending the WordPress interface */
+//* styles for use by people extending the WordPress interface */
+body, td { font-family: sans-serif; }
+
+textarea, input, select { font-family: sans-serif; }
+
 .alignleft { float: right; }
 .alignright { float: left; }
@@ -5 +9 @@
 .textleft { text-align: right; }
 .textright { text-align: left; }
+        
+.wrap h2 { font-family: sans-serif; }
 
 .widefat td {

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

@@ -1 +1 @@
 body {
-        font-size: 11px;;
+        font-size: 11px;
+        font-family: sans-serif !important;
 }
 ul, ol {
@@ -18 +19 @@
         text-align: left;
 }
+.submit input, .button, .button-secondary {
+        font-family: sans-serif !important;
+}
+h1 {
+        font-family: sans-serif;
+}

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

@@ -8 +8 @@
         width: 700px;
         padding: 1em 2em;
+        -moz-border-radius: 12px;
+        -khtml-border-radius: 12px;
         -webkit-border-radius: 12px;
-        font-size: 62.5%;
+        border-radius: 12px;
 }
 
@@ -26 +28 @@
 p, li {
         padding-bottom: 2px;
-        font-size: 1.3em;
-        line-height: 1.8em;
+        font-size: 13px;
+        line-height: 18px;
 }
 
 code {
-        font-size: 1.3em;
+        font-size: 13px;
 }
 
@@ -38 +40 @@
 #logo { margin: 6px 0 14px 0px; border-bottom: none;}
 
-.step a, .step input { font-size: 2em; }
+.step {
+        margin: 20px 0 15px;
+}
 
-td input { font-size: 1.5em; }
+.step input {
+        font-size: 18px;
+}
+
+a.button {
+        font-size: 18px;
+}
 
 .step, th { text-align: left; padding: 0; }
@@ -46 +56 @@
 .submit input, .button, .button-secondary {
         font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-        padding: 6px;
-        border: none;
+        padding: 5px 7px 7px;
+        border: 1px solid #a3a3a3;
         margin-left: 0;
-        font-size: 13px !important;
-        -moz-border-radius: 2px;
-        -khtml-border-radius: 2px;
-        -webkit-border-radius: 2px;
-        border-radius: 2px;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
         color: #246;
         background: #e5e5e5;
@@ -64 +73 @@
 .submit input:hover, .button:hover, .button-secondary:hover {
         color: #d54e21;
+        border-color: #535353;
 }
 
@@ -76 +86 @@
         padding: 10px;
         border-bottom: 8px solid #fff;
+        font-size: 12px;
 }
 
 .form-table th {
-        font-size: 12px;
+        font-size: 13px;
         text-align: left;
-        padding: 12px 10px 10px 10px;
+        padding: 16px 10px 10px 10px;
         border-bottom: 8px solid #fff;
         width: 110px;
@@ -101 +112 @@
 }
 
+.form-table input {
+        line-height: 20px;
+        font-size: 15px;
+        padding: 2px;
+}
+
 h1 {
         border-bottom: 1px solid #dadada;
@@ -117 +134 @@
 #error-page p {
         font-size: 14px;
-        line-height: 1.6em;
+        line-height: 16px;
+        margin: 25px 0 20px;
 }
 
 #error-page code {
-        font-size: 1em;
+        font-size: 15px;
 }

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

@@ -1 +1 @@
 body {
-        font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+        font-family: sans-serif;
         direction: rtl;
+}
+#login form .submit input {
+        font-family: sans-serif !important;
 }
 form {

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

@@ -33 +33 @@
         display:block;
         font-weight: bold;
+        font-size: 13px;
         margin-bottom: 0.5em;
         margin: 0 0 0.5em 0;
@@ -229 +230 @@
 
 .filename {
+        float: left;
         line-height: 36px;
         margin-left: 10px;
-        float: left;
+        overflow: hidden;
+        max-width: 430px;
 }
 #media-upload .describe {
@@ -277 +280 @@
         margin: 5px 0;
 }
+
+.menu_order {
+        float: right;
+        font-size: 11px;
+        margin: 10px 10px 0;
+}
+
+.menu_order_input {
+        border: 1px solid #DDDDDD;
+        font-size: 10px;
+        padding: 1px;
+        width: 23px;
+}
+
+.ui-sortable-helper {
+        background-color: #fff;
+        border: 1px solid #aaa;
+        opacity: 0.6;
+        filter: alpha(opacity=60);
+}
+
+#media-upload th.order-head {
+         width: 25%;
+         text-align: center;
+}
+
+#media-upload .widefat {
+        width: 626px;
+        border-style: solid solid none;
+}
+
+.sorthelper {
+        z-index: -1;
+}

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

@@ -89 +89 @@
 }
 
+/* Header */
 #wphead {
         border-top: none;
-}
-
-.button {
-font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-padding: 3px 5px;
-font-size: 12px;
-line-height: 1.5em;
-border-width: 1px;
-border-style: solid;
--moz-border-radius: 3px;
--khtml-border-radius: 3px;
--webkit-border-radius: 3px;
-border-radius: 3px;
-cursor: pointer;
-margin-left: 5px;
-text-decoration: none;
-}
-
-.howto {
-font-size: 11px;
-}
-#newtag { width: 60%; padding: 3px; }
-
-#wphead {
         height: 2em;
         padding-top: 8px;
+}
+
+.button {
+        font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+        padding: 3px 5px;
+        font-size: 12px;
+        line-height: 1.5em;
+        border-width: 1px;
+        border-style: solid;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+        cursor: pointer;
+        margin-left: 5px;
+        text-decoration: none;
+}
+
+.howto {
+        font-size: 11px;
+        font-style: italic;
+        display: block;
 }
 
@@ -133 +132 @@
 
 #wphead #viewsite a {
-        font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana,
-                sans-serif;
+        font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
         padding: 3px 4px;
         display: block;
@@ -174 +172 @@
 }
 
+/* Editor/Main Column */
+
+div#container {
+        margin: 0;
+        min-width: 500px;
+}
+
+div#container form {
+        margin: 0px;
+        padding: 0px;
+}
+
+div#posting {
+        padding-left: 16px;
+        position: absolute;
+        z-index: 1;
+        width: 66%;
+}
+
+#post_title {
+        width: 99%;
+}
+
 .titlewrap {
         border-style: solid;
@@ -179 +200 @@
         padding: 2px 3px;
         border-color: #CCCCCC;
-}
-
-div#container {
-        margin: 0;
-        min-width: 500px;
-}
-
-div#posting {
-        padding-left: 16px;
-        position: absolute;
-        z-index: 1;
-        width: 66%;
 }
 
@@ -200 +209 @@
 }
 
-div#container form {
-        margin: 0px;
-        padding: 0px;
-}
-
-div#categories {
-        font-size: 85%;
-        position: absolute;
-        top: 50px;
-        right: 16px;
-        width: 27%;
-        z-index: 2;
-}
-
-div#categories h2 {
-        color: #333;
-        font-size: 12px;
-        margin: .5em 0 0 1em;
-        padding: 0;
-}
-
-#categories-all {
-        overflow: auto;
-        padding: 1em;
-        height: 15em;
-}
-
-#categories ul {
-        list-style: none;
-        padding: 0;
-        margin: 0;
-}
-
 .editor-container {
         border-width: 1px;
@@ -240 +216 @@
 }
 
-#tagsdiv #newtag {
-        margin-right: 5px;
-        width: 16em;
-}
-
-#tagchecklist {
-        padding-left: 1em;
-        margin-bottom: 1em;
-        font-size: 12px;
-        overflow: auto;
-}
-
-#tagchecklist strong {
-        position: absolute;
-        font-size: .75em;
-}
-
-#tagchecklist span {
-        margin-right: .5em;
-        margin-left: 10px;
-        display: block;
-        float: left;
-        font-size: 11px;
-        line-height: 1.8em;
-        white-space: nowrap;
-        cursor: default;
-}
-
-#tagchecklist span a {
-        margin: 6px 0pt 0pt -9px;
-        cursor: pointer;
-        width: 10px;
-        height: 10px;
-        display: block;
-        float: left;
-        text-indent: -9999px;
-        overflow: hidden;
-        position: absolute;
-}
-
-.howto {
-        font-style: italic;
-        display: block;
-}
-
-#post_title {
-        width: 99%;
+/* Photo Styles */
+
+#photo_directions {
+        margin-top: .25em;
+        display: block;
+        position: relative;
+}
+
+#photo_directions span {
+        display: block;
+        position: absolute;
+        top: 0;
+        right: 3px;
+}
+
+#photo_saving {
+        margin: 0 8px 8px;
+        vertical-align: middle;
 }
 
@@ -301 +248 @@
         float: left;
 }
+
 #img_container img {
         width: 75px;
@@ -315 +263 @@
 #img_container a:hover, #img_container a:active {
         border: 2px solid #000;
+}
+
+/* Submit Column */
+
+div#categories {
+        font-size: 85%;
+        position: absolute;
+        top: 50px;
+        right: 16px;
+        width: 27%;
+        z-index: 2;
+}
+
+div#categories h2 {
+        color: #333;
+        font-size: 12px;
+        margin: .5em 0 .5em 1em;
+        padding: 0;
+}
+
+#categories-all {
+        overflow: auto;
+        padding: 0 1em 1em 1em;
+        height: 15em;
+}
+
+#categories ul {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+}
+
+#tagsdiv #newtag {
+        padding: 3px;
+        margin-right: 5px;
+        width: 16em;    
+}
+
+#jaxtag {
+        clear: both;
+        padding-left: 1em;
+        margin: 0;
+}
+
+#tagchecklist {
+        padding-left: 1em;
+        margin-bottom: 1em;
+        font-size: 12px;
+        overflow: auto;
+}
+
+#tagchecklist strong {
+        position: absolute;
+        font-size: .75em;
+}
+
+#tagchecklist span {
+        margin-right: .5em;
+        margin-left: 10px;
+        display: block;
+        float: left;
+        font-size: 11px;
+        line-height: 1.8em;
+        white-space: nowrap;
+        cursor: default;
+}
+
+#tagchecklist span a {
+        margin: 6px 0pt 0pt -9px;
+        cursor: pointer;
+        width: 10px;
+        height: 10px;
+        display: block;
+        float: left;
+        text-indent: -9999px;
+        overflow: hidden;
+        position: absolute;
 }
 .submit {
@@ -326 +351 @@
         border-bottom-right-radius: 3px;
         margin: 0;
-        padding: 0;
+        padding: 10px;
 }
 .submitbox {
@@ -341 +366 @@
         border: none;
         text-align: left;
-        padding: 12px 10px 10px 10px;
+        padding: 6px 4px;
         font-size: 12px;
-        margin: 10px;
-
+        margin: 2px;
         -moz-border-radius: 3px;
         -khtml-border-radius: 3px;
@@ -364 +388 @@
 }
 
-.hidden {
-        display: none;
-}
-
+/* Video Styles */
 .video_split #extra_fields {
         width: 27%;
@@ -384 +405 @@
 }
 
-#jaxtag {
-        clear: both;
-        padding-left: 1em;
-}
-
 .ac_results {
         padding: 0;
@@ -414 +430 @@
 }
 
-
 .photolist {
-display: none;
+        display: none;
 }
 
 #extra_fields small {
-display: block;
-margin-top: .5em;
-padding-bottom: .25em;
+        display: block;
+        margin-top: .5em;
+        padding-bottom: .25em;
 }
 
 #TB_ajaxContent #options {
-position: absolute;
-top: 20px;
-right: 25px;
-background: white;
-padding: 5px;
+        position: absolute;
+        top: 20px;
+        right: 25px;
+        padding: 5px;
 }
 #TB_ajaxContent h3 {
-margin-bottom: .25em;
+        margin-bottom: .25em;
 }
 
@@ -463 +477 @@
 }
 
-#photo_directions {
-margin-top: .25em;
-display: block;
-position: relative;
-}
-#photo_directions span {
-display: block;
-position: absolute;
-top: 0;
-right: 3px;
-}
-#photo_saving {
-margin-bottom: 8px;
-}
-
 #post_status {
         margin-left: 10px;
@@ -484 +483 @@
 }
 
+/* Footer */
+
 #footer {
         height: 65px;
@@ -506 +507 @@
 #footer p a:hover {
         text-decoration: underline;
+}
+
+
+/* Utility Classes */
+.centered {
+        text-align: center;
+}
+
+.hidden {
+        display: none;
+}

branches/crazyhorse/wp-admin/css/theme-editor-rtl.css

@@ +1 @@
+#template textarea {
+        font-family: monospace !important;
+}
 #templateside {
         float:left;

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

@@ -65 +65 @@
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>_20080701",
+"version" : "<?php echo $man_version; ?>_20080710a",
 "entries" : [
 <?php echo $defaults; ?>
@@ -98 +98 @@
 { "url" : "images/wordpress-logo.png" },
 { "url" : "images/xit.gif" },
+{ "url" : "images/loading-publish.gif" },
+{ "url" : "images/loading.gif" },
+{ "url" : "images/required.gif" },
+{ "url" : "images/no.png" },
+{ "url" : "images/yes.png" },
 
 { "url" : "../wp-includes/images/crystal/archive.png" },
@@ -127 +132 @@
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311d" },
+{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=311" },
 
 { "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=311" },
@@ -141 +149 @@
 { "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
 { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311d" },
 { "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
 
@@ -154 +162 @@
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311d" },
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
 { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },
@@ -192 +200 @@
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" },
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif" }
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/image.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" }
 ]}

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

@@ -15 +15 @@
                         echo '</div>';
                 } else { ?>
-                        <div class="tablenav"><p style="margin:4px"><a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag">Categories to Tags</a>
-                        <a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag&amp;step=3">Tags to Categories</a></p></div>
+                        <div class="tablenav"><p style="margin:4px"><a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag"><?php _e( "Categories to Tags" ); ?></a>
+                        <a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag&amp;step=3"><?php _e( "Tags to Categories" ); ?></a></p></div>
 <?php   }
         }
@@ -53 +53 @@
                         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>';
+                        echo '<p>' . __('Hey there. Here you can selectively convert existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>';
                         echo '<p>' . __('Keep in mind that if you convert a category with child categories, the children become top-level orphans.') . '</p></div>';
 

branches/crazyhorse/wp-admin/includes/class-wp-filesystem-base.php

@@ -1 +1 @@
 <?php
 class WP_Filesystem_Base{
-        var $verbose = true;
+        var $verbose = false;
         var $cache = array();
         

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

@@ -27 +27 @@
 
 function the_media_upload_tabs() {
+        global $redir_tab;
         $tabs = media_upload_tabs();
 
         if ( !empty($tabs) ) {
                 echo "<ul id='sidemenu'>\n";
-                if ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
+                if ( isset($redir_tab) && array_key_exists($redir_tab, $tabs) )
+                        $current = $redir_tab;
+                elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
                         $current = $_GET['tab'];
                 else {
@@ -65 +68 @@
 function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
 
-        if ( empty($alt) ) return $html;
+        // CAPTIONS_OFF is temporary. Do not use it.
+        if ( empty($alt) || ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ) return $html;
         $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 
@@ -75 +79 @@
         if ( empty($align) ) $align = 'none';
 
-        $shcode = '[wp_caption id="' . $id . '" align="align' . $align
-        . '" width="' . $width . '" caption="' . $alt . '"]' . $html . '[/wp_caption]';
+        $shcode = '[caption id="' . $id . '" align="align' . $align
+        . '" width="' . $width . '" caption="' . $alt . '"]' . $html . '[/caption]';
 
         return apply_filters( 'image_add_caption_shortcode', $shcode, $html );
@@ -155 +159 @@
                         $content = $image_meta['caption'];
         }
-        
+
         $title = @$desc;
 
@@ -232 +236 @@
         $out = <<<EOF
 
-        <a href="{$image_upload_iframe_src}&amp;TB_iframe=true" class="thickbox" title='$image_title'><img src='images/media-button-image.gif' alt='$image_title' /></a>
-        <a href="{$video_upload_iframe_src}&amp;TB_iframe=true" class="thickbox" title='$video_title'><img src='images/media-button-video.gif' alt='$video_title' /></a>
-        <a href="{$audio_upload_iframe_src}&amp;TB_iframe=true" class="thickbox" title='$audio_title'><img src='images/media-button-music.gif' alt='$audio_title' /></a>
-        <a href="{$media_upload_iframe_src}&amp;TB_iframe=true" class="thickbox" title='$media_title'><img src='images/media-button-other.gif' alt='$media_title' /></a>
+        <a href="{$image_upload_iframe_src}&amp;TB_iframe=true" id="add_image" class="thickbox" title='$image_title'><img src='images/media-button-image.gif' alt='$image_title' /></a>
+        <a href="{$video_upload_iframe_src}&amp;TB_iframe=true" id="add_video" class="thickbox" title='$video_title'><img src='images/media-button-video.gif' alt='$video_title' /></a>
+        <a href="{$audio_upload_iframe_src}&amp;TB_iframe=true" id="add_audio" class="thickbox" title='$audio_title'><img src='images/media-button-music.gif' alt='$audio_title' /></a>
+        <a href="{$media_upload_iframe_src}&amp;TB_iframe=true" id="add_media" class="thickbox" title='$media_title'><img src='images/media-button-other.gif' alt='$media_title' /></a>
 
 EOF;
@@ -326 +330 @@
         }
 
-        if ( isset($_POST['save']) )
+        if ( isset($_POST['save']) ) {
                 $errors['upload_notice'] = __('Saved.');
+                return media_upload_gallery();
+        }
 
         return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
@@ -337 +343 @@
                 $file_array['tmp_name'] = download_url($file);
                 $desc = @$desc;
-                
+
                 $id = media_handle_sideload($file_array, $post_id, $desc);
                 $src = $id;
 
-                unset($file_array);
-
                 if ( is_wp_error($id) ) {
-                        $errors['upload_error'] = $id;
+                        @unlink($file_array['tmp_name']);
                         return $id;
                 }
@@ -388 +392 @@
         }
 
-        if ( isset($_POST['save']) )
+        if ( isset($_POST['save']) ) {
                 $errors['upload_notice'] = __('Saved.');
+                return media_upload_gallery();
+        }
 
         return wp_iframe( 'media_upload_type_form', 'audio', $errors, $id );
@@ -426 +432 @@
         }
 
-        if ( isset($_POST['save']) )
+        if ( isset($_POST['save']) ) {
                 $errors['upload_notice'] = __('Saved.');
+                return media_upload_gallery();
+        }
 
         return wp_iframe( 'media_upload_type_form', 'video', $errors, $id );
@@ -464 +472 @@
         }
 
-        if ( isset($_POST['save']) )
+        if ( isset($_POST['save']) ) {
                 $errors['upload_notice'] = __('Saved.');
+                return media_upload_gallery();
+        }
 
         return wp_iframe( 'media_upload_type_form', 'file', $errors, $id );
@@ -500 +510 @@
         if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
                 $form_fields['post_title']['required'] = true;
-                $form_fields['post_excerpt']['label'] = __('Caption');
-                $form_fields['post_excerpt']['helps'][] = __('Alternate text, e.g. "The Mona Lisa"');
+
+                // CAPTIONS_OFF is temporary. Do not use it.
+                if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
+                        $form_fields['post_excerpt']['label'] = __('Alternate Text');
+                        $form_fields['post_excerpt']['helps'][] = __('Alt text for the image, e.g. "The Mona Lisa"');
+                } else {
+                        $form_fields['post_excerpt']['label'] = __('Caption');
+                        $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
+                }
 
                 $form_fields['post_content']['label'] = __('Description');
@@ -590 +607 @@
         $link = get_attachment_link($post->ID);
 
+        // CAPTIONS_OFF is temporary. Do not use it.
+        if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF )
+                $alt = __('Alternate Text');
+        else
+                $alt = __('Caption');
+
         $form_fields = array(
                 'post_title'   => array(
@@ -596 +619 @@
                 ),
                 'post_excerpt' => array(
-                        'label'      => __('Caption'),
+                        'label'      => $alt,
                         'value'      => $edit_post->post_excerpt,
                 ),
@@ -676 +699 @@
 
 function get_media_item( $attachment_id, $args = null ) {
+        global $redir_tab;
+
         $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true );
         $args = wp_parse_args( $args, $default_args );
@@ -723 +748 @@
 
         $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
+        $display_title = wp_html_excerpt($display_title, 60);
+
+        $gallery = ( (isset($_REQUEST['tab']) && 'gallery' == $_REQUEST['tab']) || (isset($redir_tab) && 'gallery' == $redir_tab) ) ? true : false;
+        $order = '';
+
+        foreach ( $form_fields as $key => $val ) {
+                if ( 'menu_order' == $key ) {
+                        if ( $gallery )
+                                $order = '<div class="menu_order"> <input class="menu_order_input" type="text" id="attachments['.$attachment_id.'][menu_order]" name="attachments['.$attachment_id.'][menu_order]" value="'.$val['value'].'" /></div>';
+                        else
+                                $order = '<input type="hidden" name="attachments['.$attachment_id.'][menu_order]" value="'.$val['value'].'" />';
+
+                        unset($form_fields['menu_order']);
+                        break;
+                }
+        }
 
         $item = "
         $type
         $toggle_links
+        $order
         <div class='filename new'>$display_title</div>
         <table class='slidetoggle describe $class'>
@@ -960 +1002 @@
 </div>
 
+<script type="text/javascript">
+//<![CDATA[
+var addExtImage = {
+
+        width : '',
+        height : '',
+        align : 'alignnone',
+
+        insert : function() {
+                var t = this, html, f = document.forms[0], cls, title = '', alt = '', caption = null;
+
+                if ( '' == f.src.value || '' == t.width ) return false;
+
+                if ( f.title.value ) {
+                        title = f.title.value.replace(/['"<>]+/g, '');
+                        title = ' title="'+title+'"';
+                }
+
+                if ( f.alt.value ) {
+                        alt = f.alt.value.replace(/['"<>]+/g, '');
+<?php if ( ! defined('CAPTIONS_OFF') || true != CAPTIONS_OFF ) { // CAPTIONS_OFF is temporary. Do not use it. ?>
+                        caption = f.alt.value.replace(/'/g, '&#39;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+<?php } ?>
+                }
+
+                cls = caption ? '' : ' class="'+t.align+'"';
+
+                html = '<img alt="'+alt+'" src="'+f.src.value+'"'+title+cls+' width="'+t.width+'" height="'+t.height+'" />';
+
+                if ( f.url.value )
+                        html = '<a href="'+f.url.value+'">'+html+'</a>';
+
+                if ( caption )
+                        html = '[caption id="" align="'+t.align+'" width="'+t.width+'" caption="'+caption+'"]'+html+'[/caption]';
+
+                var win = window.dialogArguments || opener || parent || top;
+                win.send_to_editor(html);
+        },
+
+        resetImageData : function() {
+                var t = addExtImage;
+
+                t.width = t.height = '';
+                document.getElementById('go_button').style.color = '#bbb';
+                if ( ! document.forms[0].src.value )
+                        document.getElementById('status_img').src = 'images/required.gif';
+                else document.getElementById('status_img').src = 'images/no.png';
+        },
+
+        updateImageData : function() {
+                var t = addExtImage;
+
+                t.width = t.preloadImg.width;
+                t.height = t.preloadImg.height;
+                document.getElementById('go_button').style.color = '#333';
+                document.getElementById('status_img').src = 'images/yes.png';
+        },
+
+        getImageData : function() {
+                var t = addExtImage, src = document.forms[0].src.value;
+
+                if ( ! src ) {
+                        t.resetImageData();
+                        return false;
+                }
+                document.getElementById('status_img').src = 'images/loading.gif';
+                t.preloadImg = new Image();
+                t.preloadImg.onload = t.updateImageData;
+                t.preloadImg.onerror = t.resetImageData;
+                t.preloadImg.src = src;
+        }
+}
+//]]>
+</script>
+
 <div id="media-items">
 <div class="media-item media-blank">
@@ -971 +1088 @@
 
 function media_upload_gallery_form($errors) {
+        global $redir_tab;
+
+        $redir_tab = 'gallery';
         media_upload_header();
 
         $post_id = intval($_REQUEST['post_id']);
-
         $form_action_url = admin_url("media-upload.php?type={$GLOBALS['type']}&tab=gallery&post_id=$post_id");
-
 ?>
 
@@ -994 +1112 @@
 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>
-
+<table class="widefat">
+<thead><tr>
+<th><?php _e('Media'); ?></th>
+<th class="order-head"><?php _e('Order'); ?></th>
+</tr></thead>
+</table>
 <div id="media-items">
 <?php echo get_media_items($post_id, $errors); ?>
 </div>
+<p class="ml-submit">
 <input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
 <input type="submit" class="button insert-gallery" name="insert-gallery" value="<?php echo attribute_escape( __( 'Insert gallery into post' ) ); ?>" />
@@ -1003 +1127 @@
 <input type="hidden" name="type" value="<?php echo attribute_escape( $GLOBALS['type'] ); ?>" />
 <input type="hidden" name="tab" value="<?php echo attribute_escape( $GLOBALS['tab'] ); ?>" />
+</p>
 </form>
 <?php
@@ -1154 +1279 @@
 
 function type_form_image() {
-        return '
+        $form = '
         <table class="describe"><tbody>
                 <tr>
+                        <th valign="top" scope="row" class="label" style="width:120px;">
+                                <span class="alignleft"><label for="src">' . __('Source') . '</label></span>
+                                <span class="alignright"><img id="status_img" src="images/required.gif" title="required" alt="required" /></span>
+                        </th>
+                        <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()"></td>
+                </tr>
+
+                <tr>
                         <th valign="top" scope="row" class="label">
-                                <span class="alignleft"><label for="insertonly[src]">' . __('Image URL') . '</label></span>
+                                <span class="alignleft"><label for="title">' . __('Image Title') . '</label></span>
                                 <span class="alignright"><abbr title="required" class="required">*</abbr></span>
                         </th>
-                        <td class="field"><input id="insertonly[src]" name="insertonly[src]" value="" type="text" aria-required="true"></td>
-                </tr>
+                        <td class="field"><p><input id="title" name="title" value="" type="text" aria-required="true" /></p></td>
+                </tr>
+';
+        // CAPTIONS_OFF is temporary. Do not use it.
+        if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
+                $form .= '
                 <tr>
                         <th valign="top" scope="row" class="label">
-                                <span class="alignleft"><label for="insertonly[alt]">' . __('Description') . '</label></span>
-                                <span class="alignright"><abbr title="required" class="required">*</abbr></span>
+                                <span class="alignleft"><label for="alt">' . __('Alternate Text') . '</label></span>
                         </th>
-                        <td class="field"><input id="insertonly[alt]" name="insertonly[alt]" value="" type="text" aria-required="true"></td>
-                </tr>
-                <tr><td></td><td class="help">' . __('Alternate text, e.g. "The Mona Lisa"') . '</td></tr>
+                        <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
+                        <p class="help">' . __('Alt text for the image, e.g. "The Mona Lisa"') . '</p></td>
+                </tr>
+';
+
+        } else {
+                $form .= '
+                <tr>
+                        <th valign="top" scope="row" class="label">
+                                <span class="alignleft"><label for="alt">' . __('Image Caption') . '</label></span>
+                        </th>
+                        <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
+                        <p class="help">' . __('Also used as alternate text for the image') . '</p></td>
+                </tr>
+';
+        }
+                $form .= '
                 <tr class="align">
-                        <th valign="top" scope="row" class="label"><label for="insertonly[align]">' . __('Alignment') . '</label></th>
+                        <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
                         <td class="field">
-                                <input name="insertonly[align]" id="image-align-none-0" value="none" type="radio" checked="checked" />
-                                <label for="image-align-none-0" class="align image-align-none-label">' . __('None') . '</label>
-                                <input name="insertonly[align]" id="image-align-left-0" value="left" type="radio" />
-                                <label for="image-align-left-0" class="align image-align-left-label">' . __('Left') . '</label>
-                                <input name="insertonly[align]" id="image-align-center-0" value="center" type="radio" />
-                                <label for="image-align-center-0" class="align image-align-center-label">' . __('Center') . '</label>
-                                <input name="insertonly[align]" id="image-align-right-0" value="right" type="radio" />
-                                <label for="image-align-right-0" class="align image-align-right-label">' . __('Right') . '</label>
+                                <input name="align" id="align-none" value="alignnone" onclick="addExtImage.align=this.value" type="radio" checked="checked" />
+                                <label for="align-none" class="align image-align-none-label">' . __('None') . '</label>
+                                <input name="align" id="align-left" value="alignleft" onclick="addExtImage.align=this.value" type="radio" />
+                                <label for="align-left" class="align image-align-left-label">' . __('Left') . '</label>
+                                <input name="align" id="align-center" value="aligncenter" onclick="addExtImage.align=this.value" type="radio" />
+                                <label for="align-center" class="align image-align-center-label">' . __('Center') . '</label>
+                                <input name="align" id="align-right" value="alignright" onclick="addExtImage.align=this.value" type="radio" />
+                                <label for="align-right" class="align image-align-right-label">' . __('Right') . '</label>
                         </td>
                 </tr>
+
+                <tr>
+                        <th valign="top" scope="row" class="label">
+                                <span class="alignleft"><label for="url">' . __('Link URL') . '</label></span>
+                        </th>
+                        <td class="field"><input id="url" name="url" value="" type="text" /><br />
+
+                        <button type="button" class="button" value="" onclick="document.forms[0].url.value=null">' . __('None') . '</button>
+                        <button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
+                        <p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
+                </tr>
+
                 <tr>
                         <td></td>
                         <td>
-                                <input type="submit" class="button" name="insertonlybutton" value="' . attribute_escape(__('Insert into Post')) . '" />
+                                <input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . attribute_escape(__('Insert into Post')) . '" />
                         </td>
                 </tr>
         </tbody></table>
 ';
+
+        return $form;
 }
 
@@ -1278 +1442 @@
 }
 
+// support a GET parameter for disabling the flash uploader
+function media_upload_use_flash($flash) {
+        if ( array_key_exists('flash', $_REQUEST) )
+                $flash = !empty($_REQUEST['flash']);
+        return $flash;
+}
+
+add_filter('flash_uploader', 'media_upload_use_flash');
+
+function media_upload_flash_bypass() {
+        echo '<p class="upload-flash-bypass">';
+        printf( __('You are using the Flash uploader.  Problems?  Try the <a href="%s">Browser uploader</a> instead.'), clean_url(add_query_arg('flash', 0)) );
+        echo '</p>';
+}
+
+add_action('post-flash-upload-ui', 'media_upload_flash_bypass');
+
+function media_upload_html_bypass() {
+        echo '<p class="upload-html-bypass">';
+        if ( array_key_exists('flash', $_REQUEST) )
+                // the user manually selected the browser uploader, so let them switch back to Flash
+                printf( __('You are using the Browser uploader.  Try the <a href="%s">Flash uploader</a> instead.'), clean_url(add_query_arg('flash', 1)) );
+        else
+                // the user probably doesn't have Flash
+                printf( __('You are using the Browser uploader.') );
+
+        echo '</p>';
+}
+
+add_action('post-flash-upload-ui', 'media_upload_flash_bypass');
+add_action('post-html-upload-ui', 'media_upload_html_bypass');
+
+// make sure the GET parameter sticks when we submit a form
+function media_upload_bypass_url($url) {
+        if ( array_key_exists('flash', $_REQUEST) )
+                $url = add_query_arg('flash', intval($_REQUEST['flash']));
+        return $url;
+}
+
+add_filter('media_upload_form_url', 'media_upload_bypass_url');
+
+
+
 add_filter('async_upload_image', 'get_media_item', 10, 2);
 add_filter('async_upload_audio', 'get_media_item', 10, 2);

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

@@ -471 +471 @@
         $parent = get_admin_page_parent();
 
+        $page_type = 'admin';
         if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) {
                 if ( isset( $admin_page_hooks[$plugin_page] ))
@@ -477 +478 @@
                         if ( isset( $admin_page_hooks[$parent] ))
                                 $page_type = $admin_page_hooks[$parent];
-        } else {
-                if ( isset( $admin_page_hooks[$parent_page] ) ) {
-                        $page_type = $admin_page_hooks[$parent_page];
-                } else {
-                        $page_type = 'admin';
-                }
+        } else if ( isset( $admin_page_hooks[$parent_page] ) ) {
+                $page_type = $admin_page_hooks[$parent_page];
         }
 

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

@@ -94 +94 @@
                 $mn = $_POST['mn'];
                 $ss = $_POST['ss'];
+                $aa = ($aa <= 0 ) ? date('Y') : $aa;
+                $mm = ($mm <= 0 ) ? date('n') : $mm;
                 $jj = ($jj > 31 ) ? 31 : $jj;
+                $jj = ($jj <= 0 ) ? date('j') : $jj;
                 $hh = ($hh > 23 ) ? $hh -24 : $hh;
                 $mn = ($mn > 59 ) ? $mn -60 : $mn;
@@ -744 +747 @@
                 convert_urls : false,
                 apply_source_formatting : false,
-                remove_linebreaks : false,
+                remove_linebreaks : true,
                 accessibility_focus : false,
                 tab_focus : ":next",
                 plugins : "safari,inlinepopups",
                 entities : "38,amp,60,lt,62,gt",
-                force_p_newlines : true
+                force_p_newlines : true,
+                save_callback : 'switchEditors.saveCallback'
         });
         };

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

@@ -526 +526 @@
 
 /*
- * displays pages in hierarchical order
+ * displays pages in hierarchical order with paging support
  */
-
 function page_rows($pages, $pagenum = 1, $per_page = 20) {
         $level = 0;
@@ -539 +538 @@
         }
 
-        // 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
+        /* 
+         * arrange pages into two parts: top level pages and children_pages
+         * children_pages is two dimensional array, eg. 
+         * children_pages[10][] contains all sub-pages whose parent is 10. 
+         * It only takes O(N) to arrange this and it takes O(1) for subsequent lookup operations
+         * If searching, ignore hierarchy and treat everything as top level
+         */
         if ( empty($_GET['s']) )  {
+                
+                $top_level_pages = array();
+                $children_pages  = array();
+                
                 foreach ( $pages as $page ) {
+                        
                         // catch and repair bad pages
                         if ( $page->post_parent == $page->ID ) {
@@ -557 +562 @@
                                 $top_level_pages[] = $page;
                         else
-                                $children_pages[] = $page;
+                                $children_pages[ $page->post_parent ][] = $page;
                 }
 
@@ -566 +571 @@
         $start = ($pagenum - 1) * $per_page;
         $end = $start + $per_page;
+        
         foreach ( $pages as $page ) {
                 if ( $count >= $end )
                         break;
 
-                $i++;
-
                 if ( $count >= $start )
                         echo "\t" . display_page_row( $page, $level );
@@ -580 +584 @@
                         _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
         }
-}
-
-function _page_rows( $pages, &$count, $parent, $level, $pagenum, $per_page ) {
+        
+        // if it is the last pagenum and there are orphaned pages, display them with paging as well
+        if ( isset($children_pages) && $count < $end ){
+                foreach( $children_pages as $orphans ){
+                        foreach ( $orphans as $op ) {
+                                if ( $count >= $end )
+                                        break;
+                                if ( $count >= $start )
+                                        echo "\t" . display_page_row( $op, 0 );
+                                $count++;
+                        }
+                }
+        }
+}
+
+/*
+ * Given a top level page ID, display the nested hierarchy of sub-pages
+ * together with paging support
+ */
+function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) {
+        
+        if ( ! isset( $children_pages[$parent] ) )
+                return; 
+                
         $start = ($pagenum - 1) * $per_page;
         $end = $start + $per_page;
-        $i = -1;
-        foreach ( $pages as $page ) {
+        
+        foreach ( $children_pages[$parent] 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 ) {
@@ -615 +636 @@
                 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 );
-        }
+                _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+        }
+        
+        unset( $children_pages[$parent] ); //required in order to keep track of orphans
 }
 
@@ -758 +780 @@
 
         if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-                $actions['approve']   = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a> | ';
-                $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a> | ';
+                $actions['approve']   = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a> | ';
+                $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a> | ';
                 $actions['edit']      = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a> | ';
                 $actions['spam']      = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a> | ';

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

@@ -53 +53 @@
         echo "<span id='wp-version-message'>$msg</span>";
 }
-
-function wp_update_plugins() {
-        global $wp_version;
-
-        if ( !function_exists('fsockopen') )
-                return false;
-
-        $plugins = get_plugins();
-        $active  = get_option( 'active_plugins' );
-        $current = get_option( 'update_plugins' );
-
-        $new_option = '';
-        $new_option->last_checked = time();
-
-        $plugin_changed = false;
-        foreach ( $plugins as $file => $p ) {
-                $new_option->checked[ $file ] = $p['Version'];
-
-                if ( !isset( $current->checked[ $file ] ) ) {
-                        $plugin_changed = true;
-                        continue;
-                }
-
-                if ( strval($current->checked[ $file ]) !== strval($p['Version']) )
-                        $plugin_changed = true;
-        }
-
-        if (
-                isset( $current->last_checked ) &&
-                43200 > ( time() - $current->last_checked ) &&
-                !$plugin_changed
-        )
-                return false;
-
-        $to_send->plugins = $plugins;
-        $to_send->active = $active;
-        $send = serialize( $to_send );
-
-        $request = 'plugins=' . urlencode( $send );
-        $http_request  = "POST /plugins/update-check/1.0/ HTTP/1.0\r\n";
-        $http_request .= "Host: api.wordpress.org\r\n";
-        $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=" . get_option('blog_charset') . "\r\n";
-        $http_request .= "Content-Length: " . strlen($request) . "\r\n";
-        $http_request .= 'User-Agent: WordPress/' . $wp_version . '; ' . get_bloginfo('url') . "\r\n";
-        $http_request .= "\r\n";
-        $http_request .= $request;
-
-        $response = '';
-        if( false != ( $fs = @fsockopen( 'api.wordpress.org', 80, $errno, $errstr, 3) ) && is_resource($fs) ) {
-                fwrite($fs, $http_request);
-
-                while ( !feof($fs) )
-                        $response .= fgets($fs, 1160); // One TCP-IP packet
-                fclose($fs);
-                $response = explode("\r\n\r\n", $response, 2);
-        }
-
-        $response = unserialize( $response[1] );
-
-        if ( $response )
-                $new_option->response = $response;
-
-        update_option( 'update_plugins', $new_option );
-}
-add_action( 'load-plugins.php', 'wp_update_plugins' );
 
 function wp_plugin_update_row( $file, $plugin_data ) {

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

@@ -65 +65 @@
                                         // it's a multi-widget.  We only need to show it in the list once.
                                         $already_shown[] = $widget['callback'];
-                                        $num = (int) array_pop( explode( '-', $widget['id'] ) );
+                                        $num = (int) array_pop( $ids = explode( '-', $widget['id'] ) );
                                         $id_base = $wp_registered_widget_controls[$widget['id']]['id_base'];
                                         // so that we always add a new one when clicking "add"

branches/crazyhorse/wp-admin/install.php

@@ -55 +55 @@
                 </tr>
         </table>
-        <input type="submit" name="Submit" value="<?php _e('Install WordPress'); ?>" class="button" />
+        <p class="step"><input type="submit" name="Submit" value="<?php _e('Install WordPress'); ?>" class="button" /></p>
 </form>
 
@@ -99 +99 @@
 </table>
 
-<p><a href="../wp-login.php" class="button"><?php _e('Log In'); ?></a>
+<p class="step"><a href="../wp-login.php" class="button"><?php _e('Log In'); ?></a></p>
 
 <?php

branches/crazyhorse/wp-admin/js/editor.js

@@ -53 +53 @@
         content = content.replace(new RegExp('\\s*<div', 'mg'), '\n<div');
         content = content.replace(new RegExp('</div>\\s*', 'mg'), '</div>\n');
-                content = content.replace(new RegExp('\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*', 'gi'), '\n\n[wp_caption$1[/wp_caption]\n\n');
+                content = content.replace(new RegExp('\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*', 'gi'), '\n\n[caption$1[/caption]\n\n');
+                content = content.replace(new RegExp('caption\\]\\n\\n+\\[caption', 'g'), 'caption]\n\n[caption');
 
         var blocklist2 = 'blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre';
@@ -166 +167 @@
         pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1");
         pee = pee.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1');
-        pee = pee.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[wp_caption$1[/wp_caption]');
+        pee = pee.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[caption$1[/caption]');
         // pee = pee.replace(new RegExp('^((?:&nbsp;)*)\\s', 'mg'), '$1&nbsp;');
 

branches/crazyhorse/wp-admin/js/gallery.js

@@ -5 +5 @@
                         items: '.media-item',
                         placeholder: 'sorthelper',
+                        axis: 'y',
+                        distance: 2,
                         update: galleryReorder
                 } );
@@ -11 +13 @@
         // When an update has occurred, adjust the order for each item
         var galleryReorder = function(e, sort) {
-                jQuery.each(sort['instance'].toArray(), function(i, id) {
-                        jQuery('#' + id + ' .menu_order input')[0].value = i;
+                jQuery.each(sort['element'].sortable('toArray'), function(i, id) {
+                        jQuery('#' + id + ' .menu_order input')[0].value = (1+i);
                 });
         }
@@ -19 +21 @@
         gallerySortableInit();
 });
+
+jQuery(document).ready(function($){
+        $('.menu_order_input').each(function(){
+                if ( this.value == '0' ) this.value = '';
+        });
+});

branches/crazyhorse/wp-admin/js/media-upload.js

@@ -6 +6 @@
                         ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark);
 
+                if ( h.indexOf('[caption') != -1 )
+                        h = ed.plugins.wpeditimage._do_shcode(h);
+                
                 ed.execCommand('mceInsertContent', false, h);
-                ed.execCommand('mceCleanup');
         } else
                 edInsertContent(edCanvas, h);

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

@@ -2 +2 @@
 require_once('admin.php');
 
-if ( ! current_user_can('publish_posts') ) wp_die( __( 'Cheatin’ uh?' )); ?>
-
-<?php 
+if ( ! current_user_can('publish_posts') ) wp_die( __( 'Cheatin&#8217; uh?' ) );
 
 function preg_quote2($string) {
         return str_replace('/', '\/', preg_quote($string));
 }
+function aposfix($text) {
+        $translation_table[chr(34)] = '&quot;';
+        $translation_table[chr(38)] = '&';
+        $translation_table[chr(39)] = '&apos;';
+        return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&amp;" , strtr($text, $translation_table));
+}
 function press_it() {
         // define some basic variables
-        $quick['post_status'] = $_REQUEST['post_status'];
+        $quick['post_status'] = isset($_REQUEST['publish']) ? 'publish' : 'draft';
         $quick['post_category'] = $_REQUEST['post_category'];
         $quick['tags_input'] = $_REQUEST['tags_input'];
         $quick['post_title'] = $_REQUEST['post_title'];
         $quick['post_content'] = '';
-                
+
         // insert the post with nothing in it, to get an ID
         $post_ID = wp_insert_post($quick, true);
-                
+
         $content = '';
         switch ( $_REQUEST['post_type'] ) {
@@ -26 +30 @@
                         $content .= $_REQUEST['content'];
                         break;
-                
+
                 case 'photo':
                         $content = $_REQUEST['content'];
-                        
-                        foreach($_REQUEST['photo_src'] as $key => $image) {
-                                #quote for matching
+
+                        foreach( (array) $_REQUEST['photo_src'] as $key => $image) {
+                                // escape quote for matching
                                 $quoted = preg_quote2($image);
-                                
+
                                 // see if files exist in content - we don't want to upload non-used selected files.
-                                preg_match('/'.$quoted.'/', $_REQUEST['content'], $matches[0]);
-                                if($matches[0]) {
+                                if( strpos($_REQUEST['content'], $quoted) !== false ) {
                                         $upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]);
                                         // Replace the POSTED content <img> with correct uploaded ones.
@@ -42 +45 @@
                                 }
                         }
-                        
+
                         break;
-                        
+
                 case "video":
                         if($_REQUEST['embed_code']) 
                                 $content .= $_REQUEST['embed_code']."\n\n";
                         $content .= $_REQUEST['content'];
-                        break;  
+                        break;
                 }
-        # set the post_content
-        $quick['post_content'] = str_replace('<br />', "\n", preg_replace('/<\/?p>/','',$content));
-
-        #error handling for $post
+        // set the post_content
+        $quick['post_content'] = $content;
+
+        // error handling for $post
         if ( is_wp_error($post_ID)) {
                 wp_die($id);
                 wp_delete_post($post_ID);
-        #error handling for media_sideload
+        // error handling for media_sideload
         } elseif ( is_wp_error($upload)) {
                 wp_die($upload);
                 wp_delete_post($post_ID);
-        } else {        
+        } else {
                 $quick['ID'] = $post_ID;
                 wp_update_post($quick);
@@ -69 +72 @@
 }
 
-# For submitted posts.
+// For submitted posts.
 if ( 'post' == $_REQUEST['action'] ) { 
         check_admin_referer('press-this'); $post_ID = press_it(); ?>
-        
         <!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" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
@@ -81 +83 @@
                 add_thickbox();
                 wp_enqueue_style('press-this');
+                wp_enqueue_style('press-this-ie');
                 wp_enqueue_style( 'colors' );
                 wp_enqueue_script('post');
@@ -90 +93 @@
         </head>
         <body class="press-this">
-                
                 <div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="post.php?action=edit&amp;post=<?php echo $post_ID; ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
-                
                 <div id="footer">
                 <p><?php
@@ -101 +102 @@
                 </div>
                 <?php do_action('admin_footer', ''); ?>
-                
         </body>
         </html>
@@ -107 +107 @@
 }
 
-
-function aposfix($text) {
-        $translation_table[chr(34)] = '&quot;';
-        $translation_table[chr(38)] = '&';
-        $translation_table[chr(39)] = '&apos;';
-        return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&amp;" , strtr($text, $translation_table));    
-}
-
 // Ajax Requests
 $title = wp_specialchars(aposfix(stripslashes($_GET['t'])));
 
-$selection = str_replace("\n", "<br />", aposfix( stripslashes($_GET['s']) ) );
+$selection = trim( aposfix( stripslashes($_GET['s']) ) );
+if ( ! empty($selection) ) {
+        $selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
+        $selection = '<p>'.str_replace('<p></p>', '', $selection).'</p>';
+}
+
 $url = clean_url($_GET['u']);
 $image = $_GET['i'];
@@ -127 +124 @@
                         tb_remove();
                 });
-                
+
                 jQuery('.select').click(function() {
                         image_selector();
@@ -136 +133 @@
                 <input id="this_photo_description" name="photo_description" class="text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo attribute_escape($title);?>"/>
         </div>
-                
-        <p><input type="hidden" name="this_photo" value="<?php echo attribute_escape($image); ?>" id="this_photo" />
-                <a href="#" class="select"><img src="<?php echo clean_url($image); ?>" width="475" alt="<?php echo attribute_escape(__('Click to insert.')); ?>" title="<?php echo attribute_escape(__('Click to insert.')); ?>" /></a></p>
-        
-        <p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p>
+
+        <p class="centered"><input type="hidden" name="this_photo" value="<?php echo attribute_escape($image); ?>" id="this_photo" />
+                <a href="#" class="select"><img src="<?php echo clean_url($image); ?>" alt="<?php echo attribute_escape(__('Click to insert.')); ?>" title="<?php echo attribute_escape(__('Click to insert.')); ?>" /></a></p>
+
+        <p id="options"><a href="#" class="select button"><?php _e('Insert Image'); ?></a> <a href="#" class="cancel button"><?php _e('Cancel'); ?></a></p>
 <?php die; 
 }
@@ -149 +146 @@
                         tb_remove();
                 });
-                
+
                 jQuery('.select').click(function() {
                         image_selector();
@@ -158 +155 @@
                 <input id="this_photo" name="this_photo" class="text" onkeypress="if(event.keyCode==13) image_selector();" />
         </div>
-        
-        
+
+
         <h3 id="title"><label for="post_title"><?php _e('Description') ?></label></h3>
         <div class="titlewrap">
                 <input id="this_photo_description" name="photo_description" class="text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo attribute_escape($title);?>"/>
         </div>
-        
+
         <p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p>
 <?php die; 
@@ -179 +176 @@
 if($_REQUEST['ajax'] == 'photo_images') {
         function get_images_from_uri($uri) {
-                if(preg_match('/\.(jpg|jpe|jpeg|png|gif)/', $uri) && !strpos($uri,'blogger.com')) 
+                if( preg_match('/\.(jpg|jpe|jpeg|png|gif)/', $uri) && !strpos($uri,'blogger.com') ) 
                         return "'".$uri."'";
 
                 $content = wp_remote_fopen($uri);
                 if ( false === $content ) return '';
-                
+
                 $host = parse_url($uri);
-                
-                $pattern = '/<img ([^>]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif))(\2)([^>\/]*)\/*>/is';
+
+                $pattern = '/<img ([^>]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif)[^<>\'\"]*)(\2)([^>\/]*)\/*>/is';
                 preg_match_all($pattern, $content, $matches);
-                
+
                 if ( empty($matches[1]) ) return '';
-                
+
                 $sources = array();
                 foreach ($matches[3] as $src) {
@@ -199 +196 @@
                                 else
                                         $src = 'http://'.str_replace('//','/', $host['host'].'/'.$host['path'].'/'.$src);
-                                                                                
+
                         $sources[] = clean_url($src);
                 }
                 return "'" . implode("','", $sources) . "'";
         } 
-        
+
         $url = urldecode($url);
         $url = str_replace(' ', '%20', $url);
         echo 'new Array('.get_images_from_uri($url).')'; 
-die;            
+die;
 }
 
 if($_REQUEST['ajax'] == 'photo_js') { ?>
-        
-        
         // gather images and load some default JS
-        
         var last = null
         var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
@@ -228 +222 @@
                 }).responseText
         );
-        
+
         for (i = 0; i < my_src.length; i++) {
                 img = new Image(); 
@@ -239 +233 @@
                         aspect = img.width / img.height;
                         scale = (aspect > 1) ? (75 / img.width) : (75 / img.height);
-                        
+
                         w = img.width;
                         h = img.height;
-                        
+
                         if (scale < 1) {
                                 w = parseInt(img.width * scale);
@@ -251 +245 @@
                 if (!skip) strtoappend += '<a href="?ajax=thickbox&amp;i=' + img.src + '&amp;u=<?php echo $url; ?>&amp;height=400&amp;width=500" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>';
         }
-        
+
         function pick(img, desc) {
                 if (img) { 
@@ -258 +252 @@
                         jQuery('.photolist').append('<input name="photo_src[' + length + ']" value="' + img +'" type="hidden"/>');
                         jQuery('.photolist').append('<input name="photo_description[' + length + ']" value="' + desc +'" type="hidden"/>');
-                        append_editor('<img src="' + img +'" alt="' + desc + '" />');
+                        append_editor("\n\n" + '<p><img src="' + img +'" alt="' + desc + '" /></p>');
                 }
                 tinyMCE.activeEditor.resizeToContent();
                 return false;
         }
-        
+
         function image_selector() {
                 tb_remove();
@@ -271 +265 @@
                 return false;
         }
-        
+
         jQuery(document).ready(function() {
                 jQuery('#img_container').html(strtoappend);
@@ -277 +271 @@
                 tb_init('a.thickbox, area.thickbox, input.thickbox');
         });
-        
-<?php die; }
+
+<?php die;
+}
 
 if($_REQUEST['ajax'] == 'photo') { ?>
@@ -288 +283 @@
                         <div id="img_container"></div>
                 </div>
-<?php die; }
+<?php die;
+}
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -299 +295 @@
         add_thickbox();
         wp_enqueue_style('press-this');
+        wp_enqueue_style('press-this-ie');
         wp_enqueue_style( 'colors' );
         wp_enqueue_script( 'post' );
+        wp_enqueue_script('editor_functions');
 
         wp_teeny_mce();
@@ -314 +312 @@
         // add the quickadd form
         jQuery('#jaxtag').prepend('<span id="ajaxtag"><input type="text" name="newtag" id="newtag" class="form-input-tip" size="16" autocomplete="off" value="'+postL10n.addTag+'" /><input type="submit" class="button" id="tagadd" value="' + postL10n.add + '" tabindex="3" onclick="return false;" /><input type="hidden"/><input type="hidden"/><span class="howto">'+postL10n.separate+'</span></span>');
-                
+
         jQuery('#tagadd').click( tag_flush_to_text );
         jQuery('#newtag').focus(function() {
@@ -328 +326 @@
         jQuery('#publish').click( tag_save_on_publish );
         jQuery('#save-post').click( tag_save_on_publish );
-                
+
         function set_menu(type) {
                 jQuery('#text_button').removeClass('ui-tabs-selected');
@@ -335 +333 @@
                 jQuery("#post_type").val(type);
         }
-        
+
         function set_editor(text) {
-
-                if(tinyMCE.activeEditor) tinyMCE.activeEditor.setContent('');
-                if(tinyMCE.activeEditor) tinyMCE.execCommand('mceInsertContent' ,false, text);
-        }
-        
+                if ( '' == text || '<p></p>' == text ) text = '<p><br /></p>';
+                if ( tinyMCE.activeEditor ) tinyMCE.execCommand('mceSetContent', false, text);
+        }
+
         function append_editor(text) {
-                if(tinyMCE.activeEditor) tinyMCE.execCommand('mceInsertContent' ,false, text);
-        }
-        
+                if ( '' != text && tinyMCE.activeEditor ) tinyMCE.execCommand('mceInsertContent', false, text);
+        }
+
         function set_title(title) { jQuery("#content_type").text(title); }
 
@@ -355 +352 @@
                                 set_menu('text');
                                 set_title('<?php _e('Post') ?>');
+                                <?php if ($selection) { ?>
+                                        set_editor('<?php echo $selection; ?><p><a href="<?php echo $url ?>"><?php echo $title; ?></a>.</p>');
+                                <?php } else { ?>
+                                        set_editor('<p><a href="<?php echo $url ?>"><?php echo $title; ?></a></p>');
+                                <?php } ?>
                                 return false;
                                 break;
@@ -360 +362 @@
                                 set_menu('quote');
                                 set_title('<?php _e('Quote') ?>');
-                                set_editor("<blockquote><p><?php echo format_to_edit($selection); ?> </p><p><cite><a href='<?php echo $url; ?>'><?php echo $title; ?> </a> </cite> </p></blockquote>");
+                                set_editor('<blockquote><?php echo $selection; ?> <p><cite><a href="<?php echo $url; ?>"><?php echo $title; ?> </a> </cite> </p></blockquote>');
                                 return false;
                                 break;
@@ -366 +368 @@
                                 set_menu('video');
                                 set_title('<?php _e('Caption') ?>');
-                                
                                 jQuery('#extra_fields').show();
                                 jQuery('body').addClass('video_split');
                                 jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']); ?>', { ajax: 'video', s: '<?php echo attribute_escape($selection); ?>'}, function() {
                                         <?php 
+                                        $content = '';
                                         if ( preg_match("/youtube\.com\/watch/i", $url) ) {
-                                        list($domain, $video_id) = split("v=", $url);
-                                        $content = '<object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/' . $video_id . '"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/' . $video_id . '" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed></object>'; ?>
-                                        
-                                        <?php } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) {
-                                        
-                                        list($domain, $video_id) = split(".com/", $url);
-                                        $content = '<object width="400" height="225"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" />      <embed src="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="225"></embed></object>';
-                                        
-                                        if ( trim($selection) == '' )
-                                                $selection = '<a href="http://www.vimeo.com/' . $video_id . '?pg=embed&sec=' . $video_id . '">' . $title . '</a> on <a href="http://vimeo.com?pg=embed&sec=' . $video_id . '">Vimeo</a>';
-                                        } else {
+                                                list($domain, $video_id) = split("v=", $url);
+                                                $content = '<object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/' . $video_id . '"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/' . $video_id . '" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed></object>';
+
+                                        } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) {
+                                                list($domain, $video_id) = split(".com/", $url);
+                                                $content = '<object width="400" height="225"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" />      <embed src="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="225"></embed></object>';
+
+                                                if ( trim($selection) == '' )
+                                                        $selection = '<p><a href="http://www.vimeo.com/' . $video_id . '?pg=embed&sec=' . $video_id . '">' . $title . '</a> on <a href="http://vimeo.com?pg=embed&sec=' . $video_id . '">Vimeo</a></p>';
+
+                                        } elseif ( strpos( $selection, '<object' ) !== false ) {
                                                 $content = $selection;
-                                        } ?>
+                                        }
+                                        ?>
                                         jQuery('#embed_code').prepend('<?php echo htmlentities($content); ?>');
-                                        
-                                        set_editor("<?php echo $title; ?>");
+
+                                        set_editor('<a href="<?php echo $url ?>"><?php echo $title; ?></a>.');
                                 });
                                 return false;
@@ -395 +398 @@
                                 set_title('<?php _e('Post') ?>');
                                 <?php if ($selection) { ?>
-                                        set_editor("<?php echo format_to_edit($selection); ?>");
+                                        set_editor('<?php echo $selection; ?><p><a href="<?php echo $url ?>"><?php echo $title; ?></a></p>');
+                                <?php } else { ?>
+                                        set_editor('<p><a href="<?php echo $url ?>"><?php echo $title; ?></a></p>');
                                 <?php } ?>
                                 jQuery('#extra_fields').show();
@@ -414 +419 @@
                 }
         }
-        
+
         jQuery(document).ready(function() {
         jQuery('#menu li').click(function (){ 
@@ -421 +426 @@
                         show(tab_name);
                 });
-                
                 // Set default tabs
                 <?php if ( preg_match("/youtube\.com\/watch/i", $url) ) { ?>
@@ -431 +435 @@
                 <?php } ?>
         });
-        
+
 </script>
 </head>
@@ -454 +458 @@
                         <input name="post_title" id="post_title" class="text" value="<?php echo attribute_escape($title);?>"/>
                 </div>
-                
+
                 <div id="extra_fields" style="display: none"></div>
-                
+
                 <div class="editor_area">
                         <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 if ($selection) { ?><a href='<?php echo $url ?>'><?php echo format_to_edit($selection) ?></a><?php } else { ?><a href='<?php echo $url ?>'><?php echo $title; ?></a><?php } ?></textarea>
+                                <textarea name="content" id="content" style="width:100%;" class="mceEditor"><?php if ($selection) { echo wp_richedit_pre($selection); } ?><a href="<?php echo $url ?>"><?php echo $title; ?></a>.</textarea>
                         </div>
                 </div>
         </div>
-        
+
         <div id="categories">
                 <div class="submitbox" id="submitpost">
-                <div id="previewview"></div>
-                <div class="inside">
-                        <h2><?php _e('Categories') ?></h2>
-                        <div id="categories-all">
-                                <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-                                        <?php wp_category_checklist() ?>
-                                </ul>
+                        <div id="previewview"></div>
+                        <div class="inside">
+                                <h2><?php _e('Categories') ?></h2>
+                                <div id="categories-all">
+                                        <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+                                                <?php wp_category_checklist() ?>
+                                        </ul>
+                                </div>
+                                
+                                <h2><?php _e('Tags') ?></h2>
+                                <p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
+                                <div id="tagchecklist"></div>
                         </div>
-                        <h2><?php _e('Tags') ?></h2>
-                        <p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
-                        <div id="tagchecklist"></div>
+
+                        <p class="submit">         
+                                <input type="submit" name="draft" value="<?php _e('Save') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
+                                <input type="submit" name="publish" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
+                                <img src="images/loading-publish.gif" alt="" id="photo_saving" style="display:none;"/>
+                        </p>
                 </div>
-                <div id="post_status">
-                        <input type="radio" name="post_status" value="publish" checked="checked" id="published" /> <label for="published"><?php _e('Published'); ?></label>
-                        <input type="radio" name="post_status" value="draft" id="unpublished" /> <label for="unpublished"><?php _e('Unpublished'); ?></label>
-                </div>
-                <p class="submit">         
-                        <input type="submit" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
-                        <img src="images/loading-publish.gif" alt="" id="photo_saving" style="display:none;"/>
-                </p>
         </div>
 </form>

branches/crazyhorse/wp-admin/revision.php

@@ -47 +47 @@
         if ( $left_revision->ID == $right_revision->ID ) {
                 $redirect = get_edit_post_link( $left_revision->ID );
+                include( 'js/revisions-js.php' );
                 break;
         }

branches/crazyhorse/wp-admin/rtl.css

@@ -5 +5 @@
 }
 
-body, td {
-        font-family: Tahoma,Verdana,sans-serif;
+body, td, .submit input, .button, .button-secondary, .button-highlighted, #your-profile legend, .quicktags, .search, #wpcontent select, #wphead #viewsite a, #wphead h1 {
+        font-family: sans-serif !important;
+}
+
+.code, #quicktags #ed_code {
+        font-family: monospace !important;
 }
 
@@ -66 +70 @@
         display:block;
         float:right;
-        font:700 16px/100% "Times New Roman", Times, serif;
+        font:700 16px/100% sans-serif;
         margin:0 0 0 10px;
         padding:5px 7px 9px
@@ -79 +83 @@
 {
         background:url(images/comment-stalk-rtl.gif) -309px bottom !important;
-        font-family: Tahoma, Verdana, sans-serif;
+        font-family: sans-serif !important;
         margin-left:-45px;
         margin-right:.2em;

branches/crazyhorse/wp-admin/setup-config.php

@@ -63 +63 @@
 <p>In all likelihood, these items were supplied to you by your ISP. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;</p>
 
-<p><a href="setup-config.php?step=1" class="button">Let&#8217;s go!</a></p>
+<p class="step"><a href="setup-config.php?step=1" class="button">Let&#8217;s go!</a></p>
 <?php
         break;
@@ -99 +99 @@
                 </tr>
         </table>
-        <h2 class="step">
-        <input name="submit" type="submit" value="Submit" class="button" />
-        </h2>
+        <p class="step"><input name="submit" type="submit" value="Submit" class="button" /></p>
 </form>
 <?php
@@ -155 +153 @@
 <p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;</p>
 
-<p><a href="install.php" class="button">Run the install</a></p>
+<p class="step"><a href="install.php" class="button">Run the install</a></p>
 <?php
         break;

branches/crazyhorse/wp-admin/upgrade.php

@@ -26 +26 @@
 <h2><?php _e('No Upgrade Required'); ?></h2>
 <p><?php _e('Your WordPress database is already up-to-date!'); ?></p>
-<h2 class="step"><a href="<?php echo get_option('home'); ?>/"><?php _e('Continue'); ?></a></h2>
+<p class="step"><a class="button" href="<?php echo get_option('home'); ?>/"><?php _e('Continue'); ?></a></p>
 
 <?php else :
@@ -38 +38 @@
 <p><?php _e('Your WordPress database is out-of-date, and must be upgraded before you can continue.'); ?></p>
 <p><?php _e('The upgrade process may take a while, so please be patient.'); ?></p>
-<h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress'); ?></a></h2>
+<p class="step"><a class="button" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress'); ?></a></p>
 <?php
                 break;
@@ -53 +53 @@
 <h2><?php _e('Upgrade Complete'); ?></h2>
         <p><?php _e('Your WordPress database has been successfully upgraded!'); ?></p>
-        <h2 class="step"><a href="<?php echo $backto; ?>"><?php _e('Continue'); ?></a></h2>
+        <p class="step"><a class="button" href="<?php echo $backto; ?>"><?php _e('Continue'); ?></a></p>
 
 <!--

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

@@ -725 +725 @@
 }
 
-#adminmenu li a #awaiting-mod {
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
         position: absolute;
         margin-top: 0.2em;
@@ -735 +735 @@
 }
 
-#adminmenu li a .count-0 {
+#adminmenu li a .count-0, #sidemenu li a .count-0 {
         display: none;
 }
@@ -775 +775 @@
 }
 
-#adminmenu li a:hover #awaiting-mod {
+#adminmenu li a:hover #awaiting-mod, #sidemenu li a:hover #update-plugins {
         background-position: -80px bottom;
 }
 
-#adminmenu li a #awaiting-mod span {
+#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
         top: -0.8em;
         right: 0;

branches/crazyhorse/wp-app.php

@@ -198 +198 @@
                 // check to see if AtomPub is enabled
                 if( !get_option( 'enable_app' ) )
-                        $this->not_allowed( sprintf( __( 'AtomPub services are disabled on this blog.  An admin user can enable them at %s' ), admin_url('options-writing.php') ) );
+                        $this->forbidden( sprintf( __( 'AtomPub services are disabled on this blog.  An admin user can enable them at %s' ), admin_url('options-writing.php') ) );
 
                 // dispatch
@@ -940 +940 @@
         }
 
+        function forbidden($reason='') {
+                log_app('Status','403: Forbidden');
+                header('Content-Type: text/plain');
+                status_header('403');
+                echo $reason;
+                exit;
+        }
+
         function not_found() {
                 log_app('Status','404: Not Found');

branches/crazyhorse/wp-config-sample.php

@@ -8 +8 @@
 define('DB_COLLATE', '');
 
-// Change SECRET_KEY to a unique phrase.  You won't have to remember it later,
-// so make it long and complicated.  You can visit http://api.wordpress.org/secret-key/1.0/
-// to get a secret key generated for you, or just make something up.
-define('SECRET_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
+// Change each KEY to a different unique phrase.  You won't have to remember the phrases later,
+// so make them long and complicated.  You can visit http://api.wordpress.org/secret-key/1.1/
+// to get keys generated for you, or just make something up.  Each key should have a different phrase.
+define('AUTH_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
+define('SECURE_AUTH_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
+define('LOGGED_IN_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
 
 // You can have multiple installations in one database if you give each a unique prefix

branches/crazyhorse/wp-content/themes/classic/style.css

@@ -323 +323 @@
 /* Captions & aligment */
 .aligncenter,
-dl.aligncenter {
+div.aligncenter {
         display: block;
         margin-left: auto;
@@ -337 +337 @@
 }
 
-.wp_caption {
+.wp-caption {
         border: 1px solid #ddd;
         text-align: center;
@@ -349 +349 @@
 }
 
-.wp_caption img {
+.wp-caption img {
         margin: 0;
         padding: 0;
@@ -355 +355 @@
 }
 
-.wp_caption_dd {
+.wp-caption p.wp-caption-text {
         font-size: 11px;
         line-height: 17px;

branches/crazyhorse/wp-content/themes/default/style.css

@@ -291 +291 @@
 
 .postmetadata {
-        clear: left;
+        clear: both;
 }
 
@@ -641 +641 @@
 /* Captions */
 .aligncenter,
-dl.aligncenter {
+div.aligncenter {
         display: block;
         margin-left: auto;
@@ -647 +647 @@
 }
 
-.wp_caption {
+.wp-caption {
         border: 1px solid #ddd;
         text-align: center;
@@ -659 +659 @@
 }
 
-.wp_caption img {
+.wp-caption img {
         margin: 0;
         padding: 0;
@@ -665 +665 @@
 }
 
-.wp_caption_dd {
+.wp-caption p.wp-caption-text {
         font-size: 11px;
         line-height: 17px;

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

@@ -1 +1 @@
 <?php
 
-function get_category_children($id, $before = '/', $after = '') {
+function get_category_children($id, $before = '/', $after = '', $visited=array()) {
         if ( 0 == $id )
                 return '';
@@ -15 +15 @@
                 if ( is_wp_error( $category ) )
                         return $category;
-                if ( $category->parent == $id ) {
+                if ( $category->parent == $id && !in_array($category->term_id, $visited) ) {
+                        $visited[] = $category->term_id;
                         $chain .= $before.$category->term_id.$after;
                         $chain .= get_category_children($category->term_id, $before, $after);
@@ -45 +46 @@
 }
 
-function get_category_parents($id, $link = FALSE, $separator = '/', $nicename = FALSE){
+function get_category_parents($id, $link = FALSE, $separator = '/', $nicename = FALSE, $visited = array()){
         $chain = '';
         $parent = &get_category($id);
@@ -56 +57 @@
                 $name = $parent->cat_name;
 
-        if ( $parent->parent && ($parent->parent != $parent->term_id) )
-                $chain .= get_category_parents($parent->parent, $link, $separator, $nicename);
+        if ( $parent->parent && ($parent->parent != $parent->term_id) && !in_array($parent->parent, $visited) ) {
+                $visited[] = $parent->parent;
+                $chain .= get_category_parents($parent->parent, $link, $separator, $nicename, $visited);
+        }
 
         if ( $link )
@@ -416 +419 @@
                 $tag_id = $tag_ids[$tag];
                 $tag_link = clean_url($tag_links[$tag]);
-                $tag = str_replace(' ', '&nbsp;', wp_specialchars( $tag ));
                 $a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . attribute_escape( sprintf( __ngettext('%d topic','%d topics',$count), $count ) ) . "'$rel style='font-size: " .
                         ( $smallest + ( ( $count - $min_count ) * $font_step ) )

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

@@ -51 +51 @@
 
                 $src = $this->registered[$handle]->src;
-                if ( !preg_match('|^https?://|', $src) ) {
+                if ( !preg_match('|^https?://|', $src) && !preg_match('|^' . preg_quote(WP_CONTENT_URL) . '|', $src) ) {
                         $src = $this->base_url . $src;
                 }

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

@@ -60 +60 @@
 
         function _css_href( $src, $ver, $handle ) {
-                if ( !preg_match('|^https?://|', $src) ) {
+                if ( !preg_match('|^https?://|', $src) && !preg_match('|^' . preg_quote(WP_CONTENT_URL) . '|', $src) ) {
                         $src = $this->base_url . $src;
                 }

branches/crazyhorse/wp-includes/classes.php

@@ -92 +92 @@
                         $request_match = $request;
                         foreach ($rewrite as $match => $query) {
+                                // Don't try to match against AtomPub calls
+                                if ( $req_uri == 'wp-app.php' )
+                                        break;
+
                                 // If the requesting file is the anchor of the match, prepend it
                                 // to the path info.

branches/crazyhorse/wp-includes/deprecated.php

@@ -1065 +1065 @@
  * @author Dougal
  * @since 1.0.1
- * @deprecated Use get_categories()
- * @see get_categories()
+ * @deprecated Use wp_list_bookmarks()
+ * @see wp_list_bookmarks()
  *
  * @param string $order Sort link categories by 'name' or 'id'
@@ -1072 +1072 @@
  */
 function get_links_list($order = 'name', $deprecated = '') {
-        _deprecated_function(__FUNCTION__, '0.0', 'get_categories()');
+        _deprecated_function(__FUNCTION__, '0.0', 'wp_list_bookmarks()');
 
         $order = strtolower($order);

branches/crazyhorse/wp-includes/feed.php

@@ -1 +1 @@
 <?php
-
+/**
+ * WordPress Feed API
+ *
+ * Many of the functions used in here belong in The Loop, or The Loop for the
+ * Feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ */
+
+/**
+ * RSS container for the bloginfo function.
+ *
+ * You can retrieve anything that you can using the get_bloginfo() function.
+ * Everything will be stripped of tags and characters converted, when the values
+ * are retrieved for use in the feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 1.5.1
+ * @uses apply_filters() Calls 'get_bloginfo_rss' hook with two parameters.
+ * @see get_bloginfo() For the list of possible values to display.
+ *
+ * @param string $show See get_bloginfo() for possible values.
+ * @return string
+ */
 function get_bloginfo_rss($show = '') {
         $info = strip_tags(get_bloginfo($show));
@@ -6 +31 @@
 }
 
+/**
+ * Display RSS container for the bloginfo function.
+ *
+ * You can retrieve anything that you can using the get_bloginfo() function.
+ * Everything will be stripped of tags and characters converted, when the values
+ * are retrieved for use in the feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 0.71
+ * @uses apply_filters() Calls 'bloginfo_rss' hook with two parameters.
+ * @see get_bloginfo() For the list of possible values to display.
+ *
+ * @param string $show See get_bloginfo() for possible values.
+ */
 function bloginfo_rss($show = '') {
         echo apply_filters('bloginfo_rss', get_bloginfo_rss($show), $show);
 }
 
+/**
+ * Retrieve the default feed.
+ *
+ * The default feed is 'rss2', unless a plugin changes it through the
+ * 'default_feed' filter.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.5
+ * @uses apply_filters() Calls 'default_feed' hook on the default feed string.
+ *
+ * @return string Default feed, or for example 'rss2', 'atom', etc.
+ */
 function get_default_feed() {
         return apply_filters('default_feed', 'rss2');
 }
 
+/**
+ * Retrieve the blog title for the feed title.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.2.0
+ * @uses apply_filters() Calls 'get_wp_title_rss' hook on title.
+ * @uses wp_title() See function for $sep parameter usage.
+ *
+ * @param string $sep Optional.How to separate the title. See wp_title() for more info.
+ * @return string Error message on failure or blog title on success.
+ */
 function get_wp_title_rss($sep = '&#187;') {
         $title = wp_title($sep, false);
@@ -22 +87 @@
 }
 
+/**
+ * Display the blog title for display of the feed title.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.2.0
+ * @uses apply_filters() Calls 'wp_title_rss' on the blog title.
+ * @see wp_title() $sep parameter usage.
+ *
+ * @param string $sep Optional.
+ */
 function wp_title_rss($sep = '&#187;') {
         echo apply_filters('wp_title_rss', get_wp_title_rss($sep));
 }
 
+/**
+ * Retrieve the current post title for the feed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.0.0
+ * @uses apply_filters() Calls 'the_title_rss' on the post title.
+ *
+ * @return string Current post title.
+ */
 function get_the_title_rss() {
         $title = get_the_title();
@@ -32 +118 @@
 }
 
-
+/**
+ * Display the post title in the feed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 0.71
+ * @uses get_the_title_rss() Used to retrieve current post title.
+ */
 function the_title_rss() {
         echo get_the_title_rss();
 }
 
-
+/**
+ * Display the post content for the feed.
+ *
+ * For encoding the html or the $encode_html parameter, there are three possible
+ * values. '0' will make urls footnotes and use make_url_footnote(). '1' will
+ * encode special characters and automatically display all of the content. The
+ * value of '2' will strip all HTML tags from the content.
+ *
+ * Also note that you cannot set the amount of words and not set the html
+ * encoding. If that is the case, then the html encoding will default to 2,
+ * which will strip all HTML tags.
+ *
+ * To restrict the amount of words of the content, you can use the cut
+ * parameter. If the content is less than the amount, then there won't be any
+ * dots added to the end. If there is content left over, then dots will be added
+ * and the rest of the content will be removed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 0.71
+ * @uses apply_filters() Calls 'the_content_rss' on the content before processing.
+ * @see get_the_content() For the $more_link_text, $stripteaser, and $more_file
+ *              parameters.
+ *
+ * @param string $more_link_text Optional. Text to display when more content is available but not displayed.
+ * @param int|bool $stripteaser Optional. Default is 0.
+ * @param string $more_file Optional.
+ * @param int $cut Optional. Amount of words to keep for the content.
+ * @param int $encode_html Optional. How to encode the content.
+ */
 function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
         $content = get_the_content($more_link_text, $stripteaser, $more_file);
@@ -60 +182 @@
                         $use_dotdotdot = 0;
                 }
+
+                /** @todo Check performance, might be faster to use array slice instead. */
                 for ( $i=0; $i<$k; $i++ )
                         $excerpt .= $blah[$i].' ';
@@ -69 +193 @@
 }
 
-
+/**
+ * Display the post excerpt for the feed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 0.71
+ * @uses apply_filters() Calls 'the_excerpt_rss' hook on the excerpt.
+ */
 function the_excerpt_rss() {
         $output = get_the_excerpt();
@@ -75 +206 @@
 }
 
+/**
+ * Display the permalink to the post for use in feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.3.0
+ * @uses apply_filters() Call 'the_permalink_rss' on the post permalink
+ */
 function the_permalink_rss() {
         echo apply_filters('the_permalink_rss', get_permalink());
-
-}
-
+}
+
+/**
+ * Display the feed GUID for the current comment.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since unknown
+ */
 function comment_guid() {
         echo get_comment_guid();
 }
 
+/**
+ * Retrieve the feed GUID for the current comment.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since unknown
+ *
+ * @return bool|string false on failure or guid for comment on success.
+ */
 function get_comment_guid() {
         global $comment;
@@ -93 +247 @@
 }
 
+/**
+ * Display the link to the comments.
+ *
+ * @since 1.5.0
+ */
 function comment_link() {
         echo get_comment_link();
 }
 
+/**
+ * Retrieve the current comment author for use in the feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.0.0
+ * @uses apply_filters() Calls 'comment_author_rss' hook on comment author.
+ * @uses get_comment_author()
+ *
+ * @return string Comment Author
+ */
 function get_comment_author_rss() {
         return apply_filters('comment_author_rss', get_comment_author() );
 }
 
+/**
+ * Display the current comment author in the feed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 1.0.0
+ */
 function comment_author_rss() {
         echo get_comment_author_rss();
 }
 
+/**
+ * Display the current comment content for use in the feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 1.0.0
+ * @uses apply_filters() Calls 'comment_text_rss' filter on comment content.
+ * @uses get_comment_text()
+ */
 function comment_text_rss() {
         $comment_text = get_comment_text();
@@ -111 +297 @@
 }
 
+/**
+ * Retrieve all of the post categories, formatted for use in feeds.
+ *
+ * All of the categories for the current post in the feed loop, will be
+ * retrieved and have feed markup added, so that they can easily be added to the
+ * RSS2, Atom, or RSS1 and RSS0.91 RDF feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.1.0
+ * @uses apply_filters() 
+ *
+ * @param string $type Optional, default is 'rss'. Either 'rss', 'atom', or 'rdf'.
+ * @return string All of the post categories for displaying in the feed.
+ */
 function get_the_category_rss($type = 'rss') {
         $categories = get_the_category();
@@ -143 +344 @@
 }
 
+/**
+ * Display the post categories in the feed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 0.71
+ * @see get_the_category_rss() For better explanation.
+ *
+ * @param string $type Optional, default is 'rss'. Either 'rss', 'atom', or 'rdf'.
+ */
 function the_category_rss($type = 'rss') {
         echo get_the_category_rss($type);
 }
 
+/**
+ * Display the HTML type based on the blog setting.
+ *
+ * The two possible values are either 'xhtml' or 'html'.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.2.0
+ */
 function html_type_rss() {
         $type = get_bloginfo('html_type');
@@ -156 +376 @@
 }
 
-
+/**
+ * Display the rss enclosure for the current post.
+ *
+ * Uses the global $post to check whether the post requires a password and if
+ * the user has the password for the post. If not then it will return before
+ * displaying.
+ *
+ * Also uses the function get_post_custom() to get the post's 'enclosure'
+ * metadata field and parses the value to display the enclosure(s). The
+ * enclosure(s) consist of enclosure HTML tag(s) with a URI and other
+ * attributes.
+ *
+ * @package WordPress
+ * @subpackage Template
+ * @since 1.5.0
+ * @uses apply_filters() Calls 'rss_enclosure' hook on rss enclosure.
+ * @uses get_post_custom() To get the current post enclosure metadata.
+ */
 function rss_enclosure() {
         global $post;
@@ -172 +409 @@
 }
 
+/**
+ * Display the atom enclosure for the current post.
+ *
+ * Uses the global $post to check whether the post requires a password and if
+ * the user has the password for the post. If not then it will return before
+ * displaying.
+ *
+ * Also uses the function get_post_custom() to get the post's 'enclosure'
+ * metadata field and parses the value to display the enclosure(s). The
+ * enclosure(s) consist of link HTML tag(s) with a URI and other attributes.
+ *
+ * @package WordPress
+ * @subpackage Template
+ * @since 2.2.0
+ * @uses apply_filters() Calls 'atom_enclosure' hook on atom enclosure.
+ * @uses get_post_custom() To get the current post enclosure metadata.
+ */
 function atom_enclosure() {
         global $post;
@@ -188 +442 @@
 
 /**
- * prep_atom_text_construct() - Determine the type of a given string of data
+ * Determine the type of a string of data with the data formatted.
  *
  * Tell whether the type is text, html, or xhtml, per RFC 4287 section 3.1.
@@ -203 +457 @@
  * @since 2.5
  *
- * @param string $data input string
- * @return array $result array(type, value)
+ * @param string $data Input string
+ * @return array array(type, value)
  */
 function prep_atom_text_construct($data) {
@@ -233 +487 @@
 
 /**
- * self_link() - Generate a correct link for the atom:self elemet
- *
- * Echo the link for the currently displayed feed in a XSS safe way.
+ * Display the link for the currently displayed feed in a XSS safe way.
+ *
+ * Generate a correct link for the atom:self element.
  *
  * @package WordPress
  * @subpackage Feed
  * @since 2.5
- *
  */
 function self_link() {

branches/crazyhorse/wp-includes/formatting.php

@@ -4 +4 @@
         global $wp_cockneyreplace;
         $next = true;
+        $has_pre_parent = false;
         $output = '';
         $curl = '';
@@ -27 +28 @@
                 $curl = $textarr[$i];
 
-                if (isset($curl{0}) && '<' != $curl{0} && '[' != $curl{0} && $next) { // If it's not a tag
+                if (isset($curl{0}) && '<' != $curl{0} && '[' != $curl{0} && $next && !$has_pre_parent) { // If it's not a tag
                         // static strings
                         $curl = str_replace($static_characters, $static_replacements, $curl);
                         // regular expressions
                         $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
-                } elseif (strpos($curl, '<code') !== false || strpos($curl, '<pre') !== false || strpos($curl, '<kbd') !== false || strpos($curl, '<style') !== false || strpos($curl, '<script') !== false) {
+                } elseif (strpos($curl, '<code') !== false || strpos($curl, '<kbd') !== false || strpos($curl, '<style') !== false || strpos($curl, '<script') !== false) {
                         $next = false;
+                } elseif (strpos($curl, '<pre') !== false) {
+                        $has_pre_parent = true;
+                } elseif (strpos($curl, '</pre>') !== false) {
+                        $has_pre_parent = false;
                 } else {
                         $next = true;
@@ -1125 +1130 @@
         if ( empty($text) ) return apply_filters('richedit_pre', '');
 
-        $output = $text;
-        $output = convert_chars($output);
+        $output = convert_chars($text);
         $output = wpautop($output);
-
-        // These must be double-escaped or planets will collide.
-        $output = str_replace('&lt;', '&amp;lt;', $output);
-        $output = str_replace('&gt;', '&amp;gt;', $output);
-
-        // These should be entities too
-        $output = str_replace('<', '&lt;', $output);
-        $output = str_replace('>', '&gt;', $output);
-        
+        $output = htmlspecialchars($output, ENT_NOQUOTES);
+
         return apply_filters('richedit_pre', $output);
 }

branches/crazyhorse/wp-includes/functions.php

@@ -491 +491 @@
         $newvalue = sanitize_option( $option_name, $newvalue );
 
+        $oldvalue = get_option( $safe_option_name );
+
+        $newvalue = apply_filters( 'pre_update_option_' . $option_name, $newvalue, $oldvalue );
+
         // If the new and old values are the same, no need to update.
-        $oldvalue = get_option( $safe_option_name );
         if ( $newvalue === $oldvalue )
                 return false;
@@ -1493 +1496 @@
                 $url = trailingslashit( $siteurl ) . UPLOADS;
         }
-        
+
+        $bdir = $dir; 
+        $burl = $url;
+
         $subdir = '';
         if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
@@ -1513 +1519 @@
         }
 
-        $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'error' => false );
+        $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );
         return apply_filters( 'upload_dir', $uploads );
 }
@@ -2254 +2260 @@
  */
 function is_ssl() {
-        return ( 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
+        return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
 }
 

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

@@ -396 +396 @@
 wp_help_desc:"' . mce_escape( __('Help') ) . ' (Alt+Shift+H)",
 wp_more_alt:"' . mce_escape( __('More...') ) . '",
-wp_page_alt:"' . mce_escape( __('Next page...') ) . '"
+wp_page_alt:"' . mce_escape( __('Next page...') ) . '",
+add_media:"' . mce_escape( __('Add Media') ) . '",
+add_image:"' . mce_escape( __('Add an Image') ) . '",
+add_video:"' . mce_escape( __('Add Video') ) . '",
+add_audio:"' . mce_escape( __('Add Audio') ) . '"
 });
 
@@ -408 +412 @@
 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') ) . '",
@@ -431 +434 @@
 s120:"' . mce_escape( __('120%') ) . '",
 s130:"' . mce_escape( __('130%') ) . '",
-caption:"' . mce_escape( __('Caption') ) . '"
+img_title:"' . mce_escape( __('Edit Image Title') ) . '",
+caption:"' . mce_escape( __('Edit Image Caption') ) . '",
+alt:"' . mce_escape( __('Edit Alternate Text') ) . '"
 });
 ';

branches/crazyhorse/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

@@ -90 +90 @@
                         });
 
+                        // Add Media buttons
+                        ed.addButton('add_media', {
+                                title : 'wordpress.add_media',
+                                image : url + '/img/media.gif',
+                                onclick : function() {
+                                        tb_show('', tinymce.DOM.get('add_media').href);
+                                        tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
+                                }
+                        });
+
+                        ed.addButton('add_image', {
+                                title : 'wordpress.add_image',
+                                image : url + '/img/image.gif',
+                                onclick : function() {
+                                        tb_show('', tinymce.DOM.get('add_image').href);
+                                        tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
+                                }
+                        });
+
+                        ed.addButton('add_video', {
+                                title : 'wordpress.add_video',
+                                image : url + '/img/video.gif',
+                                onclick : function() {
+                                        tb_show('', tinymce.DOM.get('add_video').href);
+                                        tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
+                                }
+                        });
+
+                        ed.addButton('add_audio', {
+                                title : 'wordpress.add_audio',
+                                image : url + '/img/audio.gif',
+                                onclick : function() {
+                                        tb_show('', tinymce.DOM.get('add_audio').href);
+                                        tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
+                                }
+                        });
+
+                        // Add Media buttons to fullscreen
+                        ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) {
+                                if ( 'mceFullScreen' != cmd ) return;
+                                if ( 'mce_fullscreen' != ed.id )
+                                        ed.settings.theme_advanced_buttons1 += ',|,add_image,add_video,add_audio,add_media';
+                        });
+
                         // Add class "alignleft", "alignright" and "aligncenter" when selecting align for images.
-                        ed.onExecCommand.add(function( ed, cmd ) {
-                                var n, bl, dom = ed.dom;
-
-                                if ( 'JustifyCenter' == cmd ) {
-                                        tinymce.each(dom.select('img'), function(n) {
-                                                var v = n.className;
-
-                                                if (v.indexOf('aligncenter') == -1) {
-                                                        dom.getParent(n, function(P) {
-                                                                if (P && P.style && P.style.textAlign == 'center')
-                                                                        dom.setStyle(P, 'textAlign', '');
-                                                        });
-                                                }
-                                        });
-
-                                        ed.execCommand('mceRepaint');
-                                }
-                        });
-
-                        ed.onBeforeExecCommand.add(function( ed, cmd ) {
-                                var n, dir, xdir, bl, dom = ed.dom;
-
-                                if ( ( cmd.indexOf('Justify') != -1 ) && ( n = ed.selection.getNode() ) ) {
-                                        if ( 'JustifyFull' == cmd || n.nodeName !== 'IMG' ) return;
-                                        dir = cmd.substring(7).toLowerCase();
-
-                                        if (  ed.queryCommandState( cmd ) ) {
-                                                n.className = n.className.replace(/align[^ '"]+\s?/g, '');
-                                                dom.addClass( n, "alignnone" );
-                                        } else if ( 'JustifyCenter' == cmd ) {
-                                                n.className = n.className.replace(/alignleft\s?|alignright\s?|alignnone\s?/g, '');
-                                                if ( dom.hasClass( n, "aligncenter" ) ) {
-                                                        dom.removeClass( n, "aligncenter" );
-                                                        dom.addClass( n, "alignnone" );
-                                                } else
-                                                        dom.addClass( n, "aligncenter" );
-
-                                        } else {
-                                                n.className = n.className.replace(/align[^ '"]+\s?/g, '');
-                                                dom.addClass( n, "align"+dir );
-                                        }
-                                }
-                        });
-
-            // Word count if script is loaded
-            if ( 'undefined' != typeof wpWordCount ) {
-                var last = 0;
-                ed.onKeyUp.add(function(ed, e) {
-                    if ( e.keyCode == last ) return;
-                    if ( 13 == e.keyCode || 8 == last || 46 == last ) wpWordCount.wc( ed.getContent({format : 'raw'}) );
-                    last = e.keyCode;
-                });
-            };
-
-            // Add listeners to handle more break
+                        ed.addCommand('JustifyLeft', function() {
+                                var n = ed.selection.getNode();
+
+                                if ( n.nodeName != 'IMG' )
+                                        ed.editorCommands.mceJustify('JustifyLeft', 'left');
+                                else ed.plugins.wordpress.do_align(n, 'alignleft');
+                        });
+
+                        ed.addCommand('JustifyRight', function() {
+                                var n = ed.selection.getNode();
+
+                                if ( n.nodeName != 'IMG' )
+                                        ed.editorCommands.mceJustify('JustifyRight', 'right');
+                                else ed.plugins.wordpress.do_align(n, 'alignright');
+                        });
+
+                        ed.addCommand('JustifyCenter', function() {
+                                var n = ed.selection.getNode(), P = ed.dom.getParent(n, 'p'), DL = ed.dom.getParent(n, 'dl');
+
+                                if ( n.nodeName == 'IMG' && ( P || DL ) )
+                                        ed.plugins.wordpress.do_align(n, 'aligncenter');
+                                else ed.editorCommands.mceJustify('JustifyCenter', 'center');
+                        });
+
+                        // Word count if script is loaded
+                        if ( 'undefined' != typeof wpWordCount ) {
+                                var last = 0;
+                                ed.onKeyUp.add(function(ed, e) {
+                                        if ( e.keyCode == last ) return;
+                                        if ( 13 == e.keyCode || 8 == last || 46 == last ) wpWordCount.wc( ed.getContent({format : 'raw'}) );
+                                        last = e.keyCode;
+                                });
+                        };
+
+                        // Add listeners to handle more break
                         t._handleMoreBreak(ed, url);
 
@@ -184 +208 @@
 
                 // Internal functions
+                do_align : function(n, a) {
+                        var P, DL, DIV, cls, c, ed = tinyMCE.activeEditor;
+
+                        P = ed.dom.getParent(n, 'p');
+                        DL = ed.dom.getParent(n, 'dl');
+                        DIV = ed.dom.getParent(n, 'div');
+
+                        if ( DL && DIV ) {
+                                cls = ed.dom.hasClass(DL, a) ? 'alignnone' : a;
+                                DL.className = DL.className.replace(/align[^ '"]+\s?/g, '');
+                                ed.dom.addClass(DL, cls);
+                                c = (cls == 'aligncenter') ? ed.dom.addClass(DIV, 'mceIEcenter') : ed.dom.removeClass(DIV, 'mceIEcenter');
+                        } else if ( P ) {
+                                cls = ed.dom.hasClass(n, a) ? 'alignnone' : a;
+                                n.className = n.className.replace(/align[^ '"]+\s?/g, '');
+                                ed.dom.addClass(n, cls);
+                                if ( cls == 'aligncenter' )
+                                        ed.dom.setStyle(P, 'textAlign', 'center');
+                                else if (P.style && P.style.textAlign == 'center')
+                                        ed.dom.setStyle(P, 'textAlign', '');
+                        }
+
+                        ed.execCommand('mceRepaint');
+                },
 
                 // Resizes the iframe by a relative height value

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

@@ -63 +63 @@
 }
 
+#media-upload #basic th.label {
+        padding: 5px 5px 5px 0;
+}
+
 .show-align {
         height: 200px;

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

@@ -5 +5 @@
 <title></title>
 
-<script type="text/javascript" src="js/editimage.js?ver=311"></script>
+<script type="text/javascript" src="js/editimage.js?ver=311d"></script>
 <script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
 
-<link rel="stylesheet" href="css/editimage.css?ver=311" type="text/css" media="all" />
-<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta1" type="text/css" media="all" />
+<link rel="stylesheet" href="css/editimage.css?ver=311d" type="text/css" media="all" />
+<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta3" type="text/css" media="all" />
 <script type="text/javascript">
 if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
@@ -75 +75 @@
                 </tr>
 
-                <tr class="">
+                <tr>
                         <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>
+                                <span class="alignleft">{#wpeditimage.img_title}</span>
                                 </label>
                         </th>
@@ -87 +86 @@
                 </tr>
 
-                <tr class="post_excerpt">
-                        <th valign="top" scope="row" class="label">
-                                <label for="img_alt">
+                <tr id="cap_field">
+                        <th valign="top" scope="row" class="label">
+                                <label for="img_cap">
                                 <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">
+                                <input type="text" id="img_cap" name="img_cap" value="" size="60" />
+                        </td>
+                </tr>
+
+                <tr>
                         <th valign="top" scope="row" class="label">
                                 <label for="link_href">
@@ -131 +129 @@
                         </td>
                 </tr>
+                
+                <tr>
+                        <th valign="top" scope="row" class="label">
+                                <label for="img_alt">
+                                <span class="alignleft">{#wpeditimage.alt}</span>
+                                </label>
+                        </th>
+                        <td class="field">
+                                <input type="text" id="img_alt" name="img_alt" value="" size="60" />
+                        </td>
+                </tr>
 
                 <tr id="img_dim">

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

@@ -16 +16 @@
                                         return;
 
-                                tb_show('', url + '/editimage.html?TB_iframe=true');
+                                tb_show('', url + '/editimage.html?ver=311c&TB_iframe=true');
                                 tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
                         });
@@ -22 +22 @@
                         ed.onInit.add(function(ed) {
                                 tinymce.dom.Event.add(ed.getWin(), 'scroll', function(e) {
-                                        ed.plugins.wpeditimage.hideButtons();
+                                        ed.plugins.wpeditimage.hideButtons();
                                 });
                         });
@@ -28 +28 @@
                         ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) {
                                 ed.plugins.wpeditimage.hideButtons();
-                });
+                        });
 
                         ed.onSaveContent.add(function(ed, o) {
-                                ed.plugins.wpeditimage.hideButtons();
+                                ed.plugins.wpeditimage.hideButtons();
                         });
 
                         ed.onMouseUp.add(function(ed, e) {
-                                if ( ! tinymce.isOpera ) return;
-                                if ( e.target.nodeName == 'IMG' )
-                                        ed.plugins.wpeditimage.showButtons(e.target);
+                                if ( tinymce.isOpera ) {
+                                        if ( e.target.nodeName == 'IMG' )
+                                                ed.plugins.wpeditimage.showButtons(e.target);
+                                } else if ( ! tinymce.isWebKit ) {
+                                        var n = ed.selection.getNode(), DL;
+                                        
+                                        if ( n.nodeName == 'IMG' && (DL = ed.dom.getParent(n, 'DL')) ) {                                        
+                                                window.setTimeout(function(){
+                                                        var ed = tinyMCE.activeEditor, n = ed.selection.getNode(), DL = ed.dom.getParent(n, 'DL');
+                                                
+                                                        if ( n.width != (parseInt(ed.dom.getStyle(DL, 'width')) - 10) ) {
+                                                                ed.dom.setStyle(DL, 'width', parseInt(n.width)+10);
+                                                                ed.execCommand('mceRepaint');
+                                                        }
+                                                }, 100);
+                                        }
+                                }
                         });
 
@@ -64 +78 @@
 
                         ed.onBeforeSetContent.add(function(ed, o) {
-                        o.content = t._do_shcode(o.content);
-                });
+                                o.content = t._do_shcode(o.content);
+                        });
 
                         ed.onPostProcess.add(function(ed, o) {
@@ -74 +88 @@
 
                 _do_shcode : function(co) {
-                        return co.replace(/\[wp_caption([^\]]+)\]([\s\S]+?)\[\/wp_caption\][\s\u00a0]*/g, function(a,b,c){
-                                var id = b.match(/id=['"]([^'"]+)/), cls = b.match(/align=['"]([^'"]+)/);
-                                var w = b.match(/width=['"]([0-9]+)/), cap = b.match(/caption=['"]([^'"]+)/);
+                        return co.replace(/\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\][\s\u00a0]*/g, function(a,b,c){
+                                b = b.replace(/\\'|\\'|\\'/g, ''').replace(/\\"|\\"/g, '"');
+                                c = c.replace(/\\'|\\'/g, ''').replace(/\\"/g, '"');
+                                var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/align=['"]([^'"]+)/i);
+                                var w = b.match(/width=['"]([0-9]+)/), cap = b.match(/caption=['"]([^'"]+)/i);
 
                                 id = ( id && id[1] ) ? id[1] : '';
@@ -86 +102 @@
                                 var div_cls = (cls == 'aligncenter') ? 'mceTemp mceIEcenter' : 'mceTemp';
 
-                                return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp_caption '+cls+'" style="width: '+(10+parseInt(w))+
-                                'px"><dt class="wp_caption_dt">'+c+'</dt><dd class="wp_caption_dd">'+cap+'</dd></dl></div>';
+                                return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+(10+parseInt(w))+
+                                'px"><dt class="wp-caption-dt">'+c+'</dt><dd class="wp-caption-dd">'+cap+'</dd></dl></div>';
                         });
                 },
 
                 _get_shcode : function(co) {
-                        return co.replace(/<div class="mceTemp[^"]*">\s*<dl([^>]+)>\s*<dt[^>]+>([\s\S]+?)<\/dt>\s*<dd[^>]+>([^<]+)<\/dd>\s*<\/dl>\s*<\/div>\s*/g, function(a,b,c,cap){
-                                var id = b.match(/id=['"]([^'"]+)/), cls = b.match(/class=['"]([^'"]+)/);
+                        return co.replace(/<div class="mceTemp[^"]*">\s*<dl([^>]+)>\s*<dt[^>]+>([\s\S]+?)<\/dt>\s*<dd[^>]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi, function(a,b,c,cap){
+                                var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/class=['"]([^'"]+)/i);
                                 var w = c.match(/width=['"]([0-9]+)/);
 
@@ -101 +117 @@
 
                                 if ( ! w || ! cap ) return c;
-                                cls = cls ? cls.match(/align[^ '"]+/) : '';
-
-                                return '[wp_caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/wp_caption]';
-                        });
-                },
-
-                _fixCenter : function(c) {
-                        var ed = tinyMCE.activeEditor;
-
-                        tinymce.each(ed.dom.select('img', c), function(n) {
-                                if ( ed.dom.hasClass(n, 'aligncenter') ) {
-                                        var P = ed.dom.getParent(n, 'p');
-                                        if ( tinymce.isIE )
-                                                ed.dom.addClass(P, 'mce_iecenter');
-                                        if ( P.style && P.style.textAlign == 'center' )
-                                                ed.dom.setStyle(P, 'textAlign', '');
-                                }
+                                cls = cls.match(/align[^ '"]+/) || 'alignnone';
+                                cap = cap.replace(/<\S[^<>]*>/gi, '').replace(/'/g, '&#39;').replace(/"/g, '&quot;');
+
+                                return '[caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/caption]';
                         });
                 },
@@ -173 +176 @@
                                 ed.execCommand("WP_EditImage");
                                 this.parentNode.style.display = 'none';
-                        }
+                        };
 
                         var wp_delimgbtn = DOM.add('wp_editbtns', 'img', {
@@ -197 +200 @@
                                         return false;
                                 }
-                        }
+                        };
                 },
 

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

@@ -246 +246 @@
 
         setup : function() {
-                var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption;
+                var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = null;
                 document.dir = tinyMCEPopup.editor.getParam('directionality','');
+
+                if ( ! tinyMCEPopup.editor.getParam('wpeditimage_do_captions', true) )
+                        t.I('cap_field').style.display = 'none';
+
                 tinyMCEPopup.restoreSelection();
                 el = ed.selection.getNode();
@@ -256 +260 @@
                 t.getImageData();
                 c = ed.dom.getAttrib(el, 'class');
-                caption = t.img_alt = ed.dom.getAttrib(el, 'alt');
 
                 if ( DL = dom.getParent(el, 'dl') ) {
                         var dlc = ed.dom.getAttrib(DL, 'class');
                         dlc = dlc.match(/align[^ "']+/i);
-                        if ( ! dom.hasClass(el, dlc) )
+                        if ( dlc && ! dom.hasClass(el, dlc) ) {
                                 c += ' '+dlc;
-                                
+                                tinymce.trim(c);
+                        }
+
                         tinymce.each(DL.childNodes, function(e) {
-                                if ( e.nodeName == 'DD' ) {
+                                if ( e.nodeName == 'DD' && dom.hasClass(e, 'wp-caption-dd') ) {
                                         caption = e.innerHTML;
                                         return;
@@ -272 +277 @@
                 }
 
+                f.img_cap.value = caption;
                 f.img_title.value = ed.dom.getAttrib(el, 'title');
-                f.img_alt.value = caption;
+                f.img_alt.value = ed.dom.getAttrib(el, 'alt');
                 f.border.value = ed.dom.getAttrib(el, 'border');
                 f.vspace.value = ed.dom.getAttrib(el, 'vspace');
@@ -356 +362 @@
                 }
 
-                if ( f.img_alt.value != '' && f.width.value != '' ) {
+                if ( f.img_cap.value != '' && f.width.value != '' ) {
                         do_caption = 1;
                         img_class = img_class.replace( /align[^ "']+\s?/gi, '' );
@@ -371 +377 @@
                         src : f.img_src.value,
                         title : f.img_title.value,
-                        alt : t.img_alt,
+                        alt : f.img_alt.value,
                         width : f.width.value,
                         height : f.height.value,
@@ -378 +384 @@
                 });
 
-                if ( ! f.link_href.value ) {
-                        if ( A ) {
-                                b = ed.selection.getBookmark();
-                                ed.dom.remove(A, 1);
-                                ed.selection.moveToBookmark(b);
-                        }
-                } else {
+                if ( f.link_href.value ) {
                         // Create new anchor elements
                         if ( A == null ) {
-                                if ( ! f.link_href.value.match(/https?:\/\//) )
+                                if ( ! f.link_href.value.match(/https?:\/\//i) )
                                         f.link_href.value = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.link_href.value);
 
@@ -428 +428 @@
                         if ( DL ) {
                                 ed.dom.setAttribs(DL, {
-                                        'class' : 'wp_caption '+t.align,
+                                        'class' : 'wp-caption '+t.align,
                                         style : 'width: '+cap_width+'px;'
                                 });
 
-                                if ( DIV ) 
+                                if ( DIV )
                                         ed.dom.setAttrib(DIV, 'class', div_cls);
 
-                                if ( (DT = ed.dom.getParent(el, 'dt')) && (DD = DT.nextSibling) && ed.dom.hasClass(DD, 'wp_caption_dd') )
-                                        ed.dom.setHTML(DD, f.img_alt.value);
+                                if ( (DT = ed.dom.getParent(el, 'dt')) && (DD = DT.nextSibling) && ed.dom.hasClass(DD, 'wp-caption-dd') )
+                                        ed.dom.setHTML(DD, f.img_cap.value);
 
                         } else {
+                                var lnk = '', pa;
                                 if ( (id = f.img_classes.value.match( /wp-image-([0-9]{1,6})/ )) && id[1] )
                                         cap_id = 'attachment_'+id[1];
 
-                                if ( f.link_href.value ) html = ed.dom.getOuterHTML(ed.dom.getParent(el, 'a'));
-                                else html = ed.dom.getOuterHTML(el);
-
-                                html = '<dl id="'+cap_id+'" class="wp_caption '+t.align+'" style="width: '+cap_width+
-                                'px"><dt class="wp_caption_dt">'+html+'</dt><dd class="wp_caption_dd">'+f.img_alt.value+'</dd></dl>';
+                                if ( f.link_href.value && (lnk = ed.dom.getParent(el, 'a')) ) {
+                                        if ( lnk.childNodes.length == 1 )
+                                                html = ed.dom.getOuterHTML(lnk);
+                                        else {
+                                                html = ed.dom.getOuterHTML(lnk);
+                                                html = html.match(/<a[^>]+>/i);
+                                                html = html+ed.dom.getOuterHTML(el)+'</a>';
+                                        }
+                                } else html = ed.dom.getOuterHTML(el);
+
+                                html = '<dl id="'+cap_id+'" class="wp-caption '+t.align+'" style="width: '+cap_width+
+                                'px"><dt class="wp-caption-dt">'+html+'</dt><dd class="wp-caption-dd">'+f.img_cap.value+'</dd></dl>';
 
                                 cap = ed.dom.create('div', {'class': div_cls}, html);
@@ -452 +460 @@
                                 if ( P ) {
                                         P.parentNode.insertBefore(cap, P);
-                                        ed.dom.remove(P);
+                                        if ( P.childNodes.length == 1 )
+                                                ed.dom.remove(P);
+                                        else if ( lnk && lnk.childNodes.length == 1 )
+                                                ed.dom.remove(lnk);
+                                        else ed.dom.remove(el);
+                                } else if ( pa = ed.dom.getParent(el, 'TD,TH,LI') ) {
+                                        pa.appendChild(cap);
+                                        if ( lnk && lnk.childNodes.length == 1 )
+                                                ed.dom.remove(lnk);
+                                        else ed.dom.remove(el);
                                 }
                         }
 
-                        tinyMCEPopup.execCommand("mceEndUndoLevel");
-                        ed.execCommand('mceRepaint');
-                        tinyMCEPopup.close();
-                        return;
                 } else {
-                        if ( DL ) {
-                                if ( f.link_href.value ) html = ed.dom.getOuterHTML(ed.dom.getParent(el, 'a'));
+                        if ( DL && DIV ) {
+                                var aa;
+                                if ( f.link_href.value && (aa = ed.dom.getParent(el, 'a')) ) html = ed.dom.getOuterHTML(aa);
                                 else html = ed.dom.getOuterHTML(el);
-                                
+
                                 P = ed.dom.create('p', {}, html);
-                                DL.parentNode.insertBefore(P,DL);
-                                ed.dom.remove(DL.childNodes);
-                                ed.dom.remove(DL);
+                                DIV.parentNode.insertBefore(P, DIV);
+                                ed.dom.remove(DIV);
                         }
                 }
@@ -478 +491 @@
                         if ( P && P.style && P.style.textAlign == 'center' )
                                 ed.dom.setStyle(P, 'textAlign', '');
+                }
+
+                if ( ! f.link_href.value && A ) {
+                        b = ed.selection.getBookmark();
+                        ed.dom.remove(A, 1);
+                        ed.selection.moveToBookmark(b);
                 }
 

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

@@ -130 +130 @@
 $mce_buttons_4 = apply_filters('mce_buttons_4', array());
 $mce_buttons_4 = implode($mce_buttons_4, ',');
+
+$do_captions = ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ? false : true;
 
 // TinyMCE init settings
@@ -164 +166 @@
         'content_css' => "$mce_css",
         'save_callback' => 'switchEditors.saveCallback',
+        'wpeditimage_do_captions' => $do_captions,
         'plugins' => "$plugins",
         // pass-through the settings for compression and caching, so they can be changed with "tiny_mce_before_init"
@@ -223 +226 @@
 if ( $disk_cache ) {
 
-        $cacheKey = apply_filters('tiny_mce_version', '20080626');
+        $cacheKey = apply_filters('tiny_mce_version', '20080710');
 
         foreach ( $initArray as $v )

branches/crazyhorse/wp-includes/js/tinymce/wordpress.css

@@ -16 +16 @@
 }
 
-.wp_caption {
+.wp-caption {
         border: 1px solid #ddd;
         text-align: center;
@@ -28 +28 @@
 }
 
-.wp_caption img {
+.wp-caption img {
         margin: 0;
         padding: 0;
@@ -34 +34 @@
 }
 
-.wp_caption_dd {
+.wp-caption-dd {
         font-size: 11px;
         line-height: 17px;

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

@@ -746 +746 @@
 function get_shortcut_link() {
         $link = "javascript:
-                        var d=document;
-                        var w=window;
-                        var e=w.getSelection;
-                        var k=d.getSelection;
-                        var x=d.selection;
-                        var s=(e?e():(k)?k():(x?x.createRange().text:0));
-                        var f='" . admin_url('press-this.php') . "';
-                        var l=d.location;
-                        var e=encodeURIComponent;
-                        var u= '?u=' + e(l.href);
-                        var t= '&t=' + e(d.title);
-                        var s= '&s=' + e(s);
-                        var v='&v=1';
-                        var g= f+u+t+s+v;
+                        var d=document,
+                        w=window,
+                        e=w.getSelection,
+                        k=d.getSelection,
+                        x=d.selection,
+                        s=(e?e():(k)?k():(x?x.createRange().text:0)),
+                        f='" . admin_url('press-this.php') . "',
+                        l=d.location,
+                        e=encodeURIComponent,
+                        g=f+'?u='+e(l.href)+'&t='+e(d.title)+'&s='+e(s)+'&v=2';
                         function a(){
                                 if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=700,height=500')){
                                         l.href=g;
                                 }
-                        }
-                        if(/Firefox/.test(navigator.userAgent)){
-                                setTimeout(a,0);
-                        }else{
-                                a();
-                        }
-                        void(0);";
+                        }";
+                        if (strpos($_SERVER['HTTP_USER_AGENT'], 'Firefox') !== false)
+                                $link .= 'setTimeout(a,0);';
+                        else
+                                $link .= 'a();';
+
+                        $link .= "void(0);";
 
         $link = str_replace(array("\r", "\n", "\t"),  '', $link);
@@ -777 +773 @@
 }
 
-// return the site_url option, using https if is_ssl() is true
-// if $scheme is 'http' or 'https' it will override is_ssl()
+/** Return the site url
+ *
+ *
+ * @package WordPress
+ * @since 2.6
+ *
+ * Returns the 'site_url' option with the appropriate protocol,  'https' if is_ssl() and 'http' otherwise. 
+ * If $scheme is 'http' or 'https', is_ssl() is overridden.
+ *
+ * @param string $path Optional path relative to the site url
+ * @param string $scheme Optional scheme to give the site url context. Currently 'http','https', 'login', 'login_post', or 'admin'
+ * @return string Site url link with optional path appended
+*/
 function site_url($path = '', $scheme = null) {
         // should the list of allowed schemes be maintained elsewhere?
@@ -800 +807 @@
 }
 
+/** Return the admin url
+ *
+ *
+ * @package WordPress
+ * @since 2.6
+ *
+ * Returns the url to the admin area
+ *
+ * @param string $path Optional path relative to the admin url
+ * @return string Admin url link with optional path appended
+*/
 function admin_url($path = '') {
-        global $_wp_admin_url;
-
         $url = site_url('wp-admin/', 'admin');
 
@@ -811 +827 @@
 }
 
+/** Return the includes url
+ *
+ *
+ * @package WordPress
+ * @since 2.6
+ *
+ * Returns the url to the includes directory
+ *
+ * @param string $path Optional path relative to the includes url
+ * @return string Includes url link with optional path appended
+*/
 function includes_url($path = '') {
-        global $_wp_includes_url;
-
         $url = site_url() . '/' . WPINC . '/';
 
@@ -822 +847 @@
 }
 
+/** Return the content url
+ *
+ *
+ * @package WordPress
+ * @since 2.6
+ *
+ * Returns the url to the content directory
+ *
+ * @param string $path Optional path relative to the content url
+ * @return string Content url link with optional path appended
+*/
+function content_url($path = '') {
+        $scheme = ( is_ssl() ? 'https' : 'http' );
+        $url = WP_CONTENT_URL;
+        if ( 0 === strpos($url, 'http') ) {
+                if ( is_ssl() )
+                        $url = str_replace( 'http://', "{$scheme}://", $url );
+        }
+
+        if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+                $url .= '/' . ltrim($path, '/');
+
+        return $url;
+}
+
+/** Return the plugins url
+ *
+ *
+ * @package WordPress
+ * @since 2.6
+ *
+ * Returns the url to the plugins directory
+ *
+ * @param string $path Optional path relative to the plugins url
+ * @return string Plugins url link with optional path appended
+*/
+function plugins_url($path = '') {
+        $scheme = ( is_ssl() ? 'https' : 'http' );
+        $url = WP_PLUGIN_URL;
+        if ( 0 === strpos($url, 'http') ) {
+                if ( is_ssl() )
+                        $url = str_replace( 'http://', "{$scheme}://", $url );
+        }
+
+        if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+                $url .= '/' . ltrim($path, '/');
+
+        return $url;
+}
+
 ?>

branches/crazyhorse/wp-includes/media.php

@@ -74 +74 @@
         elseif ( $size == 'thumbnail' ) {
                 // fall back to the old thumbnail
-                if ( $thumb_file = wp_get_attachment_thumb_file() && $info = getimagesize($thumb_file) ) {
+                if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
                         $img_url = str_replace(basename($img_url), basename($thumb_file), $img_url);
                         $width = $info[0];
@@ -275 +275 @@
 
 function image_get_intermediate_size($post_id, $size='thumbnail') {
-        if ( !$imagedata = wp_get_attachment_metadata( $post_id ) )
+        if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) )
                 return false;
 
@@ -351 +351 @@
 }
 
-add_shortcode('wp_caption', 'wp_caption_shortcode');
-
-function wp_caption_shortcode($attr, $content = null) {
-        
+add_shortcode('wp_caption', 'img_caption_shortcode');
+add_shortcode('caption', 'img_caption_shortcode');
+
+function img_caption_shortcode($attr, $content = null) {
+
+        if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF )
+                return $content;
+
         // Allow plugins/themes to override the default caption template.
-        $output = apply_filters('wp_caption_shortcode', '', $attr, $content);
+        $output = apply_filters('img_caption_shortcode', '', $attr, $content);
         if ( $output != '' )
                 return $output;
@@ -372 +376 @@
         if ( $id ) $id = 'id="' . $id . '" ';
         
-        return '<dl ' . $id . 'class="wp_caption ' . $align . '" style="width: ' . (10 + (int) $width) . 'px">'
-        . '<dt class="wp_caption_dt">' . $content . '</dt><dd class="wp_caption_dd">' . $caption . '</dd></dl>';
+        return '<div ' . $id . 'class="wp-caption ' . $align . '" style="width: ' . (10 + (int) $width) . 'px">'
+        . $content . '<p class="wp-caption-text">' . $caption . '</p></div>';
 }
 

branches/crazyhorse/wp-includes/pluggable.php

@@ -828 +828 @@
                 $location = 'http:' . $location;
 
-        $lp  = parse_url($location);
+        // In php 5 parse_url may fail if the URL query part contains http://, bug #38143
+        $test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
+        
+        $lp  = parse_url($test);
         $wpp = parse_url(get_option('home'));
 

branches/crazyhorse/wp-includes/post.php

@@ -2425 +2425 @@
         if ( !$post =& get_post( $post_id ) )
                 return false;
-        if ( !$imagedata = wp_get_attachment_metadata( $post->ID ) )
+        if ( !is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) )
                 return false;
 

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

@@ -35 +35 @@
         $scripts->add( 'editor', false, $visual_editor, '20080321' );
 
-        $scripts->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080701' );
+        $scripts->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080710' );
 
         // Modify this version when tinyMCE plugins are changed.
-        $mce_version = apply_filters('tiny_mce_version', '20080701');
+        $mce_version = apply_filters('tiny_mce_version', '20080710');
         $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
 
@@ -74 +74 @@
         $scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20');
         $scripts->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array('jquery'), '3.1-20080430');
-        $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.1.0');
-        $scripts->add( 'swfupload-degrade', '/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js', array('swfupload'), '2.1.0');
+        $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.0.2-20080430');
+        $scripts->add( 'swfupload-degrade', '/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js', array('swfupload'), '2.0.2');
         $scripts->localize( 'swfupload-degrade', 'uploadDegradeOptions', array(
                 'is_lighttpd_before_150' => is_lighttpd_before_150(),
         ) );
-        $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.1.0');
-        $scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.1.0');
+        $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.0.2');
+        $scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080407');
         // these error messages came from the sample swfupload js, they might need changing.
         $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', array(
@@ -159 +159 @@
                         'edit' => __('Edit'),
                 ) );
-                $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080520' );
-                $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080701' );
+                $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080709' );
+                $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080710' );
                 $scripts->localize( 'upload', 'uploadL10n', array(
                         'browseTitle' => attribute_escape(__('Browse your files')),
@@ -212 +212 @@
         $styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr';
 
-        $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets' );
+        $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie' );
 
         $styles->add( 'wp-admin', '/wp-admin/wp-admin.css' );
@@ -225 +225 @@
 
         $styles->add( 'global', '/wp-admin/css/global.css' );
-        $styles->add( 'media', '/wp-admin/css/media.css', array(), '20080523' );
+        $styles->add( 'media', '/wp-admin/css/media.css', array(), '20080709' );
         $styles->add( 'widgets', '/wp-admin/css/widgets.css' );
         $styles->add( 'dashboard', '/wp-admin/css/dashboard.css' );
-        $styles->add( 'install', '/wp-admin/css/install.css' );
+        $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' );
         $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
-        $styles->add( 'press-this', '/wp-admin/css/press-this.css' );
+        $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080710' );
+        $styles->add( 'press-this-ie', '/wp-admin/css/press-this-ie.css', array(), '20080710' );
+        $styles->add_data( 'press-this-ie', 'conditional', 'gte IE 6' );
         $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20080613' );
         $styles->add( 'login', '/wp-admin/css/login.css' );

branches/crazyhorse/wp-includes/theme.php

@@ -338 +338 @@
 
 function get_theme_root_uri() {
-        return apply_filters('theme_root_uri', WP_CONTENT_URL . "/themes", get_option('siteurl'));
+        return apply_filters('theme_root_uri', content_url('themes'), get_option('siteurl'));
 }
 
@@ -487 +487 @@
                 return;
 
-        $_GET[template] = preg_replace('|[^a-z0-9]|i', '', $_GET[template]);
+        $_GET[template] = preg_replace('|[^a-z0-9_-]|i', '', $_GET[template]);
 
         add_filter('template', create_function('', "return '$_GET[template]';") );
 
         if ( isset($_GET['stylesheet']) ) {
-                $_GET[stylesheet] = preg_replace('|[^a-z0-9]|i', '', $_GET[stylesheet]);
+                $_GET[stylesheet] = preg_replace('|[^a-z0-9_-]|i', '', $_GET[stylesheet]);
                 add_filter('stylesheet', create_function('', "return '$_GET[stylesheet]';") );
         }

branches/crazyhorse/wp-includes/update.php

@@ -11 +11 @@
  *
  * The WordPress version, PHP version, and Locale is sent. Checks against the WordPress server at
- * api.wordpress.org server. Will only check if PHP has fsockopen enabled and WordPress isn't installing.
+ * api.wordpress.org. Will only check if PHP has fsockopen enabled and WordPress isn't installing.
  *
  * @package WordPress
@@ -20 +20 @@
  */
 function wp_version_check() {
-        if ( !function_exists('fsockopen') || strpos($_SERVER['PHP_SELF'], 'install.php') !== false || defined('WP_INSTALLING') )
+        if ( !function_exists('fsockopen') || defined('WP_INSTALLING') )
                 return;
 
@@ -70 +70 @@
         update_option( 'update_core', $new_option );
 }
-
 add_action( 'init', 'wp_version_check' );
 
+/**
+ * wp_update_plugins() - Check plugin versions against the latest versions hosted on WordPress.org.
+ *
+ * The WordPress version, PHP version, and Locale is sent along with a list of all plugins installed.
+ * Checks against the WordPress server at api.wordpress.org.
+ * Will only check if PHP has fsockopen enabled and WordPress isn't installing.
+ *
+ * @package WordPress
+ * @since 2.3
+ * @uses $wp_version Used to notidy the WordPress version.
+ *
+ * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
+ */
+function wp_update_plugins() {
+        global $wp_version;
+
+        if ( !function_exists('fsockopen') || defined('WP_INSTALLING') )
+                return false;
+
+        $current = get_option( 'update_plugins' );
+
+        $time_not_changed = isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked );
+
+        // If running blog-side, bail unless we've not checked in the last 12 hours
+        if ( !function_exists( 'get_plugins' ) ) {
+                if ( $time_not_changed )
+                        return false;
+                require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+        }
+
+        $plugins = get_plugins();
+        $active  = get_option( 'active_plugins' );
+
+        $new_option = '';
+        $new_option->last_checked = time();
+
+        $plugin_changed = false;
+        foreach ( $plugins as $file => $p ) {
+                $new_option->checked[ $file ] = $p['Version'];
+
+                if ( !isset( $current->checked[ $file ] ) ) {
+                        $plugin_changed = true;
+                        continue;
+                }
+
+                if ( strval($current->checked[ $file ]) !== strval($p['Version']) )
+                        $plugin_changed = true;
+        }
+
+        // Bail if we've checked in the last 12 hours and if nothing has changed
+        if ( $time_not_changed && !$plugin_changed )
+                return false;
+
+        $to_send->plugins = $plugins;
+        $to_send->active = $active;
+        $send = serialize( $to_send );
+
+        $request = 'plugins=' . urlencode( $send );
+        $http_request  = "POST /plugins/update-check/1.0/ HTTP/1.0\r\n";
+        $http_request .= "Host: api.wordpress.org\r\n";
+        $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=" . get_option('blog_charset') . "\r\n";
+        $http_request .= "Content-Length: " . strlen($request) . "\r\n";
+        $http_request .= 'User-Agent: WordPress/' . $wp_version . '; ' . get_bloginfo('url') . "\r\n";
+        $http_request .= "\r\n";
+        $http_request .= $request;
+
+        $response = '';
+        if( false != ( $fs = @fsockopen( 'api.wordpress.org', 80, $errno, $errstr, 3) ) && is_resource($fs) ) {
+                fwrite($fs, $http_request);
+
+                while ( !feof($fs) )
+                        $response .= fgets($fs, 1160); // One TCP-IP packet
+                fclose($fs);
+                $response = explode("\r\n\r\n", $response, 2);
+        }
+
+        $response = unserialize( $response[1] );
+
+        if ( $response )
+                $new_option->response = $response;
+
+        update_option( 'update_plugins', $new_option );
+}
+if ( defined( 'WP_ADMIN' ) && WP_ADMIN )
+        add_action( 'admin_init', 'wp_update_plugins' );
+else
+        add_action( 'init', 'wp_update_plugins' );
+
 ?>

branches/crazyhorse/wp-includes/widgets.php

@@ -462 +462 @@
 function wp_widget_search($args) {
         extract($args);
-?>
-                <?php echo $before_widget; ?>
-                        <form id="searchform" method="get" action="<?php bloginfo('home'); ?>">
-                        <div>
+        $searchform_template = get_template_directory() . '/searchform.php';
+        
+        echo $before_widget;
+        
+        // Use current theme search form if it exists
+        if ( file_exists($searchform_template) ) {
+                include_once($searchform_template);
+        } else { ?>
+                <form id="searchform" method="get" action="<?php bloginfo('url'); ?>/"><div>
                         <label class="hidden" for="s"><?php _e('Search for:'); ?></label>
-                        <input type="text" name="s" id="s" size="15" /><br />
+                        <input type="text" name="s" id="s" size="15" value="<?php the_search_query(); ?>" />
                         <input type="submit" value="<?php echo attribute_escape(__('Search')); ?>" />
-                        </div>
-                        </form>
-                <?php echo $after_widget; ?>
-<?php
+                </div></form>
+        <?php }
+        
+        echo $after_widget;
 }
 

branches/crazyhorse/wp-includes/wp-db.php

@@ -686 +686 @@
                 else
                         return false;
-                return $this->query( "UPDATE $table SET " . implode( ', ', $bits ) . ' WHERE ' . implode( ' AND ', $wheres ) . ' LIMIT 1' );
+                        
+                return $this->query( "UPDATE $table SET " . implode( ', ', $bits ) . ' WHERE ' . implode( ' AND ', $wheres ) );
         }
 

branches/crazyhorse/wp-includes/wp-diff.php

@@ -309 +309 @@
         function _splitOnWords($string, $newlineEscape = "\n") {
                 $string = str_replace("\0", '', $string);
-                $words  = preg_split( '/([^\w])/', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
+                $words  = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
                 $words  = str_replace( "\n", $newlineEscape, $words );
                 return $words;

branches/crazyhorse/wp-login.php

@@ -54 +54 @@
         wp_admin_css( 'login', true );
         wp_admin_css( 'colors-fresh', true );
-        ?>
-        <script type="text/javascript">
-                function focusit() {
-                        document.getElementById('user_login').focus();
-                }
-                window.onload = focusit;
-        </script>
-<?php do_action('login_head'); ?>
+        do_action('login_head'); ?>
 </head>
 <body class="login">
@@ -335 +328 @@
 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&laquo; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
+<script type="text/javascript">
+try{document.getElementById('user_login').focus();}catch(e){}
+</script>
 </body>
 </html>
@@ -400 +396 @@
 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&laquo; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
+<script type="text/javascript">
+try{document.getElementById('user_login').focus();}catch(e){}
+</script>
 </body>
 </html>
@@ -482 +481 @@
 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&laquo; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
+<script type="text/javascript">
+try{document.getElementById('user_login').focus();}catch(e){}
+</script>
 </body>
 </html>