Merge remote-tracking branch 'upstream/integration' into Modules-Pages

TwistedInteractive · Mar 31, 2012 · 9700742 · 9700742
2 parents 68bb797 + 5e6c481
commit 9700742
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/symphony/lib/toolkit/fields/field.date.php b/symphony/lib/toolkit/fields/field.date.php
@@ -339,7 +339,7 @@ public function displayPublishPanel(XMLElement &$wrapper, $data = null, $flagWit
 			$value = null;
 
 			// New entry
-			if(is_null($data) && is_null($error) && $this->get('pre_populate') == 'yes') {
+			if(is_null($data) && is_null($flagWithError) && $this->get('pre_populate') == 'yes') {
 				$value = DateTimeObj::format('now', DateTimeObj::getSetting('datetime_format'));
 			}
 
@@ -358,7 +358,7 @@ public function displayPublishPanel(XMLElement &$wrapper, $data = null, $flagWit
 			$label->setAttribute('class', 'date');
 
 			if(!is_null($flagWithError)) {
-				$label = Widget::Error($label, $error);
+				$label = Widget::Error($label, $flagWithError);
 			}
 
 			$wrapper->appendChild($label);