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

[quix0rs-gnu-social.git] / actions / imsettings.php

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 145cd7ed2c91eb6918c1e01bf7b3a7ebaadbd8fb..f57933b43f28473ac4bca190559df4ccf29c1698 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }