diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-02 15:27:55 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-02 15:27:55 -0400 |
| commit | b3b3af9a2eff10c272bb213eccd3dd3060bc5830 (patch) | |
| tree | ff0ae9108bcb085015a8e9f286963ad9fe58c13c /classes/File_oembed.php | |
| parent | 51ac34e80c5a99008b1a945b2c00b6dbfdde1529 (diff) | |
| parent | 5309910b9b4dd2533ff5b2190f90bf415fd20113 (diff) | |
Merge branch '0.8.x' into deleteuser
Diffstat (limited to 'classes/File_oembed.php')
| -rw-r--r-- | classes/File_oembed.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/File_oembed.php b/classes/File_oembed.php index bbf112729..6be651815 100644 --- a/classes/File_oembed.php +++ b/classes/File_oembed.php @@ -1,7 +1,7 @@ <?php /* - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, 2009, Control Yourself, Inc. + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -if (!defined('LACONICA')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; |