WP Merge

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

11 files changed, 136 insertions, 58 deletions

diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php
index 1cf51b5..f0f862b 100644
--- a/wp-inst/wp-admin/admin-functions.php
+++ b/wp-inst/wp-admin/admin-functions.php
@@ -63,6 +63,9 @@ function write_post() {
 	if ( $_POST['temp_ID'] )
 		relocate_children($_POST['temp_ID'], $post_ID);
 
+	// Now that we have an ID we can fix any attachment anchor hrefs
+	fix_attachment_links($post_ID);
+
 	return $post_ID;
 }
 
@@ -74,6 +77,40 @@ function relocate_children($old_ID, $new_ID) {
 	return $wpdb->query("UPDATE $wpdb->posts SET post_parent = $new_ID WHERE post_parent = $old_ID");
 }
 
+// Replace hrefs of attachment anchors with up-to-date permalinks.
+function fix_attachment_links($post_ID) {
+	global $wp_rewrite;
+
+	// Relevance check.
+	if ( false == $wp_rewrite->using_permalinks() )
+		return;
+
+	$post = & get_post($post_ID);
+
+	$search = "#<a[^>]+rel=('|\")[^'\"]*attachment[^>]*>#ie";
+
+	// See if we have any rel="attachment" links
+	if ( 0 == preg_match_all($search, $post->post_content, $anchor_matches, PREG_PATTERN_ORDER) )
+		return;
+
+	$i = 0;
+	$search = "# id=(\"|)(\d+)\\1#i";
+	foreach ( $anchor_matches[0] as $anchor ) {
+		echo "$search\n$anchor\n";
+		if ( 0 == preg_match($search, $anchor, $id_matches) )
+			continue;
+
+		$id = $id_matches[2];
+		$post_search[$i] = $anchor;
+		$post_replace[$i] = preg_replace("#href=(\"|')[^'\"]*\\1#e", "stripslashes('href=\\1').get_attachment_link($id).stripslashes('\\1')", $anchor);
+		++$i;
+	}
+
+	$post->post_content = str_replace($post_search, $post_replace, $post->post_content);
+
+	return wp_update_post($post);
+}
+
 // Update an existing post with values provided in $_POST.
 function edit_post() {
 	global $user_ID;
@@ -140,6 +177,9 @@ function edit_post() {
 
 	wp_update_post($_POST);
 
+	// Now that we have an ID we can fix any attachment anchor hrefs
+	fix_attachment_links($_POST['ID']);
+
 	// Meta Stuff
 	if ($_POST['meta'])
 		: foreach ($_POST['meta'] as $key => $value)
diff --git a/wp-inst/wp-admin/admin-header.php b/wp-inst/wp-admin/admin-header.php
index e4061f3..ac1b341 100644
--- a/wp-inst/wp-admin/admin-header.php
+++ b/wp-inst/wp-admin/admin-header.php
@@ -100,7 +100,12 @@ tinyMCE.init({
 	entity_encoding : "raw",
 	relative_urls : false,
 	remove_script_host : false,
-	valid_elements : "-a[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],address,-h1[class|align],-h2[class|align],-h3[class|align],-h4[class|align],-h5[class|align],-h6[class|align],hr",
+	force_p_newlines : true,
+	force_br_newlines : false,
+	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],address,-h1[class|align],-h2[class|align],-h3[class|align],-h4[class|align],-h5[class|align],-h6[class|align],hr",
 	plugins : "wordpress,autosave"
 	<?php do_action('mce_options'); ?>
 });
@@ -313,12 +318,12 @@ function myPload( str ) {
 	for( x=0; x < str.length; x++) {
 		andy = str.charAt(x);
 		if ( comma.indexOf(andy) != -1 ) {
+			currentElement = currentElement.replace(new RegExp('^\\s*(.*?)\\s*$', ''), '$1'); // trim
 			fixedExplode[count] = currentElement;
 			currentElement = "";
 			count++;
 		} else {
-			if ( ' ' != andy )
-				currentElement += andy;
+			currentElement += andy;
 		}
 	}
 
diff --git a/wp-inst/wp-admin/admin.php b/wp-inst/wp-admin/admin.php
index e6a4b23..010e4b3 100644
--- a/wp-inst/wp-admin/admin.php
+++ b/wp-inst/wp-admin/admin.php
@@ -41,6 +41,7 @@ require(ABSPATH . '/wp-admin/menu.php');
 
 // Handle plugin admin pages.
 if (isset($_GET['page'])) {
+	$plugin_page = stripslashes($_GET['page']);
 	$plugin_page = plugin_basename($_GET['page']);
 	$page_hook = get_plugin_page_hook($plugin_page, $pagenow);
 
diff --git a/wp-inst/wp-admin/edit-form-advanced.php b/wp-inst/wp-admin/edit-form-advanced.php
index 18c3ff6..c8db328 100644
--- a/wp-inst/wp-admin/edit-form-advanced.php
+++ b/wp-inst/wp-admin/edit-form-advanced.php
@@ -7,9 +7,11 @@ $messages[3] = __('Custom field deleted.');
 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>
 
+<?php $richedit = ( 'true' != get_user_option('rich_editing') ) ? false : true; ?>
+
 <form name="post" action="post.php" method="post" id="post">
-<?php if ( (isset($mode) && 'bookmarklet' == $mode) ||
-			isset($_GET['popupurl']) ): ?>
+<?php if ( (isset($mode) && 'bookmarklet' == $mode) || 
+            isset($_GET['popupurl']) ): ?>
 <input type="hidden" name="mode" value="bookmarklet" />
 <?php endif; ?>
 
@@ -140,7 +142,7 @@ endforeach;
   <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
 </fieldset>
 
-<fieldset id="<?php echo ( 'true' != get_user_option('rich_editing') ) ? 'postdiv' : 'postdivrich'; ?>">
+<fieldset id="<?php echo $richedit ? 'postdivrich' : 'postdiv'; ?>">
 <legend><?php _e('Post') ?></legend>
 
 <?php
@@ -149,11 +151,12 @@ endforeach;
      $rows = 12;
  }
 ?>
-<div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="2" id="content"><?php echo $post->post_content ?></textarea></div>
+<?php if ( !$richedit ) the_quicktags(); ?>
+
+<div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="2" id="content"><?php echo $richedit ? wp_richedit_pre($post->post_content) : $post->post_content; ?></textarea></div>
 </fieldset>
 
-<?php if ( 'true' != get_user_option('rich_editing') ) : ?>
-<?php the_quicktags(); ?>
+<?php if ( !$richedit ) : ?>
 <script type="text/javascript">
 <!--
 edCanvas = document.getElementById('content');
@@ -226,8 +229,6 @@ else
 <?php
 $uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
 $uploading_iframe_src = "inline-uploading.php?action=view&amp;post=$uploading_iframe_ID";
-if ( !$attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$uploading_iframe_ID'") )
-	$uploading_iframe_src = "inline-uploading.php?action=upload&amp;post=$uploading_iframe_ID";
 $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
 if ( false != $uploading_iframe_src )
 	echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';
diff --git a/wp-inst/wp-admin/edit-form-comment.php b/wp-inst/wp-admin/edit-form-comment.php
index 33a1dba..07ad4ca 100644
--- a/wp-inst/wp-admin/edit-form-comment.php
+++ b/wp-inst/wp-admin/edit-form-comment.php
@@ -4,6 +4,7 @@ $toprow_title = sprintf(__('Editing Comment # %s'), $comment->comment_ID);
 $form_action = 'editedcomment';
 $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment->comment_ID . "' />\n<input type='hidden' name='comment_post_ID' value='".$comment->comment_post_ID;
 ?>
+<?php $richedit = ( 'true' != get_user_option('rich_editing') ) ? false : true; ?>
 
 <form name="post" action="post.php" method="post" id="post">
 <div class="wrap">
@@ -37,14 +38,8 @@ addLoadEvent(focusit);
 
 <fieldset style="clear: both;">
         <legend><?php _e('Comment') ?></legend>
-<?php if ( 'true' != get_user_option('rich_editing') ) : ?>
-<?php the_quicktags(); ?>
-<script type="text/javascript">
-<!--
-edCanvas = document.getElementById('content');
-//-->
-</script>
-<?php endif; ?>
+<?php if ( !$richedit ) the_quicktags(); ?>
+
 <?php
  $rows = get_settings('default_post_edit_rows');
  if (($rows < 3) || ($rows > 100)) {
@@ -54,6 +49,13 @@ edCanvas = document.getElementById('content');
 <div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content" style="width: 99%"><?php echo $comment->comment_content ?></textarea></div>
 </fieldset>
 
+<?php if ( !$richedit ) : ?>
+<script type="text/javascript">
+<!--
+edCanvas = document.getElementById('content');
+//-->
+</script>
+<?php endif; ?>
 
 <p class="submit"><input type="submit" name="editcomment" id="editcomment" value="<?php echo $submitbutton_text ?>" style="font-weight: bold;" tabindex="6" />
   <input name="referredby" type="hidden" id="referredby" value="<?php echo $_SERVER['HTTP_REFERER']; ?>" />
diff --git a/wp-inst/wp-admin/edit-page-form.php b/wp-inst/wp-admin/edit-page-form.php
index cf9d584..ec625ca 100644
--- a/wp-inst/wp-admin/edit-page-form.php
+++ b/wp-inst/wp-admin/edit-page-form.php
@@ -20,6 +20,8 @@ $sendto = wp_specialchars( $sendto );
 
 ?>
 
+<?php $richedit = ( 'true' != get_user_option('rich_editing') ) ? false : true; ?>
+
 <form name="post" action="post.php" method="post" id="post">
 
 <?php
@@ -117,7 +119,7 @@ endforeach;
 </fieldset>
 
 
-<fieldset id="<?php echo ( 'true' != get_user_option('rich_editing') ) ? 'postdiv' : 'postdivrich'; ?>">
+<fieldset id="<?php echo ( $richedit) ? 'postdivrich' : 'postdiv'; ?>">
     <legend><?php _e('Page Content') ?></legend>
 <?php
  $rows = get_settings('default_post_edit_rows');
@@ -125,11 +127,12 @@ endforeach;
      $rows = 10;
  }
 ?>
-<div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content"><?php echo $post->post_content ?></textarea></div>
+<?php if (! $richedit ) the_quicktags(); ?>
+
+<div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content"><?php echo $richedit ? wp_richedit_pre($post->post_content) : $post->post_content; ?></textarea></div>
 </fieldset>
 
-<?php if ( 'true' != get_user_option('rich_editing') ) : ?>
-<?php the_quicktags(); ?>
+<?php if ( !$richedit ) : ?>
 <script type="text/javascript">
 <!--
 edCanvas = document.getElementById('content');
@@ -140,7 +143,7 @@ edCanvas = document.getElementById('content');
 <p class="submit">
 <?php if ( $post_ID ) : ?>
 <input name="save" type="submit" id="save" tabindex="5" value=" <?php _e('Save and Continue Editing'); ?> "/> 
-<input name="savepage" type="submit" id="savepage" tabindex="6" value="<?php $post_ID ? _e('Save') : _e('Create New Page') ?> &raquo;" style="font-weight: bold;"/> 
+<input name="savepage" type="submit" id="savepage" tabindex="6" value="<?php $post_ID ? _e('Save') : _e('Create New Page') ?> &raquo;" /> 
 <?php else : ?>
 <input name="savepage" type="submit" id="savepage" tabindex="6" value="<?php _e('Create New Page') ?> &raquo;" /> 
 <?php endif; ?>
@@ -150,8 +153,6 @@ edCanvas = document.getElementById('content');
 <?php
 $uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
 $uploading_iframe_src = "inline-uploading.php?action=view&amp;post=$uploading_iframe_ID";
-if ( !$attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$uploading_iframe_ID'") )
-	$uploading_iframe_src = "inline-uploading.php?action=upload&amp;post=$uploading_iframe_ID";
 $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
 if ( false != $uploading_iframe_src )
 	echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';
diff --git a/wp-inst/wp-admin/images/toggle.gif b/wp-inst/wp-admin/images/toggle.gif
index 795772e..72e8b44 100644
--- a/wp-inst/wp-admin/images/toggle.gif
+++ b/wp-inst/wp-admin/images/toggle.gif
diff --git a/wp-inst/wp-admin/import/mt.php b/wp-inst/wp-admin/import/mt.php
index ce645e8..c66317c 100644
--- a/wp-inst/wp-admin/import/mt.php
+++ b/wp-inst/wp-admin/import/mt.php
@@ -416,5 +416,5 @@ class MT_Import {
 
 $mt_import = new MT_Import();
 
-register_importer('mt', 'Movable Type', 'Import posts and comments from your Movable Type blog', array ($mt_import, 'dispatch'));
+//register_importer('mt', 'Movable Type', 'Import posts and comments from your Movable Type blog', array ($mt_import, 'dispatch'));
 ?>
diff --git a/wp-inst/wp-admin/inline-uploading.php b/wp-inst/wp-admin/inline-uploading.php
index 25251bb..eaa8d16 100644
--- a/wp-inst/wp-admin/inline-uploading.php
+++ b/wp-inst/wp-admin/inline-uploading.php
@@ -80,7 +80,7 @@ $imagedata['hwstring_small'] = "height='$uheight' width='$uwidth'";
 $imagedata['file'] = $file;

 $imagedata['thumb'] = "thumb-$filename";

 

-add_post_meta($id, 'imagedata', $imagedata);

+add_post_meta($id, '_wp_attachment_metadata', $imagedata);

 

 if ( $imagedata['width'] * $imagedata['height'] < 3 * 1024 * 1024 ) {

 	if ( $imagedata['width'] > 128 && $imagedata['width'] >= $imagedata['height'] * 4 / 3 )

@@ -124,7 +124,10 @@ if ( '' == $sort )
 

 $images = $wpdb->get_results("SELECT ID, post_date, post_title, guid FROM $wpdb->posts WHERE post_status = 'attachment' AND left(post_mime_type, 5) = 'image' $and_post ORDER BY $sort LIMIT $start, $double", ARRAY_A);

 

-if ( count($images) > $num ) {

+if ( count($images) == 0 ) {

+	header("Location: ".basename(__FILE__)."?post=$post&action=upload");

+	die;

+} elseif ( count($images) > $num ) {

 	$next = $start + count($images) - $num;

 } else {

 	$next = false;

@@ -138,7 +141,6 @@ if ( $start > 0 ) {
 	$back = false;

 }

 

-$i = 0;

 $uwidth_sum = 0;

 $images_html = '';

 $images_style = '';

@@ -157,15 +159,20 @@ if ( count($images) > 0 ) {
 	$images_script .= "attachmenton = '$__attachment_on';\nattachmentoff = '$__attachment_off';\n";

 	$images_script .= "thumbnailon = '$__thumbnail_on';\nthumbnailoff = '$__thumbnail_off';\n";

 	foreach ( $images as $key => $image ) {

-		$meta = get_post_meta($image['ID'], 'imagedata', true);

+		$attachment_ID = $image['ID'];

+		$meta = get_post_meta($attachment_ID, '_wp_attachment_metadata', true);

 		if (!is_array($meta)) {

-			wp_delete_attachment($image['ID']);

-			continue;

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

+			if (!is_array($meta)) {

+				continue;

+			} else {

+				add_post_meta($attachment_ID, '_wp_attachment_metadata', $meta);

+			}

 		}

 		$image = array_merge($image, $meta);

 		if ( ($image['width'] > 128 || $image['height'] > 96) && !empty($image['thumb']) && file_exists(dirname($image['file']).'/'.$image['thumb']) ) {

 			$src = str_replace(basename($image['guid']), '', $image['guid']) . $image['thumb'];

-			$images_script .= "src".$i."a = '$src';\nsrc".$i."b = '".$image['guid']."';\n";

+			$images_script .= "src".$attachment_ID."a = '$src';\nsrc".$attachment_ID."b = '".$image['guid']."';\n";

 			$thumb = 'true';

 			$thumbtext = $__thumbnail_on;

 		} else {

@@ -178,24 +185,22 @@ if ( count($images) > 0 ) {
 		$uwidth_sum += 128;

 		$xpadding = (128 - $image['uwidth']) / 2;

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

-		$attachment = $image['ID'];

-		$images_style .= "#target$i img { padding: {$ypadding}px {$xpadding}px; }\n";

-		$href = get_attachment_link($attachment);

-		$images_script .= "href".$i."a = '$href';\nhref".$i."b = '{$image['guid']}';\n";

+		$images_style .= "#target{$attachment_ID} img { padding: {$ypadding}px {$xpadding}px; }\n";

+		$href = get_attachment_link($attachment_ID);

+		$images_script .= "href{$attachment_ID}a = '$href';\nhref{$attachment_ID}b = '{$image['guid']}';\n";

 		$images_html .= "

-<div id='target$i' class='imagewrap left'>

-	<div id='popup$i' class='popup'>

-		<a id=\"L$i\" onclick=\"toggleLink($i);return false;\" href=\"javascript:void();\">$__attachment_on</a>

-		<a id=\"I$i\" onclick=\"if($thumb)toggleImage($i);else alert('$__nothumb');return false;\" href=\"javascript:void();\">$thumbtext</a>

-		<a onclick=\"return confirm('$__confirmdelete')\" href=\"".basename(__FILE__)."?action=delete&amp;attachment=$attachment&amp;all=$all&amp;start=$start&amp;post=$post\">$__delete</a>

+<div id='target{$attachment_ID}' class='imagewrap left'>

+	<div id='popup{$attachment_ID}' class='popup'>

+		<a id=\"L{$attachment_ID}\" onclick=\"toggleLink({$attachment_ID});return false;\" href=\"javascript:void();\">$__attachment_on</a>

+		<a id=\"I{$attachment_ID}\" onclick=\"if($thumb)toggleImage({$attachment_ID});else alert('$__nothumb');return false;\" href=\"javascript:void();\">$thumbtext</a>

+		<a onclick=\"return confirm('$__confirmdelete')\" href=\"".basename(__FILE__)."?action=delete&amp;attachment={$attachment_ID}&amp;all=$all&amp;start=$start&amp;post=$post\">$__delete</a>

 		<a onclick=\"popup.style.display='none';return false;\" href=\"javascript:void()\">$__close</a>

 	</div>

-	<a id=\"link$i\" class=\"imagelink\" href=\"$href\" onclick=\"imagePopup($i);return false;\" title=\"{$image['post_title']}\">		

-		<img id='image$i' src='$src' alt='{$image['post_title']}' $height_width />

+	<a id=\"{$attachment_ID}\" rel=\"attachment\" class=\"imagelink\" href=\"$href\" onclick=\"imagePopup({$attachment_ID});return false;\" title=\"{$image['post_title']}\">		

+		<img id=\"image{$attachment_ID}\" src=\"$src\" alt=\"{$attachment_ID}\" $height_width />

 	</a>

 </div>

 ";

-		$i++;

 	}

 }

 

@@ -245,7 +250,7 @@ function init() {
 popup = false;

 }

 function toggleLink(n) {

-	o=document.getElementById('link'+n);

+	o=document.getElementById(n);

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

 	if ( oi.innerHTML == attachmenton ) {

 		o.href = eval('href'+n+'b');

diff --git a/wp-inst/wp-admin/options-permalink.php b/wp-inst/wp-admin/options-permalink.php
index aaba9bc..7ef3c46 100644
--- a/wp-inst/wp-admin/options-permalink.php
+++ b/wp-inst/wp-admin/options-permalink.php
@@ -37,6 +37,9 @@ structure.value = inputs;
 function blurry() {
 if (!document.getElementById) return;
 
+var structure = document.getElementById('permalink_structure');
+structure.onfocus = function () { document.getElementById('custom_selection').checked = 'checked'; }
+
 var aInputs = document.getElementsByTagName('input');
 
 for (var i = 0; i < aInputs.length; i++) {		
@@ -136,7 +139,7 @@ $structures = array(
 </p>
 <p>
 <label>
-<input name="selection" type="radio" value="custom" class="tog"
+<input name="selection" id="custom_selection" type="radio" value="custom" class="tog"
 <?php if ( !in_array($permalink_structure, $structures) ) { ?>
 checked="checked"
 <?php } ?>
diff --git a/wp-inst/wp-admin/wp-admin.css b/wp-inst/wp-admin/wp-admin.css
index 15c6d67..c068fe2 100644
--- a/wp-inst/wp-admin/wp-admin.css
+++ b/wp-inst/wp-admin/wp-admin.css
@@ -708,7 +708,8 @@ table .vers, table .name {
 	margin-bottom: 1em;
 }
 #moremeta fieldset div {
-	margin: 2px 0 0 5px;
+	margin: 2px 0 0 0px;
+	padding-left: 7px;
 }
 #moremeta {
 	line-height: 130%;
@@ -810,20 +811,39 @@ table .vers, table .name {
 /* toggle images */
 a.dbx-toggle, a.dbx-toggle:visited {
 	display:block;
-	width: 9px;
-	height: 9px;
 	overflow: hidden;
 	background-image: url( images/toggle.gif );
 	position: absolute;
-	top: 10px;
-	right: 14px;
+	top: 0px;
+	right: 0px;
 	background-repeat: no-repeat;
-	border-bottom: 0;
-	background-position: 0 9px;
+	border: 0px;
+	margin: 0px;
+	padding: 0px;
 }
-	
-a.dbx-toggle-open, a.dbx-toggle-open:visited {
-	background-position: 0 0;
+
+#moremeta a.dbx-toggle, #moremeta a.dbx-toggle-open:visited {
+	height: 25px;
+	width: 27px;
+	background-position: 0 0px;
+}
+
+#moremeta a.dbx-toggle-open, #moremeta a.dbx-toggle-open:visited {
+	height: 25px;
+	width: 27px;
+	background-position: 0 -25px;
+}
+
+#advancedstuff a.dbx-toggle, #advancedstuff a.dbx-toggle-open:visited {
+	height: 22px;
+	width: 22px;
+	background-position: 0 -3px;
+}
+
+#advancedstuff a.dbx-toggle-open, #advancedstuff a.dbx-toggle-open:visited {
+	height: 22px;
+	width: 22px;
+	background-position: 0 -28px;
 }
 
 #categorychecklist {