<!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>[15318] trunk/wp-admin/plugins.php: Markup fixes for plugins screen.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15318">15318</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-06-24 15:10:23 +0000 (Thu, 24 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Markup fixes for plugins screen. Props johnbillion. fixes <a href="http://trac.wordpress.org/ticket/14007">#14007</a> for 3.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (15317 => 15318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-06-24 15:07:42 UTC (rev 15317)
+++ trunk/wp-admin/plugins.php 2010-06-24 15:10:23 UTC (rev 15318)
</span><span class="lines">@@ -555,9 +555,10 @@
</span><span class="cx"> $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
</span><span class="cx"> } else {
</span><span class="cx"> $is_active = false;
</span><del>- $description = '<strong>' . $dropins[ $plugin_file ][0] . ' <span class="attention">' . __('Inactive:') . '</span></strong> ' . sprintf( __( 'Requires <code>%s</code> in <code>wp-config.php</code>.' ), "define('" . $dropins[ $plugin_file ][1] . "', true);" ) . '</p>';
</del><ins>+ $description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="attention">' . __('Inactive:') . '</span></strong> ' . sprintf( __( 'Requires <code>%s</code> in <code>wp-config.php</code>.' ), "define('" . $dropins[ $plugin_file ][1] . "', true);" ) . '</p>';
</ins><span class="cx"> }
</span><del>- $description .= '<p>' . $plugin_data['Description'] . '</p>';
</del><ins>+ if ( $plugin_data['Description'] )
+ $description .= '<p>' . $plugin_data['Description'] . '</p>';
</ins><span class="cx"> } else {
</span><span class="cx"> $is_active_for_network = is_plugin_active_for_network($plugin_file);
</span><span class="cx"> $is_active = $is_active_for_network || is_plugin_active( $plugin_file );
</span><span class="lines">@@ -736,9 +737,9 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> if ( 'mustuse' == $status )
</span><del>- echo '<div class="clear"><p>' . __( 'Files in the <code>/wp-content/mu-plugins</code> directory are executed automatically.' ) . '</p>';
</del><ins>+ echo '<div class="clear"></div><p>' . __( 'Files in the <code>/wp-content/mu-plugins</code> directory are executed automatically.' ) . '</p>';
</ins><span class="cx"> elseif ( 'dropins' == $status )
</span><del>- echo '<div class="clear"><p>' . __( 'Drop-ins are advanced plugins in the <code>/wp-content</code> directory that replace WordPress functionality when present.' ) . '</p>';
</del><ins>+ echo '<div class="clear"></div><p>' . __( 'Drop-ins are advanced plugins in the <code>/wp-content</code> directory that replace WordPress functionality when present.' ) . '</p>';
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $plugins ) && ( ! in_array( $status, array( 'mustuse', 'dropins' ) ) || $page_links ) ) :
</span><span class="cx"> ?>
</span><span class="lines">@@ -769,8 +770,6 @@
</span><span class="cx"> print_plugin_actions($status, "action2");
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</span><del>-<?php } elseif ( ! empty( $all_plugins ) ) { ?>
-<p><?php __( 'No plugins found.' ); ?></p>
</del><span class="cx"> <?php } ?>
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>