From cd6f4d939ab78606ba3c1e62a3d062b21cb32c0a Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 13 Feb 2015 13:58:29 -0500
Subject: [PATCH] Style fixes.
---
module/VuFind/src/VuFind/Mailer/Mailer.php | 10 +++++-----
.../VuFindConsole/Controller/GenerateController.php | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/module/VuFind/src/VuFind/Mailer/Mailer.php b/module/VuFind/src/VuFind/Mailer/Mailer.php
index f9e17195757..d618fb5afba 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 43856b21b71..4cf5479e76d 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) {
--
GitLab