Diff
Modified: trunk/build/package.php (625 => 626)
--- trunk/build/package.php 2008-05-30 17:20:49 UTC (rev 625)
+++ trunk/build/package.php 2008-06-16 17:31:39 UTC (rev 626)
@@ -24,6 +24,7 @@
* Fix Coding Standard Problems
* Refactor svn code layout
* Add support for content-type text/xml #14032
+ * Fix combineActions with empty actions #13854
EOT;
$description =<<<EOT
Modified: trunk/src/HTML/AJAX/Action.php (625 => 626)
--- trunk/src/HTML/AJAX/Action.php 2008-05-30 17:20:49 UTC (rev 625)
+++ trunk/src/HTML/AJAX/Action.php 2008-06-16 17:31:39 UTC (rev 626)
@@ -58,7 +58,7 @@
* @var array
* @access private
*/
- var $_actions;
+ var $_actions = array();
/**
* Prepends data to the attribute identified by id
Modified: trunk/tests/_setup.php (625 => 626)
--- trunk/tests/_setup.php 2008-05-30 17:20:49 UTC (rev 625)
+++ trunk/tests/_setup.php 2008-06-16 17:31:39 UTC (rev 626)
@@ -2,6 +2,6 @@
// work from svn if possible
if (file_exists(dirname(__FILE__).'/.svn')) {
- $dir = realpath(dirname(__FILE__).'/../');
+ $dir = realpath(dirname(__FILE__).'/../src/');
set_include_path(".:$dir");
}
Added: trunk/tests/bug-13854.phpt (0 => 626)
--- trunk/tests/bug-13854.phpt (rev 0)
+++ trunk/tests/bug-13854.phpt 2008-06-16 17:31:39 UTC (rev 626)
@@ -0,0 +1,15 @@
+--TEST--
+HTML_AJAX_Action->combineActions() in php5 with empty actions
+--FILE--
+<?php
+require_once '_setup.php';
+require_once 'HTML/AJAX/Action.php';
+
+$response_1 = new HTML_AJAX_Action();
+
+$response_2 = new HTML_AJAX_Action();
+$response_2->assignAttr('blah','blah');
+
+$response_1->combineActions($response_2);
+?>
+--EXPECT--