diff options
author | Evan Prodromou <evan@status.net> | 2010-08-13 14:51:51 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-08-13 14:51:51 -0700 |
commit | 1dadb8efc04cbb807b2cd8b6291f7c2f64a631dc (patch) | |
tree | a35027e95a6b0900195dc3bb4ca4fef1c00b2f5a /classes | |
parent | 718317542940a8976f2c6f2a9ea09a04f2f00ca6 (diff) | |
parent | 926c77246bb168097b3f937b5cc22ee9721b83c9 (diff) |
Merge branch '0.9.x' into 1.0.x
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)) { |