diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
| commit | 9d87313eaebe8240393ac300a435f3b1332c8849 (patch) | |
| tree | 6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /lib/designsettings.php | |
| parent | 5efe588174c71979fc1970353c9a556ea441f138 (diff) | |
| parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) | |
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'lib/designsettings.php')
| -rw-r--r-- | lib/designsettings.php | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/designsettings.php b/lib/designsettings.php index a48ec9d22..fe4222597 100644 --- a/lib/designsettings.php +++ b/lib/designsettings.php @@ -1,6 +1,6 @@ <?php /** - * Laconica, the distributed open-source microblogging tool + * StatusNet, the distributed open-source microblogging tool * * Change user password * @@ -20,15 +20,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * * @category Settings - * @package Laconica - * @author Sarven Capadisli <csarven@controlyourself.ca> - * @author Zach Copley <zach@controlyourself.ca> - * @copyright 2008-2009 Control Yourself, Inc. + * @package StatusNet + * @author Sarven Capadisli <csarven@status.net> + * @author Zach Copley <zach@status.net> + * @copyright 2008-2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } @@ -42,11 +42,11 @@ require_once INSTALLDIR . '/lib/webcolor.php'; * background images, and fetching a default design * * @category Settings - * @package Laconica - * @author Zach Copley <zach@controlyourself.ca> - * @author Sarven Capadisli <csarven@controlyourself.ca> + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @author Sarven Capadisli <csarven@status.net> * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ */ class DesignSettingsAction extends AccountSettingsAction @@ -326,6 +326,7 @@ class DesignSettingsAction extends AccountSettingsAction $this->script('js/farbtastic/farbtastic.js'); $this->script('js/farbtastic/farbtastic.go.js'); + $this->script('js/userdesign.go.js'); } /** |