<!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>[BuddyPress][7332] trunk: Define BP_Group_Extension screen callbacks non-statically</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://buddypress.trac.wordpress.org/changeset/7332">7332</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-08-01 00:02:10 +0000 (Thu, 01 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Define BP_Group_Extension screen callbacks non-statically
These callbacks should not be defined statically, because then the $this
keyword is not available in the callbacks. This causes backward compatibility
issues, especially with PHP 5.2.x, where it results in fatal errors.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5126">#5126</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunkteststestcasesgroupsclassbpgroupextensionphp">trunk/tests/testcases/groups/class-bp-group-extension.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (7331 => 7332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2013-07-31 13:35:20 UTC (rev 7331)
+++ trunk/bp-groups/bp-groups-classes.php 2013-08-01 00:02:10 UTC (rev 7332)
</span><span class="lines">@@ -2580,14 +2580,14 @@
</span><span class="cx"> $method = $context . '_' . $type;
</span><span class="cx"> $rmethod = $this->class_reflection->getMethod( $method );
</span><span class="cx"> if ( isset( $rmethod->class ) && $this->class_name === $rmethod->class ) {
</span><del>- $callback = array( $this->class_name, $method );
</del><ins>+ $callback = array( $this, $method );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty( $callback ) ) {
</span><span class="cx"> $fallback_method = 'settings_' . $type;
</span><span class="cx"> $rfallback_method = $this->class_reflection->getMethod( $fallback_method );
</span><span class="cx"> if ( isset( $rfallback_method->class ) && $this->class_name === $rfallback_method->class ) {
</span><del>- $callback = array( $this->class_name, $fallback_method );
</del><ins>+ $callback = array( $this, $fallback_method );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststestcasesgroupsclassbpgroupextensionphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/groups/class-bp-group-extension.php (7331 => 7332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/groups/class-bp-group-extension.php 2013-07-31 13:35:20 UTC (rev 7331)
+++ trunk/tests/testcases/groups/class-bp-group-extension.php 2013-08-01 00:02:10 UTC (rev 7332)
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx"> $screens = $e->_get_default_screens();
</span><span class="cx">
</span><span class="cx"> $fallback = array(
</span><del>- 'screen_callback' => array( $class_name, 'settings_screen' ),
- 'screen_save_callback' => array( $class_name, 'settings_screen_save' ),
</del><ins>+ 'screen_callback' => array( $e, 'settings_screen' ),
+ 'screen_save_callback' => array( $e, 'settings_screen_save' ),
</ins><span class="cx"> );
</span><span class="cx"> $fallbacks = array(
</span><span class="cx"> 'create' => $fallback,
</span><span class="lines">@@ -91,14 +91,14 @@
</span><span class="cx"> $screens = $e->_get_default_screens();
</span><span class="cx">
</span><span class="cx"> $fallback = array(
</span><del>- 'screen_callback' => array( $class_name, 'settings_screen' ),
- 'screen_save_callback' => array( $class_name, 'settings_screen_save' ),
</del><ins>+ 'screen_callback' => array( $e, 'settings_screen' ),
+ 'screen_save_callback' => array( $e, 'settings_screen_save' ),
</ins><span class="cx"> );
</span><span class="cx"> $expected = array(
</span><span class="cx"> 'create' => $fallback,
</span><span class="cx"> 'edit' => array(
</span><del>- 'screen_callback' => array( $class_name, 'edit_screen' ),
- 'screen_save_callback' => array( $class_name, 'edit_screen_save' ),
</del><ins>+ 'screen_callback' => array( $e, 'edit_screen' ),
+ 'screen_save_callback' => array( $e, 'edit_screen_save' ),
</ins><span class="cx"> ),
</span><span class="cx"> 'admin' => $fallback,
</span><span class="cx"> );
</span><span class="lines">@@ -203,12 +203,12 @@
</span><span class="cx"> $e = new $class_name();
</span><span class="cx"> $e->_register();
</span><span class="cx">
</span><del>- $this->assertEquals( array( $class_name, 'settings_screen' ), $e->screens['create']['screen_callback'] );
- $this->assertEquals( array( $class_name, 'settings_screen_save' ), $e->screens['create']['screen_save_callback'] );
- $this->assertEquals( array( $class_name, 'settings_screen' ), $e->screens['admin']['screen_callback'] );
- $this->assertEquals( array( $class_name, 'settings_screen_save' ), $e->screens['admin']['screen_save_callback'] );
- $this->assertEquals( array( $class_name, 'edit_screen' ), $e->screens['edit']['screen_callback'] );
- $this->assertEquals( array( $class_name, 'edit_screen_save' ), $e->screens['edit']['screen_save_callback'] );
</del><ins>+ $this->assertEquals( array( $e, 'settings_screen' ), $e->screens['create']['screen_callback'] );
+ $this->assertEquals( array( $e, 'settings_screen_save' ), $e->screens['create']['screen_save_callback'] );
+ $this->assertEquals( array( $e, 'settings_screen' ), $e->screens['admin']['screen_callback'] );
+ $this->assertEquals( array( $e, 'settings_screen_save' ), $e->screens['admin']['screen_save_callback'] );
+ $this->assertEquals( array( $e, 'edit_screen' ), $e->screens['edit']['screen_callback'] );
+ $this->assertEquals( array( $e, 'edit_screen_save' ), $e->screens['edit']['screen_save_callback'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function test_has_submit_button() {
</span></span></pre>
</div>
</div>
</body>
</html>