Merge branch '0.8.x' into testing

[quix0rs-gnu-social.git] / lib / designsettings.php

diff --git a/lib/designsettings.php b/lib/designsettings.php
index 21cb9d79331b5037be4efef7333109a776d0b5f2..820d534f23eadc4d9ecb60d8a3d54e7067c6611e 100644 (file)
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -325,8 +325,9 @@ class DesignSettingsAction extends AccountSettingsAction
         parent::showScripts();
 
         $this->script('js/farbtastic/farbtastic.js');
-        $this->script('js/farbtastic/farbtastic.go.js');
         $this->script('js/userdesign.go.js');
+
+        $this->autofocus('design_background-image_file');
     }
 
     /**