fixed Date.php

eXtreme-Fusion · Aug 21, 2013 · fa024f9 · fa024f9
1 parent e0b5cb4
commit fa024f9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/admin/pages/settings_time.php b/admin/pages/settings_time.php
@@ -151,6 +151,7 @@
 		'd-m-Y H:i' => $_date->getDate("d-m-Y H:i", $time),
 		'd.m.Y H:i' => $_date->getDate("d.m.Y H:i", $time),
 		'm/d/Y H:i:s' => $_date->getDate("m/d/Y H:i:s", $time),
+		'd/m/Y H:i' => $_date->getDate("d/m/Y H:i", $time),
 		'd/m/Y H:i:s' => $_date->getDate("d/m/Y H:i:s", $time),
 		'd-m-Y H:i:s' => $_date->getDate("d-m-Y H:i:s", $time),
 		'd.m.Y H:i:s' => $_date->getDate("d.m.Y H:i:s", $time),

diff --git a/install/create_settings.php b/install/create_settings.php
@@ -95,8 +95,8 @@
 $_pdo->insert($_dbconfig['prefix'].'settings', array('key' => 'bad_words', 'value' => ''));
 $_pdo->insert($_dbconfig['prefix'].'settings', array('key' => 'bad_word_replace', 'value' => '****'));
 
-$_pdo->insert($_dbconfig['prefix'].'settings', array('key' => 'shortdate', 'value' => '%d/%m/%Y %H:%M'));
-$_pdo->insert($_dbconfig['prefix'].'settings', array('key' => 'longdate', 'value' => '%B %d %Y %H:%M:%S'));
+$_pdo->insert($_dbconfig['prefix'].'settings', array('key' => 'shortdate', 'value' => 'd/m/Y H:i'));
+$_pdo->insert($_dbconfig['prefix'].'settings', array('key' => 'longdate', 'value' => 'd F Y H:i:s'));
 $_pdo->insert($_dbconfig['prefix'].'settings', array('key' => 'timezone', 'value' => 'Europe/London'));
 $_pdo->insert($_dbconfig['prefix'].'settings', array('key' => 'offset_timezone', 'value' => '1.0'));
 $_pdo->insert($_dbconfig['prefix'].'settings', array('key' => 'user_custom_offset_timezone', 'value' => '0'));

diff --git a/pages/news.php b/pages/news.php
@@ -100,7 +100,7 @@
 				'author_id' => $data['user_id'],
 				'author_name' => $_user->getUsername($data['user_id']),
 				'author_link' => $_route->path(array('controller' => 'profile', 'action' => $data['user_id'], HELP::Title2Link($data['username']))),
-				'date' => HELP::showDate('shortdate', $data['datestamp']),
+				'date' => HELP::showDate('longdate', $data['datestamp']),
 				'datetime' => date('c', $data['datestamp']),
 				'source' => $data['source'],
 				'keyword' => $keyword,

diff --git a/system/class/Date.php b/system/class/Date.php
@@ -49,7 +49,7 @@ public function getDate($format, $timestamp = NULL)
 			{
 				$timestamp = time();
 			}
-
+			//var_dump($data); exit;
 			foreach ($data as $var)
 			{
 				if (array_key_exists($var, $lang))