diff options
author | Evan Prodromou <evan@status.net> | 2010-08-13 14:35:49 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-08-13 14:35:49 -0700 |
commit | 926c77246bb168097b3f937b5cc22ee9721b83c9 (patch) | |
tree | dea05edb30a9e6a1e7971727ea42c7214c06c808 /classes | |
parent | 029aa0c61c9942c0688fd3dc9aa2893311543db1 (diff) | |
parent | 61ab21b711c3248c72c8336f481e8aa3d432c997 (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
Diffstat (limited to 'classes')
-rw-r--r-- | classes/Notice.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 0eeebfadf..fe014b942 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -245,6 +245,8 @@ class Notice extends Memcached_DataObject if (!empty($options)) { $options = $options + $defaults; extract($options); + } else { + extract($defaults); } if (!isset($is_local)) { |