aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-02-05 20:57:23 +0100
committerGravatar GitHub <noreply@github.com> 2018-02-05 20:57:23 +0100
commit81df36ed54d18b33c527b9bfa527f3f9f0faa264 (patch)
treecc8cbd0cf69cfe4512e7a00d3b9f7a3ccf80c0b6
parentfb541b1bacb198be7ccac9341415facb91b7dc81 (diff)
parente6e0502a5ca48a0b57d8036d1498ffa61308bba2 (diff)
Merge pull request #1778 from keltroth/trimurl
Trim spaces from user given url
-rw-r--r--CREDITS.md1
-rwxr-xr-xapp/Controllers/feedController.php2
2 files changed, 3 insertions, 0 deletions
diff --git a/CREDITS.md b/CREDITS.md
index 54a7f4fab..0168ed1f8 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -19,6 +19,7 @@ People are sorted by name so please keep this order.
* [danc](https://github.com/danc): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=danc), [Web](http://tintouli.free.fr/)
* [David Souza](https://github.com/araujo0205): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:araujo0205), [Web](http://davidsouza.tech/)
* [dswd](https://github.com/dswd): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:dswd)
+* [Django Janny](https://github.com/keltroth): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:keltroth)
* [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
* [Frans de Jonge](https://github.com/Frenzie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Frenzie), [Web](http://fransdejonge.com/)
* [gsongsong](https://github.com/gsongsong): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:gsongsong)
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 884172112..7f66b10db 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -45,6 +45,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$catDAO = new FreshRSS_CategoryDAO();
+ $url = trim($url);
+
$cat = null;
if ($new_cat_name != '') {
$new_cat_id = $catDAO->addCategory(array('name' => $new_cat_name));