forked from GNUsocial/gnu-social
		
	merge from dev/0.7.x
This commit is contained in:
		| @@ -90,7 +90,7 @@ class NewnoticeAction extends Action | ||||
|             $this->clientError(_('Not logged in.')); | ||||
|         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { | ||||
|  | ||||
|             // CSRF protection - token set in common_notice_form() | ||||
|             // CSRF protection | ||||
|             $token = $this->trimmed('token'); | ||||
|             if (!$token || $token != common_session_token()) { | ||||
|                 $this->clientError(_('There was a problem with your session token. '. | ||||
|   | ||||
| @@ -111,7 +111,7 @@ class ErrorAction extends Action | ||||
|     function showBody() | ||||
|     { | ||||
|         $this->elementStart('body', array('id' => 'error')); | ||||
|         $this->elementStart('div', 'wrap'); | ||||
|         $this->elementStart('div', array('id' => 'wrap')); | ||||
|         $this->showHeader(); | ||||
|         $this->showCore(); | ||||
|         $this->showFooter(); | ||||
|   | ||||
| @@ -168,7 +168,7 @@ class FacebookAction extends Action | ||||
|  | ||||
|     function showBody() | ||||
|     { | ||||
|         $this->elementStart('div', 'wrap'); | ||||
|         $this->elementStart('div', array('id' => 'wrap')); | ||||
|         $this->showHeader(); | ||||
|         $this->showCore(); | ||||
|         $this->showFooter(); | ||||
|   | ||||
| @@ -24,6 +24,7 @@ position:relative; | ||||
| h1,h2,h3,h4,h5,h6 { | ||||
| text-transform:uppercase; | ||||
| margin-bottom:7px; | ||||
| overflow:hidden; | ||||
| } | ||||
| h1 { | ||||
| font-size:1.4em; | ||||
| @@ -508,6 +509,7 @@ min-height:123px; | ||||
| float:left; | ||||
| margin-bottom:18px; | ||||
| margin-left:0; | ||||
| overflow:hidden; | ||||
| } | ||||
| .entity_profile dt, | ||||
| #entity_statistics dt { | ||||
| @@ -767,6 +769,10 @@ padding-left:28px; | ||||
| margin-right:11px; | ||||
| } | ||||
|  | ||||
| .fn { | ||||
| overflow:hidden; | ||||
| } | ||||
|  | ||||
| .notice .author .fn { | ||||
| font-weight:bold; | ||||
| } | ||||
| @@ -791,7 +797,7 @@ text-decoration:underline; | ||||
| .notice .entry-title { | ||||
| float:left; | ||||
| width:100%; | ||||
| overflow:auto; | ||||
| overflow:hidden; | ||||
| } | ||||
| #shownotice .notice .entry-title { | ||||
| font-size:2.2em; | ||||
| @@ -1072,6 +1078,10 @@ border-top:0; | ||||
| .section .notice:first-child { | ||||
| padding-top:0; | ||||
| } | ||||
|  | ||||
| .section .notice .author { | ||||
| margin-right:0; | ||||
| } | ||||
| .section .notice .author .fn { | ||||
| display:none; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user