diff --git a/module/VuFind/src/VuFind/Mailer/Mailer.php b/module/VuFind/src/VuFind/Mailer/Mailer.php index f9e1719575742f0404d7ff901e214ed32afbaec5..d618fb5afba12778de9c4e58f46b8a562a5a2e72 100644 --- a/module/VuFind/src/VuFind/Mailer/Mailer.php +++ b/module/VuFind/src/VuFind/Mailer/Mailer.php @@ -224,12 +224,12 @@ class Mailer implements \VuFind\I18n\Translator\TranslatorAwareInterface /** * Send an email message representing a record. * - * @param string $to Recipient email address - * @param string $from Sender email address - * @param string $msg User notes to include in + * @param string $to Recipient email address + * @param string $from Sender email address + * @param string $msg User notes to include in * message - * @param \VuFind\RecordDriver\AbstractBase $record Record being emailed - * @param \Zend\View\Renderer\PhpRenderer $view View object (used to render + * @param \VuFind\RecordDriver\AbstractBase $record Record being emailed + * @param \Zend\View\Renderer\PhpRenderer $view View object (used to render * email templates) * @param string $subject Subject for email (optional) * @param string $cc CC recipient (null for none) diff --git a/module/VuFindConsole/src/VuFindConsole/Controller/GenerateController.php b/module/VuFindConsole/src/VuFindConsole/Controller/GenerateController.php index 43856b21b71514c58fe96a1a99f4adcfb1b9eba1..4cf5479e76d52dcd170ddfa7a6fdab3714849701 100644 --- a/module/VuFindConsole/src/VuFindConsole/Controller/GenerateController.php +++ b/module/VuFindConsole/src/VuFindConsole/Controller/GenerateController.php @@ -357,7 +357,7 @@ class GenerateController extends AbstractBase // Create backup of configuration $this->backUpFile($configPath); - $config = require $configPath; + $config = include $configPath; $current = & $config; $finalStep = array_pop($path); foreach ($path as $step) {