We are moving to Git Issues for bug tracking in future releases. During transition, content will be in both tools. If you'd like to file a new bug, please create an issue.

View | Details | Raw Unified | Return to bug 6658 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-6 / +12 lines)
Line     Link Here 
0
-- a/classes/plugins/PKPPlugin.inc.php
0
++ b/classes/plugins/PKPPlugin.inc.php
 Lines 544-554   class PKPPlugin { Link Here 
544
544
545
		$emailTemplateDao =& DAORegistry::getDAO('EmailTemplateDAO');
545
		$emailTemplateDao =& DAORegistry::getDAO('EmailTemplateDAO');
546
		$sql = $emailTemplateDao->installEmailTemplates($this->getInstallEmailTemplatesFile(), true, null, true);
546
		$sql = $emailTemplateDao->installEmailTemplates($this->getInstallEmailTemplatesFile(), true, null, true);
547
		if ($sql) {
547
548
			$result = $installer->executeSQL($sql);
548
		if ($sql === false) {
549
			if (!$result) {
549
			// The template file seems to be invalid.
550
				$installer->setError(INSTALLER_ERROR_DB, str_replace('{$file}', $this->getInstallEmailTemplatesFile(), Locale::translate('installer.installParseEmailTemplatesFileError')));
550
			$installer->setError(INSTALLER_ERROR_DB, str_replace('{$file}', $this->getInstallDataFile(), Locale::translate('installer.installParseEmailTemplatesFileError')));
551
				$result = false;
551
			$result = false;
552
		} else {
553
			// Are there any yet uninstalled email templates?
554
			assert(is_array($sql));
555
			if (!empty($sql)) {
556
				// Install templates.
557
				$result = $installer->executeSQL($sql);
552
			}
558
			}
553
		}
559
		}
554
		return false;
560
		return false;

Return to bug 6658