<!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>[12464] trunk/wp-includes/plugin.php: Improve do_action performance.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12464">12464</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-21 08:47:34 +0000 (Mon, 21 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve do_action performance. Make an associative array. Props koopersmith. fixes <a href="http://trac.wordpress.org/ticket/10561">#10561</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespluginphp">trunk/wp-includes/plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/plugin.php (12463 => 12464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/plugin.php 2009-12-20 05:32:52 UTC (rev 12463)
+++ trunk/wp-includes/plugin.php 2009-12-21 08:47:34 UTC (rev 12464)
</span><span class="lines">@@ -299,10 +299,13 @@
</span><span class="cx"> function do_action($tag, $arg = '') {
</span><span class="cx"> global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
</span><span class="cx">
</span><del>- if ( is_array($wp_actions) )
- $wp_actions[] = $tag;
</del><ins>+ if ( ! isset($wp_actions) )
+ $wp_actions = array();
+
+ if ( ! isset($wp_actions[$tag]) )
+ $wp_actions[$tag] = 1;
</ins><span class="cx"> else
</span><del>- $wp_actions = array($tag);
</del><ins>+ ++$wp_actions[$tag];
</ins><span class="cx">
</span><span class="cx"> $wp_current_filter[] = $tag;
</span><span class="cx">
</span><span class="lines">@@ -357,10 +360,10 @@
</span><span class="cx"> function did_action($tag) {
</span><span class="cx"> global $wp_actions;
</span><span class="cx">
</span><del>- if ( empty($wp_actions) )
</del><ins>+ if ( ! isset( $wp_actions ) || ! isset( $wp_actions[$tag] ) )
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return count(array_keys($wp_actions, $tag));
</del><ins>+ return $wp_actions[$tag];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -382,10 +385,13 @@
</span><span class="cx"> function do_action_ref_array($tag, $args) {
</span><span class="cx"> global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
</span><span class="cx">
</span><del>- if ( !is_array($wp_actions) )
- $wp_actions = array($tag);
</del><ins>+ if ( ! isset($wp_actions) )
+ $wp_actions = array();
+
+ if ( ! isset($wp_actions[$tag]) )
+ $wp_actions[$tag] = 1;
</ins><span class="cx"> else
</span><del>- $wp_actions[] = $tag;
</del><ins>+ ++$wp_actions[$tag];
</ins><span class="cx">
</span><span class="cx"> $wp_current_filter[] = $tag;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>