WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@454 7be80a69-a1ef-0310-a953-fb0f7c49ff36

5 files changed, 38 insertions, 7 deletions

diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php
index cfce700..d89f5b1 100644
--- a/wp-inst/wp-admin/admin-functions.php
+++ b/wp-inst/wp-admin/admin-functions.php
@@ -97,6 +97,14 @@ function fix_attachment_links($post_ID) {
 			continue;
 
 		$id = $id_matches[2];
+
+		// While we have the attachment ID, let's adopt any orphans.
+		$attachment = & get_post($id);
+		if ( ! is_object(get_post($attachment->post_parent)) ) {
+			$attachment->post_parent = $post_ID;
+			wp_update_post($attachment);
+		}
+
 		$post_search[$i] = $anchor;
 		$post_replace[$i] = preg_replace("#href=(\"|')[^'\"]*\\1#e", "stripslashes('href=\\1').get_attachment_link($id).stripslashes('\\1')", $anchor);
 		++$i;
diff --git a/wp-inst/wp-admin/admin-header.php b/wp-inst/wp-admin/admin-header.php
index 5747ebc..0e42e58 100644
--- a/wp-inst/wp-admin/admin-header.php
+++ b/wp-inst/wp-admin/admin-header.php
@@ -79,15 +79,20 @@ addLoadEvent(blurry);
 <script type="text/javascript" src="../wp-includes/js/tw-sack.js"></script>
 <script type="text/javascript" src="list-manipulation.js"></script>
 <?php if ( isset( $editing ) ) : ?>
-<?php if ( 'true' == get_user_option('rich_editing') ) :?>
-<script language="javascript" type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce_gzip.php?index=0&theme=advanced&plugins=wordpress,autosave,wphelp"></script>
+<?php if ( $editing && 'true' == get_user_option('rich_editing') ) :
+$mce_plugins = apply_filters('mce_plugins', array('wordpress', 'autosave', 'wphelp'));
+$mce_plugins = implode($mce_plugins, ',');
+$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'separator', 'bullist', 'numlist', 'outdent', 'indent', 'separator', 'justifyleft', 'justifycenter', 'justifyright' ,'separator', 'link', 'unlink', 'image', 'emotions', 'wordpress', 'separator', 'undo', 'redo', 'code', 'wphelp'));
+$mce_buttons = implode($mce_buttons, ',');
+?>
+<script language="javascript" type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce_gzip.php?index=0&theme=advanced&plugins=<?php echo $mce_plugins; ?>"></script>
 <script type="text/javascript">
 tinyMCE.init({
 	mode : "specific_textareas",
 	textarea_trigger : "title",
 	width : "100%",
 	theme : "advanced",
-	theme_advanced_buttons1 : "bold,italic,strikethrough,separator,bullist,numlist,outdent,indent,separator,justifyleft,justifycenter,justifyright,separator,link,unlink,image,emotions,wordpress,separator,undo,redo,code,wphelp",
+	theme_advanced_buttons1 : "<?php echo $mce_buttons; ?>",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location : "top",
@@ -105,8 +110,8 @@ tinyMCE.init({
 	convert_newlines_to_brs : false,
 	remove_linebreaks : true,
 	save_callback : "wp_save_callback",
-	valid_elements : "-a[id|href|title|rel],-strong/b,-em/i,-strike,-del,-u,p[class|align],-ol,-ul,-li,br,img[class|src|alt|title|width|height|align],-sub,-sup,-blockquote,-table[border=0|cellspacing|cellpadding|width|height|class|align],tr[class|rowspan|width|height|align|valign],td[dir|class|colspan|rowspan|width|height|align|valign],-div[dir|class|align],-span[class|align],-pre[class],-code[class],-address,-h1[class|align],-h2[class|align],-h3[class|align],-h4[class|align],-h5[class|align],-h6[class|align],hr",
-	plugins : "wordpress,autosave,wphelp"
+	valid_elements : "-a[id|href|title|rel],-strong/b,-em/i,-strike,-del,-u,p[class|align|dir],-ol,-ul,-li,br,img[class|src|alt|title|width|height|align],-sub,-sup,-blockquote[dir],-table[border=0|cellspacing|cellpadding|width|height|class|align|dir],tr[class|rowspan|width|height|align|valign|dir],td[dir|class|colspan|rowspan|width|height|align|valign],-div[dir|class|align],-span[class|align],-pre[class],-code[class],-address,-h1[class|align|dir],-h2[class|align|dir],-h3[class|align|dir],-h4[class|align|dir],-h5[class|align|dir],-h6[class|align|dir],hr",
+	plugins : "<?php echo $mce_plugins; ?>"
 	<?php do_action('mce_options'); ?>
 });
 </script>
diff --git a/wp-inst/wp-admin/inline-uploading.php b/wp-inst/wp-admin/inline-uploading.php
index 0458dd6..0295200 100644
--- a/wp-inst/wp-admin/inline-uploading.php
+++ b/wp-inst/wp-admin/inline-uploading.php
@@ -161,6 +161,7 @@ if ( count($attachments) > 0 ) {
 	$__not_linked = __('Not Linked');

 	$__linked_to_page = __('Linked to Page');

 	$__linked_to_image = __('Linked to Image');

+	$__linked_to_file = __('Linked to File');

 	$__using_thumbnail = __('Using Thumbnail');

 	$__using_original = __('Using Original');

 	$__no_thumbnail = __('<del>No Thumbnail</del>');

@@ -170,11 +171,13 @@ if ( count($attachments) > 0 ) {
 	$script .= "notlinked = '$__not_linked';

 linkedtoimage = '$__linked_to_image';

 linkedtopage = '$__linked_to_page';

+linkedtofile = '$__linked_to_file';

 usingthumbnail = '$__using_thumbnail';

 usingoriginal = '$__using_original';

 ";

 	foreach ( $attachments as $key => $attachment ) {

 		$ID = $attachment['ID'];

+		$href = get_attachment_link($ID);

 		$meta = get_post_meta($ID, '_wp_attachment_metadata', true);

 		if (!is_array($meta)) {

 			$meta = get_post_meta($ID, 'imagedata', true); // Try 1.6 Alpha meta key

@@ -207,7 +210,6 @@ src{$ID}b = '{$image['guid']}';
 			$xpadding = (128 - $image['uwidth']) / 2;

 			$ypadding = (96 - $image['uheight']) / 2;

 			$style .= "#target{$ID} img { padding: {$ypadding}px {$xpadding}px; }\n";

-			$href = get_attachment_link($ID);

 			$script .= "a{$ID}a = '<a id=\"{$ID}\" rel=\"attachment\" class=\"imagelink\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$image['post_title']}\">';

 a{$ID}b = '<a class=\"imagelink\" href=\"{$image['guid']}\" onclick=\"doPopup({$ID});return false;\" title=\"{$image['post_title']}\">';

 img{$ID}a = '<img id=\"image{$ID}\" src=\"$src\" alt=\"{$image['post_title']}\" $height_width />';

@@ -225,9 +227,13 @@ img{$ID}b = '<img id=\"image{$ID}\" src=\"{$image['guid']}\" alt=\"{$image['post
 </div>

 ";

 		} else {

+			$script .= "a{$ID}a = '<a id=\"{$ID}\" rel=\"attachment\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$attachment['post_title']}\">{$attachment['post_title']}</a>';

+a{$ID}b = '<a id=\"{$ID}\" href=\"{$attachment['guid']}\" onclick=\"doPopup({$ID});return false;\" title=\"{$attachment['post_title']}\">{$attachment['post_title']}</a>';

+";

 			$html .= "<div id='target{$ID}' class='attwrap left'>

 	<div id='popup{$ID}' class='popup'>

 		<div class='filetype'>File Type: ".str_replace('/',"/\n",$attachment['post_mime_type'])."</div>

+		<a id=\"L{$ID}\" onclick=\"toggleOtherLink({$ID});return false;\" href=\"javascript:void()\">$__linked_to_file</a>

 		{$delete_cancel}

 	</div>

 	<div id='div{$ID}' class='otherwrap' onmousedown=\"selectLink({$ID})\" onclick=\"doPopup({$ID});return false;\">

@@ -302,6 +308,17 @@ function toggleLink(n) {
 		ol.innerHTML = notlinked;

 	}

 }

+function toggleOtherLink(n) {

+	od=document.getElementById('div'+n);

+	ol=document.getElementById('L'+n);

+	if ( ol.innerHTML == linkedtofile ) {

+		od.innerHTML = eval('a'+n+'a');

+		ol.innerHTML = linkedtopage;

+	} else {

+		od.innerHTML = eval('a'+n+'b');

+		ol.innerHTML = linkedtofile;

+	}

+}

 function toggleImage(n) {

 	o = document.getElementById('image'+n);

 	oi = document.getElementById('I'+n);

diff --git a/wp-inst/wp-admin/upgrade-functions.php b/wp-inst/wp-admin/upgrade-functions.php
index 0e5982d..5e1187f 100644
--- a/wp-inst/wp-admin/upgrade-functions.php
+++ b/wp-inst/wp-admin/upgrade-functions.php
@@ -31,7 +31,7 @@ function upgrade_all() {
 		upgrade_130();
 	}
 	
-	if ( $wp_current_db_version < 3199 )
+	if ( $wp_current_db_version < 3243 )
 		upgrade_160();
 
 	save_mod_rewrite_rules();
diff --git a/wp-inst/wp-admin/upgrade-schema.php b/wp-inst/wp-admin/upgrade-schema.php
index 0751f17..9a4899c 100644
--- a/wp-inst/wp-admin/upgrade-schema.php
+++ b/wp-inst/wp-admin/upgrade-schema.php
@@ -355,6 +355,7 @@ function populate_roles_160() {
 	$role = $wp_roles->get_role('author');
 	$role->add_cap('upload_files');
 	$role->add_cap('edit_posts');
+	$role->add_cap('edit_published_posts');
 	$role->add_cap('publish_posts');
 	$role->add_cap('read');
 	$role->add_cap('level_2');