diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-08-06 10:24:47 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-08-06 10:24:47 +0000 |
| commit | e45949fbbdb8ee7e63099c97f6b5f60bb310e6a3 (patch) | |
| tree | 64f646a2b7b4ab718aa92f8f0e128bfa69b7cd04 | |
| parent | 808fef533c5187217e80f703bdb3c422b35a8234 (diff) | |
Changes from WordPress
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@133 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-inst/wp-admin/admin-functions.php | 4 | ||||
| -rw-r--r-- | wp-inst/wp-admin/tinymce/themes/advanced/image.htm | 3 | ||||
| -rw-r--r-- | wp-inst/wp-admin/tinymce/themes/advanced/link.htm | 6 | ||||
| -rw-r--r-- | wp-inst/wp-includes/functions-post.php | 24 | ||||
| -rw-r--r-- | wp-inst/wp-includes/version.php | 4 |
5 files changed, 26 insertions, 15 deletions
diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php index 6fa3d2a..1d9b377 100644 --- a/wp-inst/wp-admin/admin-functions.php +++ b/wp-inst/wp-admin/admin-functions.php @@ -92,13 +92,13 @@ function edit_post() { if ( 'publish' == $_POST['post_status'] && ! current_user_can('publish_posts') ) $_POST['post_status'] = 'draft'; - + if ( !isset($_POST['comment_status']) ) $_POST['comment_status'] = 'closed'; if ( !isset($_POST['ping_status']) ) $_POST['ping_status'] = 'closed'; - + if ( !empty($_POST['edit_date']) ) { $aa = $_POST['aa']; $mm = $_POST['mm']; diff --git a/wp-inst/wp-admin/tinymce/themes/advanced/image.htm b/wp-inst/wp-admin/tinymce/themes/advanced/image.htm index dc00689..7655da1 100644 --- a/wp-inst/wp-admin/tinymce/themes/advanced/image.htm +++ b/wp-inst/wp-admin/tinymce/themes/advanced/image.htm @@ -30,6 +30,8 @@ if (url != null) { }
function init() {
+ // Focus form field
+ document.getElementById('src').focus();
var formObj = document.forms[0];
for (var i=0; i<document.forms[0].align.options.length; i++) {
@@ -99,6 +101,7 @@ if (url != null) { tinyMCE.addEvent(preloadImg, "error", function () {var formObj = document.forms[0];formObj.width.value = formObj.height.value = "";});
preloadImg.src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], document.forms[0].src.value);
}
+
</script>
</head>
<body onload="init();">
diff --git a/wp-inst/wp-admin/tinymce/themes/advanced/link.htm b/wp-inst/wp-admin/tinymce/themes/advanced/link.htm index fc8311c..653f906 100644 --- a/wp-inst/wp-admin/tinymce/themes/advanced/link.htm +++ b/wp-inst/wp-admin/tinymce/themes/advanced/link.htm @@ -83,12 +83,14 @@ if (url != null) { formObj.link_list.options[i].selected = true;
}
}
+ // Focus form field
+ document.getElementById('href').focus();
}
function insertLink() {
if (window.opener) {
var href = document.forms[0].href.value;
- var target = document.forms[0].target.options[document.forms[0].target.selectedIndex].value;
+ var target = null;
var title = document.forms[0].linktitle.value;
var style_class = document.forms[0].styleSelect.value;
var dummy;
@@ -141,7 +143,7 @@ if (url != null) { <tr style="display: none;">
<td nowrap="nowrap">{$lang_insert_link_target}:</td>
<td><select name="target" style="width: 200px">
- <option value="_self">{$lang_insert_link_target_same}</option>
+ <option value="">{$lang_insert_link_target_same}</option>
<option value="_blank">{$lang_insert_link_target_blank}</option>
<script language="javascript">
var targets = tinyMCE.getParam('theme_advanced_link_targets', '').split(';');
diff --git a/wp-inst/wp-includes/functions-post.php b/wp-inst/wp-includes/functions-post.php index 7339a26..87c9e1a 100644 --- a/wp-inst/wp-includes/functions-post.php +++ b/wp-inst/wp-includes/functions-post.php @@ -20,12 +20,14 @@ function wp_insert_post($postarr = array()) { } // Get the basics. - $post_content = apply_filters('content_save_pre', $post_content); - $post_excerpt = apply_filters('excerpt_save_pre', $post_excerpt); - $post_title = apply_filters('title_save_pre', $post_title); - $post_category = apply_filters('category_save_pre', $post_category); - $post_status = apply_filters('status_save_pre', $post_status); - $post_name = apply_filters('name_save_pre', $post_name); + $post_content = apply_filters('content_save_pre', $post_content); + $post_excerpt = apply_filters('excerpt_save_pre', $post_excerpt); + $post_title = apply_filters('title_save_pre', $post_title); + $post_category = apply_filters('category_save_pre', $post_category); + $post_status = apply_filters('status_save_pre', $post_status); + $post_name = apply_filters('name_save_pre', $post_name); + $comment_status = apply_filters('comment_status_pre', $comment_status); + $ping_status = apply_filters('ping_status_pre', $ping_status); // Make sure we set a valid category if (0 == count($post_category) || !is_array($post_category)) { @@ -61,9 +63,13 @@ function wp_insert_post($postarr = array()) { if (empty($post_date_gmt)) $post_date_gmt = current_time('mysql', 1); - if (empty($comment_status)) - $comment_status = get_settings('default_comment_status'); - if (empty($ping_status)) + if ( empty($comment_status) ) { + if ( $update ) + $comment_status = 'closed'; + else + $comment_status = get_settings('default_comment_status'); + } + if ( empty($ping_status) ) $ping_status = get_settings('default_ping_status'); if ( empty($post_pingback) ) $post_pingback = get_option('default_pingback_flag'); diff --git a/wp-inst/wp-includes/version.php b/wp-inst/wp-includes/version.php index 53c9f16..4bc9147 100644 --- a/wp-inst/wp-includes/version.php +++ b/wp-inst/wp-includes/version.php @@ -2,6 +2,6 @@ // This just holds the version number, in a separate file so we can bump it without cluttering the SVN -$wp_version = '1.6-ALPHA-do-not-use'; +$wp_version = '1.6-ALPHA-2'; -?>
\ No newline at end of file +?> |