D150.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.2.x/core/units/helpers/language_import_helper.php
	===================================================================
	--- branches/5.2.x/core/units/helpers/language_import_helper.php
	+++ branches/5.2.x/core/units/helpers/language_import_helper.php
	@@ -724,8 +724,17 @@
	*/
	function _updateEventsCache()
	{
	+ $table_name = $this->Application->getUnitOption('email-template', 'TableName');
	+
	+ // During upgrade from 5.1.x to 5.2.x without this there will be tons of notices.
	+ if ( defined('IS_INSTALL') && IS_INSTALL && !$this->Conn->TableFound($table_name, true) ) {
	+ $this->events_hash = array();
	+
	+ return;
	+ }
	+
	$sql = 'SELECT TemplateId, CONCAT(TemplateName,"_",Type) AS EventMix
	- FROM ' . $this->Application->getUnitOption('email-template', 'TableName');
	+ FROM ' . $table_name;
	$this->events_hash = $this->Conn->GetCol($sql, 'EventMix');
	}

	@@ -1254,4 +1263,4 @@

	return $ids;
	}
	- }
	\ No newline at end of file
	+ }