From 24320ca8a7874ba8d121c727aa456287190b7643 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Sat, 13 Feb 2010 15:30:10 +0000
Subject: Switch title and date tags.

---
 utils/modules/events.php |  2 +-
 utils/modules/news.php   | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/utils/modules/events.php b/utils/modules/events.php
index d7c09f5..bbe7d4f 100644
--- a/utils/modules/events.php
+++ b/utils/modules/events.php
@@ -33,11 +33,11 @@ class Event {
     $content = Markdown(htmlspecialchars_decode($this->description));
 
 		$str = "<div class=\"event\">\n";
+		$str .= "  <div class=\"event_time\">" . date("D M jS Y", $this->time) . "</div>\n";
 		$str .= "  <div class=\"event_title\">\n";
 		$str .= "    <a href=\"?page=".$EVENT_PAGE."&amp;eventid=".$this->time."\">". 
 			htmlspecialchars_decode($this->title, ENT_QUOTES) . "</a>\n";
 		$str .= "</div>\n";
-		$str .= "  <div class=\"event_time\">" . date("D M jS Y", $this->time) . "</div>\n";
 		$str .= "  <div class=\"event_description\">" . $content . "</div>\n";
 		/*
 		if($this->flyer) {
diff --git a/utils/modules/news.php b/utils/modules/news.php
index 6cab087..57e9da7 100644
--- a/utils/modules/news.php
+++ b/utils/modules/news.php
@@ -29,15 +29,17 @@ class NewsEntry {
 		$icons = new Icons($ICONS_DIR."/");
 		$icon = $icons->icons[$this->icon];
 
+		$userid = $users->findUser($this->userid)->userid;
+		if(!$userid) $userid = "admin"; // Fallback from old data.
+
     $str = "<div class=\"news_entry\">\n";
+    $str .= "  <div class=\"news_time\">" .
+			date("D M jS Y G:i", $this->time) . "</div>\n";
     $str .= "  <div class=\"news_title\">\n";
 		$str .= "    <a href=\"?page=".$NEWS_PAGE."&amp;newsid=".$this->time."\">" .
       htmlspecialchars_decode($this->title, ENT_QUOTES) . "</a>\n";
 		$str .= "  </div>\n";
-    $str .= "  <div class=\"news_time\">" .
-			date("D M jS Y G:i", $this->time) . "</div>\n";
-		$str .= "  <div class=\"news_user\">By: " .
-			$users->findUser($this->userid)->userid . "</div>\n";
+		$str .= "  <div class=\"news_user\">By: " . $userid . "</div>\n";
 		$str .= "  <div class=\"news_description\">\n";
 		if($this->icon) $str .= "    <img alt=\"icon\" class=\"news_icon\" src=\"" .
 											$icon->prefix.$icon->file . "\"/>\n";
-- 
cgit v1.2.3