From 795fdb2169200460deeadbf355ab0f9dca7d8a71 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 16 Oct 2008 23:19:39 +0000 Subject: [PATCH] BUGFIX Removed duplicate setValue() method on Time (was supposed to be deleted instead of renamed from setVal() to setValue()) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64467 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/fieldtypes/Time.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/core/model/fieldtypes/Time.php b/core/model/fieldtypes/Time.php index 615432871..7afd56f19 100755 --- a/core/model/fieldtypes/Time.php +++ b/core/model/fieldtypes/Time.php @@ -6,17 +6,12 @@ */ class Time extends DBField { - function setValue($value) { - + function setValue($value) { if($value) { if(preg_match( '/(\d{1,2})[:.](\d{2})([ap]m)/', $value, $match )) $this->_12Hour( $match ); else $this->value = date('H:i:s', strtotime($value)); } else $value = null; } - - function setValue($value) { - return $this->setValue( $value ); - } function Nice() { return date('g:ia', strtotime($this->value));