eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

This commit is contained in:
Evan Prodromou 2009-02-20 09:54:50 -05:00
parent a0ddbecfbc 8fc7f5204e
commit c0497d28f4
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actions/api.php
View File

@ -131,13 +131,13 @@ class ApiAction extends Action
'statuses/followers',
'favorites/favorites');
# If the site is "private", all API methods need authentication
if (common_config('site', 'private')) {
return true;
}
$fullname = "$this->api_action/$this->api_method";
// If the site is "private", all API methods except laconica/config
// need authentication
if (common_config('site', 'private')) {
return $fullname != 'laconica/config' || false;
}
if (in_array($fullname, $bareauth)) {
# bareauth: only needs auth if without an argument

2
theme/base/css/display.css
View File

@ -27,7 +27,6 @@ overflow:hidden;
}
h1 {
font-size:1.4em;
line-height:1;
margin-bottom:18px;
}
h2 { font-size:1.3em; }
@ -365,7 +364,6 @@ margin-right:4px;
#wrap {
margin:0 auto;
width:71.714em;
width:1003px;
overflow:hidden;
}