<!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" />
<title>[27001] branches/3.8: Dashboard widgets: Don't link to Pages or Posts for Authors or Contributors respectively.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27001">27001</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-01-22 17:17:34 +0000 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Dashboard widgets: Don't link to Pages or Posts for Authors or Contributors respectively.
Merges <a href="http://core.trac.wordpress.org/changeset/26999">[26999]</a> to the 3.8 branch.
props mattheu.
fixes <a href="http://core.trac.wordpress.org/ticket/26574">#26574</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches38srcwpadmincsswpadmincss">branches/3.8/src/wp-admin/css/wp-admin.css</a></li>
<li><a href="#branches38srcwpadminincludesdashboardphp">branches/3.8/src/wp-admin/includes/dashboard.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches38">branches/3.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.8
</span><span class="cx">===================================================================
</span><del>--- branches/3.8 2014-01-22 17:16:56 UTC (rev 27000)
</del><ins>+++ branches/3.8 2014-01-22 17:17:34 UTC (rev 27001)
</ins><a id="branches38"></a>
<div class="propset"><h4>Property changes: branches/3.8</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,26864,26874-26875,26885,26887-26888,26905,26919-26925,26928-26929,26932,26935,26952,26959,26961,26967,26970,26993
</del><ins>+/trunk:18512,26864,26874-26875,26885,26887-26888,26905,26919-26925,26928-26929,26932,26935,26952,26959,26961,26967,26970,26993,26999
</ins><span class="cx">\ No newline at end of property
</span><a id="branches38srcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: branches/3.8/src/wp-admin/css/wp-admin.css (27000 => 27001)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.8/src/wp-admin/css/wp-admin.css 2014-01-22 17:16:56 UTC (rev 27000)
+++ branches/3.8/src/wp-admin/css/wp-admin.css 2014-01-22 17:17:34 UTC (rev 27001)
</span><span class="lines">@@ -2965,7 +2965,8 @@
</span><span class="cx">
</span><span class="cx"> /* Dashboard right now - Colors */
</span><span class="cx">
</span><del>-#dashboard_right_now li a:before {
</del><ins>+#dashboard_right_now li a:before,
+#dashboard_right_now li span:before {
</ins><span class="cx"> color: #888;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2984,12 +2985,14 @@
</span><span class="cx"> margin: 0 0 1em;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#dashboard_right_now .warning a:before {
</del><ins>+#dashboard_right_now .warning a:before,
+#dashboard_right_now .warning span:before {
</ins><span class="cx"> color: #d54e21;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Dashboard right now - Icons */
</span><del>-#dashboard_right_now li a:before {
</del><ins>+#dashboard_right_now li a:before,
+#dashboard_right_now li span:before {
</ins><span class="cx"> content: '\f159';
</span><span class="cx"> font: normal 20px/1 'dashicons';
</span><span class="cx"> speak: none;
</span><span class="lines">@@ -3004,11 +3007,13 @@
</span><span class="cx"> text-decoration: none !important;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#dashboard_right_now .page-count a:before {
</del><ins>+#dashboard_right_now .page-count a:before,
+#dashboard_right_now .page-count span:before {
</ins><span class="cx"> content: '\f105';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#dashboard_right_now .post-count a:before {
</del><ins>+#dashboard_right_now .post-count a:before,
+#dashboard_right_now .post-count span:before {
</ins><span class="cx"> content: '\f109';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branches38srcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: branches/3.8/src/wp-admin/includes/dashboard.php (27000 => 27001)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.8/src/wp-admin/includes/dashboard.php 2014-01-22 17:16:56 UTC (rev 27000)
+++ branches/3.8/src/wp-admin/includes/dashboard.php 2014-01-22 17:17:34 UTC (rev 27001)
</span><span class="lines">@@ -194,7 +194,13 @@
</span><span class="cx"> $text = _n( '%s Page', '%s Pages', $num_posts->publish );
</span><span class="cx"> }
</span><span class="cx"> $text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
</span><del>- printf( '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text );
</del><ins>+ $post_type_object = get_post_type_object( $post_type );
+ if ( $post_type_object && current_user_can( $post_type_object->cap->edit_posts ) ) {
+ printf( '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text );
+ } else {
+ printf( '<li class="%1$s-count"><span>%2$s</span></li>', $post_type, $text );
+ }
+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> // Comments
</span></span></pre>
</div>
</div>
</body>
</html>