Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	plugins/OpenID/openid.php

1 files changed, 12 insertions, 0 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index c8cfb5abb..cf6f9c279 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1865,4 +1865,16 @@ class Notice extends Memcached_DataObject
         return $ns;
     }
 
+    /**
+     * Determine whether the notice was locally created
+     *
+     * @return boolean locality
+     */
+
+    public function isLocal()
+    {
+        return ($this->is_local == Notice::LOCAL_PUBLIC ||
+                $this->is_local == Notice::LOCAL_NONPUBLIC);
+    }
+
 }