Merge remote-tracking branch 'origin/master'

pagalba-com · Jan 27, 2022 · 69287b2 · 69287b2
2 parents 4956931 + f99fcec
commit 69287b2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/libraries/fabrik/fabrik/Helpers/Worker.php b/libraries/fabrik/fabrik/Helpers/Worker.php
@@ -2397,7 +2397,7 @@ public static function sendMail($from, $fromName, $recipient, $subject, $body, $
 		}
 
         // if ACY mailing is installed, it returns an exception (!) rather than false
-        if (get_parent_class($ret) === 'Exception')
+        if (is_bool($ret) === false && get_parent_class($ret) === 'Exception')
         {
             self::log('fabrik.helper.sendmail.error', 'Exception in Send: ' . $ret->getMessage(), false);
 

diff --git a/plugins/fabrik_element/field/field.php b/plugins/fabrik_element/field/field.php
@@ -156,7 +156,9 @@ public function render($data, $repeatCounter = 0)
 			else
 			{
 				$this->_guessLinkType($value, $data);
-				$value = $this->format($value, false);
+				//@@@trob: apply numberFormat also in details view (like in list view), for backward compat only in case of no guess link
+				$doNumberFormat = $params->get('guess_linktype','0') == '0' ? true :false;
+				$value = $this->format($value, $doNumberFormat);
 				$value = $this->getReadOnlyOutput($value, $value);
 			}
 

diff --git a/plugins/fabrik_element/fileupload/language/de-DE/de-DE.plg_fabrik_element_fileupload.ini b/plugins/fabrik_element/fileupload/language/de-DE/de-DE.plg_fabrik_element_fileupload.ini
@@ -126,7 +126,7 @@ PLG_ELEMENT_FILEUPLOAD_RELATIVE_PATH="Relativer Pfad"
 PLG_ELEMENT_FILEUPLOAD_SELECT_FOLDER_DESC="Show/hide a drop down allowing the user to specify the subfolder into which the image gets uploaded"
 PLG_ELEMENT_FILEUPLOAD_SELECT_FOLDER_LABEL="Unterordner Auswahl erlauben"
 PLG_ELEMENT_FILEUPLOAD_SHOW="Zeige"
-PLG_ELEMENT_FILEUPLOAD_SHOW_IN_EMAIL_DESC="If set to yes then the image will be embedded in any email sent by the form. If no selected then the image path will be shown"
+PLG_ELEMENT_FILEUPLOAD_SHOW_IN_EMAIL_DESC="Ja: Der Element-Platzhalter im  Message Text bettet das Bild (die Bilder) ein. Nein: der Dateiname wird eingefügt."
 PLG_ELEMENT_FILEUPLOAD_SHOW_IN_EMAIL_LABEL="Zeige Bild in E-Mail"
 ; PLG_ELEMENT_FILEUPLOAD_SHOW_IN_FORM_DESC="Show previously uploaded media when editing the form.  The slideshow option is 'work in progress' and only relevant if you are using AJAX uploading, with multiple images, which will display a simple slideshow in detail view."
 PLG_ELEMENT_FILEUPLOAD_SHOW_IN_FORM_LABEL="Zeige Medien im Formular"

diff --git a/plugins/fabrik_element/fileupload/language/en-GB/en-GB.plg_fabrik_element_fileupload.ini b/plugins/fabrik_element/fileupload/language/en-GB/en-GB.plg_fabrik_element_fileupload.ini
@@ -136,7 +136,7 @@ PLG_ELEMENT_FILEUPLOAD_RESTRICT_LIGHTBOX_LABEL="Restrict lightbox nav"
 PLG_ELEMENT_FILEUPLOAD_SELECT_FOLDER_DESC="Show/hide a drop down allowing the user to specify the subfolder into which the image gets uploaded"
 PLG_ELEMENT_FILEUPLOAD_SELECT_FOLDER_LABEL="Allow subfolder selection"
 PLG_ELEMENT_FILEUPLOAD_SHOW="Show"
-PLG_ELEMENT_FILEUPLOAD_SHOW_IN_EMAIL_DESC="If set to yes then the image will be embedded in any email sent by the form. If no selected then the image path will be shown"
+PLG_ELEMENT_FILEUPLOAD_SHOW_IN_EMAIL_DESC="If set to Yes, an element placeholder in the email body will embed the image(s). If No selected then the image path(s) will be shown."
 PLG_ELEMENT_FILEUPLOAD_SHOW_IN_EMAIL_LABEL="Show image in email"
 PLG_ELEMENT_FILEUPLOAD_SHOW_IN_FORM_DESC="Show previously uploaded media when editing the form.  The slideshow option is 'work in progress' and only relevant if you are using AJAX uploading, with multiple images, which will display a simple slideshow in detail view."
 PLG_ELEMENT_FILEUPLOAD_SHOW_IN_FORM_LABEL="Show media in form"

diff --git a/plugins/fabrik_form/article/article.php b/plugins/fabrik_form/article/article.php
@@ -179,6 +179,7 @@ protected function saveArticle($id, $catId)
 
 		$item = JTable::getInstance('Content');
 		$item->load($id);
+		$item->newTags = $data['tags'];
 		$item->bind($data);
 
 		// Trigger the onContentBeforeSave event.