diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | admin/subscriptions.php | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index da79a30..bb9516d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,10 @@ before_script: script: vendor/bin/phpunit +cache: + directories: + - $HOME/.composer/cache/files + # deploy: # provider: releases # skip_cleanup: true diff --git a/admin/subscriptions.php b/admin/subscriptions.php index 0606c89..7b2fb6f 100755 --- a/admin/subscriptions.php +++ b/admin/subscriptions.php @@ -13,13 +13,11 @@ if (!$csrf->verify($_POST['_csrf'], 'feedmanage')) { if (isset($_POST['opml']) || isset($_POST['add'])) { - // Load config and old OPML - $conf = Spyc::YAMLLoad(__DIR__.'/../custom/config.yml'); - $PlanetConfig = new PlanetConfig($conf); + // Load old OPML + $oldOpml = OpmlManager::load(__DIR__.'/../custom/people.opml'); if ($PlanetConfig->getName() === '') { $PlanetConfig->setName($oldOpml->getTitle()); } - $oldOpml = OpmlManager::load(__DIR__.'/../custom/people.opml'); $newOpml = new opml(); $newOpml->title = $PlanetConfig->getName(); |