aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-10-23 01:47:47 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-10-23 01:47:47 +0200
commit6d42acf5fd7906168c9e547c3d0ce675b8fd6fd2 (patch)
treee973c804a9385372900aaf25dc970b6aebb02389
parent179d126cc858fcc1df8f008237e947e0e109c3f0 (diff)
parent4d6fdc589e89c2a7d4072b497d9dfd8504a1cb5c (diff)
Merge branch 'FreshRSS/dev' into cli
-rw-r--r--app/Exceptions/AlreadySubscribedException.php4
-rw-r--r--app/Exceptions/FeedNotAddedException.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/Exceptions/AlreadySubscribedException.php b/app/Exceptions/AlreadySubscribedException.php
index f85d51300..33b9f9555 100644
--- a/app/Exceptions/AlreadySubscribedException.php
+++ b/app/Exceptions/AlreadySubscribedException.php
@@ -5,10 +5,10 @@ class FreshRSS_AlreadySubscribed_Exception extends Exception {
public function __construct($url, $feedName) {
parent::__construct('Already subscribed! ' . $url, 2135);
- $this->$feedName = $feedName;
+ $this->feedName = $feedName;
}
public function feedName() {
- return $this->feedName();
+ return $this->feedName;
}
}
diff --git a/app/Exceptions/FeedNotAddedException.php b/app/Exceptions/FeedNotAddedException.php
index 02a8bc6be..350a17c56 100644
--- a/app/Exceptions/FeedNotAddedException.php
+++ b/app/Exceptions/FeedNotAddedException.php
@@ -5,10 +5,10 @@ class FreshRSS_FeedNotAdded_Exception extends Exception {
public function __construct($url, $feedName) {
parent::__construct('Feed not added! ' . $url, 2147);
- $this->$feedName = $feedName;
+ $this->feedName = $feedName;
}
public function feedName() {
- return $this->feedName();
+ return $this->feedName;
}
}