<!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>[17638] trunk/wp-includes/plugin.php: Avoid array push/
pops for empty filters and actions.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17638">17638</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-14 18:05:30 +0000 (Thu, 14 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid array push/pops for empty filters and actions. fixes <a href="http://trac.wordpress.org/ticket/17110">#17110</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 (17637 => 17638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/plugin.php 2011-04-13 17:30:02 UTC (rev 17637)
+++ trunk/wp-includes/plugin.php 2011-04-14 18:05:30 UTC (rev 17638)
</span><span class="lines">@@ -135,19 +135,23 @@
</span><span class="cx"> global $wp_filter, $merged_filters, $wp_current_filter;
</span><span class="cx">
</span><span class="cx"> $args = array();
</span><del>- $wp_current_filter[] = $tag;
</del><span class="cx">
</span><span class="cx"> // Do 'all' actions first
</span><span class="cx"> if ( isset($wp_filter['all']) ) {
</span><ins>+ $wp_current_filter[] = $tag;
</ins><span class="cx"> $args = func_get_args();
</span><span class="cx"> _wp_call_all_hook($args);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !isset($wp_filter[$tag]) ) {
</span><del>- array_pop($wp_current_filter);
</del><ins>+ if ( isset($wp_filter['all']) )
+ array_pop($wp_current_filter);
</ins><span class="cx"> return $value;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( !isset($wp_filter['all']) )
+ $wp_current_filter[] = $tag;
+
</ins><span class="cx"> // Sort
</span><span class="cx"> if ( !isset( $merged_filters[ $tag ] ) ) {
</span><span class="cx"> ksort($wp_filter[$tag]);
</span><span class="lines">@@ -193,19 +197,22 @@
</span><span class="cx"> function apply_filters_ref_array($tag, $args) {
</span><span class="cx"> global $wp_filter, $merged_filters, $wp_current_filter;
</span><span class="cx">
</span><del>- $wp_current_filter[] = $tag;
-
</del><span class="cx"> // Do 'all' actions first
</span><span class="cx"> if ( isset($wp_filter['all']) ) {
</span><ins>+ $wp_current_filter[] = $tag;
</ins><span class="cx"> $all_args = func_get_args();
</span><span class="cx"> _wp_call_all_hook($all_args);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !isset($wp_filter[$tag]) ) {
</span><del>- array_pop($wp_current_filter);
</del><ins>+ if ( isset($wp_filter['all']) )
+ array_pop($wp_current_filter);
</ins><span class="cx"> return $args[0];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( !isset($wp_filter['all']) )
+ $wp_current_filter[] = $tag;
+
</ins><span class="cx"> // Sort
</span><span class="cx"> if ( !isset( $merged_filters[ $tag ] ) ) {
</span><span class="cx"> ksort($wp_filter[$tag]);
</span><span class="lines">@@ -360,19 +367,22 @@
</span><span class="cx"> else
</span><span class="cx"> ++$wp_actions[$tag];
</span><span class="cx">
</span><del>- $wp_current_filter[] = $tag;
-
</del><span class="cx"> // Do 'all' actions first
</span><span class="cx"> if ( isset($wp_filter['all']) ) {
</span><ins>+ $wp_current_filter[] = $tag;
</ins><span class="cx"> $all_args = func_get_args();
</span><span class="cx"> _wp_call_all_hook($all_args);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !isset($wp_filter[$tag]) ) {
</span><del>- array_pop($wp_current_filter);
</del><ins>+ if ( isset($wp_filter['all']) )
+ array_pop($wp_current_filter);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( !isset($wp_filter['all']) )
+ $wp_current_filter[] = $tag;
+
</ins><span class="cx"> $args = array();
</span><span class="cx"> if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) // array(&$this)
</span><span class="cx"> $args[] =& $arg[0];
</span><span class="lines">@@ -446,19 +456,22 @@
</span><span class="cx"> else
</span><span class="cx"> ++$wp_actions[$tag];
</span><span class="cx">
</span><del>- $wp_current_filter[] = $tag;
-
</del><span class="cx"> // Do 'all' actions first
</span><span class="cx"> if ( isset($wp_filter['all']) ) {
</span><ins>+ $wp_current_filter[] = $tag;
</ins><span class="cx"> $all_args = func_get_args();
</span><span class="cx"> _wp_call_all_hook($all_args);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !isset($wp_filter[$tag]) ) {
</span><del>- array_pop($wp_current_filter);
</del><ins>+ if ( isset($wp_filter['all']) )
+ array_pop($wp_current_filter);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( !isset($wp_filter['all']) )
+ $wp_current_filter[] = $tag;
+
</ins><span class="cx"> // Sort
</span><span class="cx"> if ( !isset( $merged_filters[ $tag ] ) ) {
</span><span class="cx"> ksort($wp_filter[$tag]);
</span></span></pre>
</div>
</div>
</body>
</html>