merge from dev/0.7.x

4 files changed, 14 insertions, 4 deletions

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 61f0f8365..5e7691f33 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -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. '.
diff --git a/lib/error.php b/lib/error.php
index 03065bc70..526d9f81b 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -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();
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index bfba702e6..f42427540 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -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();
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e2a2a965c..60eaa8f22 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -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;
 }