From cb664eab03cdaf905a674e9e5a68c388f3691519 Mon Sep 17 00:00:00 2001
From: Dustin Wilson <dustin@dustinwilson.com>
Date: Sun, 19 Feb 2017 18:33:03 -0600
Subject: [PATCH] Minor fixes to PicoFeed integration

---
 lib/Database.php | 4 ++--
 locale/en.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Database.php b/lib/Database.php
index 16643cb3..12d4d15b 100644
--- a/lib/Database.php
+++ b/lib/Database.php
@@ -293,8 +293,8 @@ class Database {
                 (new PicoFeed\Reader\Favicon)->find($url),
                 $feed->siteUrl,
                 // Convert the date formats to ISO 8601 before inserting
-                $driver::formatDate($feed->date),
-                $driver::formatDate($resource->getLastModified()),
+                $this->driver::formatDate($feed->date),
+                $this->driver::formatDate($resource->getLastModified()),
                 $resource->getEtag(),
                 $fetchUser,
                 $fetchPassword
diff --git a/locale/en.php b/locale/en.php
index ea87dd24..38d9a8af 100644
--- a/locale/en.php
+++ b/locale/en.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'Driver.User.Internal.Name'                                        => 'Internal',
-    
+
     'Exception.JKingWeb/NewsSync/Exception.uncoded'                     => 'The specified exception symbol {0} has no code specified in Exception.php',
     //this should not usually be encountered
     'Exception.JKingWeb/NewsSync/Exception.unknown'                     => 'An unknown error has occurred',
@@ -60,7 +60,7 @@ return [
     'Exception.JKingWeb/NewsSync/Feed/Exception.forbidden'              => 'Could not download feed "{url}" because you do not have permission to access it',
     'Exception.JKingWeb/NewsSync/Feed/Exception.unauthorized'           => 'Could not download feed "{url}" because you provided insufficient or invalid credentials',
     'Exception.JKingWeb/NewsSync/Feed/Exception.malformed'              => 'Could not parse feed "{url}" because it is malformed',
-    'Exception.JKingWeb/NewsSync/Feed/Exception.xxe'                    => 'Refused to parse feed "{url}" because it contains an XXE attack',
+    'Exception.JKingWeb/NewsSync/Feed/Exception.xmlEntity'              => 'Refused to parse feed "{url}" because it contains an XXE attack',
     'Exception.JKingWeb/NewsSync/Feed/Exception.subscriptionNotFound'   => 'Unable to find a feed at location "{url}"',
     'Exception.JKingWeb/NewsSync/Feed/Exception.unsupportedFormat'      => 'Feed "{url}" is of an unsupported format'
 ];
\ No newline at end of file