Merge remote-tracking branch 'origin/dev' into beta

9 files changed, 9 insertions, 0 deletions

diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 3a810e9f0..6b07ab063 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 	public function addCategory ($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'category` (name, color) VALUES(?, ?)';
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 7ef76b522..d5f69601f 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Configuration extends Minz_Model {
 	private $available_languages = array (
 		'en' => 'English',
diff --git a/app/Models/ConfigurationDAO.php b/app/Models/ConfigurationDAO.php
index 57fc98047..0eebf2d90 100644
--- a/app/Models/ConfigurationDAO.php
+++ b/app/Models/ConfigurationDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
 	public $language = 'en';
 	public $posts_per_page = 20;
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 983f94727..ed31ef2b1 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Entry extends Minz_Model {
 
 	private $id = 0;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index d8bc869ae..c6bd5c404 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_EntryDAO extends Minz_ModelPdo {
 	public function addEntry ($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'entry`(id, guid, title, author, content_bin, link, date, is_read, is_favorite, id_feed, tags) '
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index e63ac8c7a..70efb0fa3 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Feed extends Minz_Model {
 	private $id = 0;
 	private $url;
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 9ebea4a47..9bd480544 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_FeedDAO extends Minz_ModelPdo {
 	public function addFeed ($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, 0)';
diff --git a/app/Models/LogDAO.php b/app/Models/LogDAO.php
index bf043fd6d..06855ec66 100644
--- a/app/Models/LogDAO.php
+++ b/app/Models/LogDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_LogDAO extends Minz_ModelTxt {
 	public function __construct () {
 		parent::__construct (LOG_PATH . '/application.log', 'r+');
diff --git a/public/install.php b/public/install.php
index 377b2916d..642692cd0 100644
--- a/public/install.php
+++ b/public/install.php
@@ -164,6 +164,7 @@ function initTranslate () {
 		$translates = array_merge($translates, include($file));
 	}
 }
+
 function getBetterLanguage ($fallback) {
 	$available = availableLanguages ();
 	$accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'];