Merge branch 'dev'

Conflicts:
	CHANGELOG
	README.fr.md
	README.md
	app/Controllers/feedController.php
	app/Controllers/indexController.php
	app/i18n/en.php
	app/i18n/fr.php
	app/views/helpers/view/normal_view.phtml
	app/views/stats/index.phtml
	app/views/stats/repartition.phtml
	constants.php
	p/scripts/main.js

4 files changed, 16 insertions, 6 deletions

diff --git a/app/Exceptions/BadUrlException.php b/app/Exceptions/BadUrlException.php
index 7d1fe110e..59574e1e5 100644
--- a/app/Exceptions/BadUrlException.php
+++ b/app/Exceptions/BadUrlException.php
@@ -1,6 +1,6 @@
 <?php
 class FreshRSS_BadUrl_Exception extends FreshRSS_Feed_Exception {
-	public function __construct ($url) {
-		parent::__construct ('`' . $url . '` is not a valid URL');
+	public function __construct($url) {
+		parent::__construct('`' . $url . '` is not a valid URL');
 	}
 }
diff --git a/app/Exceptions/ContextException.php b/app/Exceptions/ContextException.php
new file mode 100644
index 000000000..357751b7c
--- /dev/null
+++ b/app/Exceptions/ContextException.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * An exception raised when a context is invalid
+ */
+class FreshRSS_Context_Exception extends Exception {
+	public function __construct($message) {
+		parent::__construct($message);
+	}
+}
diff --git a/app/Exceptions/EntriesGetterException.php b/app/Exceptions/EntriesGetterException.php
index eaa330979..5f47c830b 100644
--- a/app/Exceptions/EntriesGetterException.php
+++ b/app/Exceptions/EntriesGetterException.php
@@ -1,7 +1,7 @@
 <?php
 
 class FreshRSS_EntriesGetter_Exception extends Exception {
-	public function __construct ($message) {
-		parent::__construct ($message);
+	public function __construct($message) {
+		parent::__construct($message);
 	}
 }
diff --git a/app/Exceptions/FeedException.php b/app/Exceptions/FeedException.php
index 50918ba95..2433b3964 100644
--- a/app/Exceptions/FeedException.php
+++ b/app/Exceptions/FeedException.php
@@ -1,6 +1,6 @@
 <?php
 class FreshRSS_Feed_Exception extends Exception {
-	public function __construct ($message) {
-		parent::__construct ($message);
+	public function __construct($message) {
+		parent::__construct($message);
 	}
 }