Merge branch 'fix_campaign_email_templates' into 'master'

fix #1846 remove unnecessary check for colon in columName. Email template...

Closes #1846

See merge request !1268

include/utils/EmailTemplate.php

@@ -50,7 +50,7 @@ class EmailTemplate {
             for ($i = 0; $i < php7_count($templateVariablePair); $i++) {
                 $templateVariablePair[$i] = str_replace('$', '', $templateVariablePair[$i]);
                 list($module, $columnName) = explode('-', $templateVariablePair[$i]);
-				if(isset($columnName) && strpos($columnName, ':') !== false) {
+				if(isset($columnName)) {
 					list($parentColumn, $childColumn) = explode(':', $columnName);
 					$this->templateFields[$module][] = $parentColumn;
 					$this->referencedFields[$parentColumn][] = $childColumn;