Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload

Conflicts:

	js/util.js
	lib/attachmentlist.php

4 files changed, 8 insertions, 8 deletions

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index a58a50f6f..61749dca5 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -83,11 +83,10 @@ class AttachmentList extends Widget
         $atts = new File;
         $att = $atts->getAttachments($this->notice->id);
         if (empty($att)) return 0;
-
-        $this->out->elementStart('dl', array('id' =>'attachment'));
+        $this->out->elementStart('dl', array('id' =>'attachments'));
         $this->out->element('dt', null, _('Attachments'));
         $this->out->elementStart('dd');
-        $this->out->elementStart('ul', array('class' => 'attachments'));
+        $this->out->elementStart('ol', array('class' => 'attachments'));
 
         foreach ($att as $n=>$attachment) {
             $item = $this->newListItem($attachment);
@@ -95,7 +94,7 @@ class AttachmentList extends Widget
         }
 
         $this->out->elementEnd('dd');
-        $this->out->elementEnd('ul');
+        $this->out->elementEnd('ol');
         $this->out->elementEnd('dl');
 
         return count($att);
diff --git a/lib/common.php b/lib/common.php
index ede8d6277..838f52f9d 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -208,6 +208,7 @@ $config['db'] =
         'require_prefix' => 'classes/',
         'class_prefix' => '',
         'mirror' => null,
+        'utf8' => true,
         'db_driver' => 'DB', # XXX: JanRain libs only work with DB
         'quote_identifiers' => false,
         'type' => 'mysql' );
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 420272515..5513e317e 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -86,7 +86,7 @@ class NoticeList extends Widget
     {
         $this->out->elementStart('div', array('id' =>'notices_primary'));
         $this->out->element('h2', null, _('Notices'));
-        $this->out->elementStart('ul', array('class' => 'notices'));
+        $this->out->elementStart('ol', array('class' => 'notices xoxo'));
 
         $cnt = 0;
 
@@ -101,7 +101,7 @@ class NoticeList extends Widget
             $item->show();
         }
 
-        $this->out->elementEnd('ul');
+        $this->out->elementEnd('ol');
         $this->out->elementEnd('div');
 
         return $cnt;
diff --git a/lib/noticesection.php b/lib/noticesection.php
index 37aafdaf6..ca1432686 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -52,12 +52,12 @@ class NoticeSection extends Section
     {
         $notices = $this->getNotices();
         $cnt = 0;
-        $this->out->elementStart('ul', 'notices');
+        $this->out->elementStart('ol', 'notices xoxo');
         while ($notices->fetch() && ++$cnt <= NOTICES_PER_SECTION) {
             $this->showNotice($notices);
         }
 
-        $this->out->elementEnd('ul');
+        $this->out->elementEnd('ol');
         return ($cnt > NOTICES_PER_SECTION);
     }