summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornashe <thomas@chauchefoin.fr>2018-01-02 19:08:15 +0100
committernashe <thomas@chauchefoin.fr>2018-01-02 19:08:15 +0100
commit87c71d558d0f3fb8c59d442f304f8fd336f3da7e (patch)
tree95427ac07d6d30a644aa51580b067bcf5643ce47
parentf8a64e98db4bcc406196a33eb869d0bcff3a4058 (diff)
downloadplanet-87c71d558d0f3fb8c59d442f304f8fd336f3da7e.tar
planet-87c71d558d0f3fb8c59d442f304f8fd336f3da7e.tar.gz
planet-87c71d558d0f3fb8c59d442f304f8fd336f3da7e.tar.bz2
planet-87c71d558d0f3fb8c59d442f304f8fd336f3da7e.tar.xz
planet-87c71d558d0f3fb8c59d442f304f8fd336f3da7e.zip
Remove unnecessary calls to Spyc
-rwxr-xr-xadmin/subscriptions.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/admin/subscriptions.php b/admin/subscriptions.php
index f8e4c2c..f63af8f 100755
--- a/admin/subscriptions.php
+++ b/admin/subscriptions.php
@@ -9,13 +9,11 @@ function removeSlashes(&$item, $key){
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();