Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
This commit is contained in:
		@@ -131,14 +131,14 @@ 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
 | 
			
		||||
            if ($this->api_arg) {
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user