diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 | 
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 | 
| commit | 0733dc37fda27a5ba35f9020edf3c66aa41a95a0 (patch) | |
| tree | 6877946232f1b01b1c8709054c689f6658cef34f /modules/akismet/tests/Akismet_Helper_Test.php | |
| parent | 218493c50be9362d4abed6900a816308fee5d978 (diff) | |
| parent | 9379308f91a476f790fb8d444536719535c584e4 (diff) | |
Merge commit 'upstream/master'
Conflicts:
	modules/gallery/tests/xss_data.txt
Diffstat (limited to 'modules/akismet/tests/Akismet_Helper_Test.php')
| -rw-r--r-- | modules/akismet/tests/Akismet_Helper_Test.php | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/akismet/tests/Akismet_Helper_Test.php b/modules/akismet/tests/Akismet_Helper_Test.php index d001d3ad..745b455c 100644 --- a/modules/akismet/tests/Akismet_Helper_Test.php +++ b/modules/akismet/tests/Akismet_Helper_Test.php @@ -26,7 +26,7 @@ class Akismet_Helper_Test extends Unit_Test_Case {      $root = ORM::factory("item", 1);      $this->_comment = comment::create( -      $root, user::guest(), "This is a comment", +      $root, identity::guest(), "This is a comment",        "John Doe", "john@gallery2.org", "http://gallery2.org");      foreach ($this->_comment->list_fields("comments") as $name => $field) {        if (strpos($name, "server_") === 0) {  | 
