Merge branch 'joomla3' of ssh://[email protected]/Fabrik/fabrik.git into…

… joomla3
ben-github · Oct 22, 2014 · c18f57f · c18f57f
2 parents 27c5afd + 08ca0b8
commit c18f57f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/fabrik_element/fileupload/fileupload.php b/plugins/fabrik_element/fileupload/fileupload.php
@@ -2363,7 +2363,7 @@ protected function plupload($str, $repeatCounter, $values)
 		$params = $this->getParams();
 		$w = (int) $params->get('ajax_dropbox_width', 0);
 		$h = (int) $params->get('ajax_dropbox_hight', 200);
-		$dropBoxStyle = 'height:' . $h . 'px';
+		$dropBoxStyle = 'height:' . $h . 'px;';
 
 		if ($w !== 0)
 		{

diff --git a/plugins/fabrik_form/exif/exif.php b/plugins/fabrik_form/exif/exif.php
@@ -136,6 +136,7 @@ public function onBeforeStore()
 	{
 		// Initialize some variables
 		$db = FabrikWorker::getDbo();
+		$formModel = $this->getModel();
 		$data = $formModel->formData;
 		$params = $this->getParams();
 		$plugin = FabrikWorker::getPluginManager()->getElementPlugin($params->get('exif_map_field'));
@@ -152,8 +153,8 @@ public function onBeforeStore()
 
 			if (!empty($coords))
 			{
-				$data[$this->map_field] = $coords[0] . ',' . $coords[1] . ':4';
-				$data[$this->map_field . '_raw'] = $data[$this->map_field];
+				$c = $coords[0] . ',' . $coords[1] . ':4';
+				$formModel->updateFormData($this->map_field, $c, true);
 			}
 		}