Merge branch '0.9.x' into 1.0.x

2010-10-08 11:47:50 -07:00
parent 6c959c83ce 67dc78b621
commit aa02f6020e
38 changed files with 134 additions and 31 deletions
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -22,7 +22,9 @@
 * @maintainer Brion Vibber <brion@status.net>
 */

-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}

 set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/');