summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-08-13 14:51:51 -0700
committerEvan Prodromou <evan@status.net>2010-08-13 14:51:51 -0700
commit1dadb8efc04cbb807b2cd8b6291f7c2f64a631dc (patch)
treea35027e95a6b0900195dc3bb4ca4fef1c00b2f5a /classes
parent718317542940a8976f2c6f2a9ea09a04f2f00ca6 (diff)
parent926c77246bb168097b3f937b5cc22ee9721b83c9 (diff)
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'classes')
-rw-r--r--classes/Notice.php2
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)) {