From dfcad46532e4d3e2c2dfd5bc03fd32b8df4983ad Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 27 Feb 2013 16:05:26 -0500
Subject: [PATCH] Config cleanup; added missing comments.
---
.../src/VuFind/Controller/AjaxController.php | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/module/VuFind/src/VuFind/Controller/AjaxController.php b/module/VuFind/src/VuFind/Controller/AjaxController.php
index 04d3287c9b9..6637e48af69 100644
--- a/module/VuFind/src/VuFind/Controller/AjaxController.php
+++ b/module/VuFind/src/VuFind/Controller/AjaxController.php
@@ -44,8 +44,18 @@ class AjaxController extends AbstractBase
const STATUS_ERROR = 'ERROR'; // bad
const STATUS_NEED_AUTH = 'NEED_AUTH'; // must login first
+ /**
+ * Type of output to use
+ *
+ * @var string
+ */
protected $outputMode;
- protected $account;
+
+ /**
+ * Array of PHP errors captured during execution
+ *
+ * @var array
+ */
protected static $php_errors = array();
/**
@@ -975,7 +985,7 @@ class AjaxController extends AbstractBase
$this->writeSession(); // avoid session write timing bug
// Force login if necessary:
- $config = \VuFind\Config\Reader::getConfig();
+ $config = $this->getConfig();
if ((!isset($config->Mail->require_login) || $config->Mail->require_login)
&& !$this->getUser()
) {
@@ -1016,7 +1026,7 @@ class AjaxController extends AbstractBase
$this->writeSession(); // avoid session write timing bug
// Force login if necessary:
- $config = \VuFind\Config\Reader::getConfig();
+ $config = $this->getConfig();
if ((!isset($config->Mail->require_login) || $config->Mail->require_login)
&& !$this->getUser()
) {
--
GitLab