
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--

#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }

#msg ul, pre { overflow: auto; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<title>[12360] trunk/wp-admin: Change 'Remove' link on widgets to 'Delete'

  because it doesn't just remove it,

  it deletes the settings for that widget instance.</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12360">12360</a></dd>

<dt>Author</dt> <dd>markjaquith</dd>

<dt>Date</dt> <dd>2009-12-10 08:51:36 +0000 (Thu, 10 Dec 2009)</dd>

</dl>


<h3>Log Message</h3>

<pre>Change 'Remove' link on widgets to 'Delete' because it doesn't just remove it, it deletes the settings for that widget instance. props Denis-de-Bernardy. fixes <a href="http://trac.wordpress.org/ticket/10379">#10379</a></pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminincludeswidgetsphp">trunk/wp-admin/includes/widgets.php</a></li>

<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadminincludeswidgetsphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/includes/widgets.php (12359 => 12360)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/widgets.php        2009-12-10 08:42:45 UTC (rev 12359)

+++ trunk/wp-admin/includes/widgets.php        2009-12-10 08:51:36 UTC (rev 12360)

</span><span class="lines">@@ -198,7 +198,7 @@

</span><span class="cx"> 

</span><span class="cx">         &lt;div class=&quot;widget-control-actions&quot;&gt;

</span><span class="cx">                 &lt;div class=&quot;alignleft&quot;&gt;

</span><del>-                &lt;a class=&quot;widget-control-remove&quot; href=&quot;#remove&quot;&gt;&lt;?php _e('Remove'); ?&gt;&lt;/a&gt; |

</del><ins>+                &lt;a class=&quot;widget-control-remove&quot; href=&quot;#remove&quot;&gt;&lt;?php _e('Delete'); ?&gt;&lt;/a&gt; |

</ins><span class="cx">                 &lt;a class=&quot;widget-control-close&quot; href=&quot;#close&quot;&gt;&lt;?php _e('Close'); ?&gt;&lt;/a&gt;

</span><span class="cx">                 &lt;/div&gt;

</span><span class="cx">                 &lt;div class=&quot;alignright&lt;?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?&gt;&quot;&gt;

</span></span></pre></div>

<a id="trunkwpadminwidgetsphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (12359 => 12360)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/widgets.php        2009-12-10 08:42:45 UTC (rev 12359)

+++ trunk/wp-admin/widgets.php        2009-12-10 08:51:36 UTC (rev 12360)

</span><span class="lines">@@ -296,7 +296,7 @@

</span><span class="cx"> &lt;?php        if ( isset($_GET['addnew']) ) { ?&gt;

</span><span class="cx">         &lt;a href=&quot;widgets.php&quot; class=&quot;button alignleft&quot;&gt;&lt;?php _e('Cancel'); ?&gt;&lt;/a&gt;

</span><span class="cx"> &lt;?php        } else { ?&gt;

</span><del>-        &lt;input type=&quot;submit&quot; name=&quot;removewidget&quot; class=&quot;button alignleft&quot; value=&quot;&lt;?php esc_attr_e('Remove'); ?&gt;&quot; /&gt;

</del><ins>+        &lt;input type=&quot;submit&quot; name=&quot;removewidget&quot; class=&quot;button alignleft&quot; value=&quot;&lt;?php esc_attr_e('Delete'); ?&gt;&quot; /&gt;

</ins><span class="cx"> &lt;?php        } ?&gt;

</span><span class="cx">         &lt;input type=&quot;submit&quot; name=&quot;savewidget&quot; class=&quot;button-primary alignright&quot; value=&quot;&lt;?php esc_attr_e('Save Widget'); ?&gt;&quot; /&gt;

</span><span class="cx">         &lt;input type=&quot;hidden&quot; name=&quot;widget-id&quot; class=&quot;widget-id&quot; value=&quot;&lt;?php echo esc_attr($widget_id); ?&gt;&quot; /&gt;

</span></span></pre>

</div>

</div>


</body>

</html>