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

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(?, ?)';

app/Models/Configuration.php

@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Configuration extends Minz_Model {
 	private $available_languages = array (
 		'en' => 'English',

app/Models/ConfigurationDAO.php

@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
 	public $language = 'en';
 	public $posts_per_page = 20;

app/Models/Entry.php

@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Entry extends Minz_Model {
 
 	private $id = 0;

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) '

app/Models/Feed.php

@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Feed extends Minz_Model {
 	private $id = 0;
 	private $url;

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)';

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+');

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'];