diff options
| author | Evan Prodromou <evan@status.net> | 2009-09-15 22:30:52 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-09-15 22:30:52 -0400 |
| commit | 1618d515e6d96c8c0458295282de89dfae790e00 (patch) | |
| tree | 03e1fdd5eaf12a443ccc013484502b822e9965d0 /actions | |
| parent | 6f531745ca21e7b5460be90890c55b1934a45f15 (diff) | |
dedupe evans
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/all.php | 9 | ||||
| -rw-r--r-- | actions/api.php | 15 |
2 files changed, 9 insertions, 15 deletions
diff --git a/actions/all.php b/actions/all.php index 5ffc7e9bd..22da3cd68 100644 --- a/actions/all.php +++ b/actions/all.php @@ -15,19 +15,16 @@ * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * * @category Actions * @package Actions * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> * @author Mike Cochrane <mikec@mikenz.geek.nz> * @author Robin Millette <millette@controlyourself.ca> * @author Adrian Lang <mail@adrianlang.de> * @author Meitar Moscovitz <meitarm@gmail.com> * @author Sarven Capadisli <csarven@controlyourself.ca> * @author Craig Andrews <candrews@integralblue.com> - * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> * @author Jeffery To <jeffery.to@gmail.com> * @author Zach Copley <zach@controlyourself.ca> * @author csarven <csarven@controlyourself.ca> @@ -35,8 +32,8 @@ * @link http://status.net */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); } require_once INSTALLDIR.'/lib/personalgroupnav.php'; diff --git a/actions/api.php b/actions/api.php index 06fdbfb44..243ae4c62 100644 --- a/actions/api.php +++ b/actions/api.php @@ -15,11 +15,10 @@ * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * * @category Actions * @package Actions * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> * @author Brenda Wallace <shiny@cpan.org> * @author Jeffery To <jeffery.to@gmail.com> * @author Robin Millette <millette@controlyourself.ca> @@ -27,8 +26,6 @@ * @author Christopher Vollick <psycotica0@gmail.com> * @author CiaranG <ciaran@ciarang.com> * @author Craig Andrews <candrews@integralblue.com> - * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> * @author Gina Haeussge <osd@foosel.net> * @author Mike Cochrane <mikec@mikenz.geek.nz> * @author Sarven Capadisli <csarven@controlyourself.ca> @@ -36,8 +33,8 @@ * @link http://status.net */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); } class ApiAction extends Action @@ -205,9 +202,9 @@ class ApiAction extends Action $user_id = $this->arg('user_id'); $screen_name = $this->arg('screen_name'); - if (empty($this->api_arg) - && empty($id) - && empty($user_id) + if (empty($this->api_arg) + && empty($id) + && empty($user_id) && empty($screen_name) ) { return true; |