From ee089a74b596d085a40daa26969ddf0c04ea29ec Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 7 Apr 2019 14:37:33 +0200 Subject: Prepare next version 1.14.2-dev --- CHANGELOG.md | 4 ++++ constants.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0b7a2f23..534c7ba57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # FreshRSS changelog +## 2019-0X-XX FreshRSS 1.14.2-dev + + + ## 2019-04-07 FreshRSS 1.14.1 * Bug fixing (regressions introduced in 1.14.0) diff --git a/constants.php b/constants.php index ec833c4d1..0d01ae3ae 100644 --- a/constants.php +++ b/constants.php @@ -2,7 +2,7 @@ //NB: Do not edit; use ./constants.local.php instead. // -define('FRESHRSS_VERSION', '1.14.1'); +define('FRESHRSS_VERSION', '1.14.2-dev'); define('FRESHRSS_WEBSITE', 'https://freshrss.org'); define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/'); -- cgit v1.2.3 From 0654f22c5f6c3bec85b07cf2235d1e89621e75a4 Mon Sep 17 00:00:00 2001 From: Quentí <33203663+Quenty31@users.noreply.github.com> Date: Sun, 7 Apr 2019 14:43:35 +0200 Subject: Update for Unfolded categories (#2358) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The participi passat is AT for the verbs ending with AR is the subject is masculine and ADA for a feminine subject :) L’article que m’a agradat : the article I liked La categoria que m’a agradada : the category I liked --- app/i18n/oc/conf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php index 3ac573ca7..1596950ea 100644 --- a/app/i18n/oc/conf.php +++ b/app/i18n/oc/conf.php @@ -92,7 +92,7 @@ return array( 'auto_remove_article' => 'Rescondre los articles aprèp lectura', 'confirm_enabled' => 'Mostrar una confirmacion per las accions del tipe « o marcar tot coma legit »', 'display_articles_unfolded' => 'Mostrar los articles desplegats per defaut', - 'display_categories_unfolded' => 'Mostrar las categorias desplegats per defaut', + 'display_categories_unfolded' => 'Mostrar las categorias desplegadas per defaut', 'hide_read_feeds' => 'Rescondre las categorias & fluxes sens articles pas legits (fonciona pas amb la configuracion « Mostrar totes los articles »)', 'img_with_lazyload' => 'Utilizar lo mòde “cargament tardiu” pels imatges', 'jump_next' => 'sautar al vesin venent pas legit (flux o categoria)', -- cgit v1.2.3 From eae10a985cbc20e46bafafce02521fd5aaf886a8 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Sun, 7 Apr 2019 21:34:30 +0200 Subject: [CI] php -l syntax check (#2361) As suggested by @Alkarex in . --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index dbd4eb8f6..61b4cc596 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ install: script: - phpenv rehash + - git ls-files -z "*.php" | xargs -0 -n1 -P4 php -l - | if [[ $VALIDATE_STANDARD == yes ]]; then COMPOSER_BIN=$(composer global config --absolute bin-dir) -- cgit v1.2.3 From 295cb89af386c208b82c47250e74c06d76191cf8 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 7 Apr 2019 21:39:48 +0200 Subject: Fix PHP 5.5 compat for array const (#2360) https://github.com/FreshRSS/FreshRSS/issues/2359 --- app/Controllers/configureController.php | 3 ++- lib/lib_rss.php | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 16dd82121..6d3c4dcce 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -166,7 +166,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController { * tab and up. */ public function shortcutAction() { - $this->view->list_keys = SHORTCUT_KEYS; + global $SHORTCUT_KEYS; + $this->view->list_keys = $SHORTCUT_KEYS; if (Minz_Request::isPost()) { FreshRSS_Context::$user_conf->shortcuts = validateShortcutList(Minz_Request::param('shortcuts')); diff --git a/lib/lib_rss.php b/lib/lib_rss.php index fd1389047..c0ea23989 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -549,7 +549,7 @@ function _i($icon, $url_only = false) { } -const SHORTCUT_KEYS = array( +$SHORTCUT_KEYS = array( //No const for < PHP 5.6 compatibility '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', @@ -559,6 +559,7 @@ const SHORTCUT_KEYS = array( ); function validateShortcutList($shortcuts) { + global $SHORTCUT_KEYS; $legacy = array( 'down' => 'ArrowDown', 'left' => 'ArrowLeft', 'page_down' => 'PageDown', 'page_up' => 'PageUp', 'right' => 'ArrowRight', 'up' => 'ArrowUp', @@ -567,17 +568,17 @@ function validateShortcutList($shortcuts) { $shortcuts_ok = array(); foreach ($shortcuts as $key => $value) { - if (in_array($value, SHORTCUT_KEYS)) { + if (in_array($value, $SHORTCUT_KEYS)) { $shortcuts_ok[$key] = $value; } elseif (isset($legacy[$value])) { $shortcuts_ok[$key] = $legacy[$value]; } else { //Case-insensitive search if ($upper === null) { - $upper = array_map('strtoupper', SHORTCUT_KEYS); + $upper = array_map('strtoupper', $SHORTCUT_KEYS); } $i = array_search(strtoupper($value), $upper); if ($i !== false) { - $shortcuts_ok[$key] = SHORTCUT_KEYS[$i]; + $shortcuts_ok[$key] = $SHORTCUT_KEYS[$i]; } } } -- cgit v1.2.3 From d26a49bc664a6c4e683676b7c4669e140ca59610 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 7 Apr 2019 21:50:26 +0200 Subject: Fix API minor code syntax warning (#2362) https://github.com/FreshRSS/FreshRSS/issues/2359#issuecomment-480620713 --- p/api/greader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p/api/greader.php b/p/api/greader.php index d41430d3c..66732b799 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -377,7 +377,7 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = ' $http_auth = ''; try { $feed = FreshRSS_feed_Controller::addFeed($streamUrl, $title, $addCatId, $c_name, $http_auth); - continue; + continue 2; } catch (Exception $e) { Minz_Log::error('subscriptionEdit error subscribe: ' . $e->getMessage(), API_LOG); } -- cgit v1.2.3 From 1bf8ef4e32dedb81da623fab288c79394d4dc37f Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Mon, 8 Apr 2019 22:32:17 +0200 Subject: [CI] Force php -l failure (#2363) * [CI] Force php -l failure By redirecting stderr to a file and checking if the filesize is greater than 0 bytes, we can also force failure for warnings. See discussion in . * exclude JSON lib --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61b4cc596..078a91109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,8 @@ install: script: - phpenv rehash - - git ls-files -z "*.php" | xargs -0 -n1 -P4 php -l + - find . -not -path "./lib/JSON.php" -name \*.php -print0 | xargs -0 -n1 -P4 php -l 1>/dev/null 2>php-l-results + - if [ -s php-l-results ]; then cat php-l-results; exit 1; fi - | if [[ $VALIDATE_STANDARD == yes ]]; then COMPOSER_BIN=$(composer global config --absolute bin-dir) -- cgit v1.2.3 From f86edd2dd6b2622b6b9ed8bbd5f7f6bc2d1be2f7 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 8 Apr 2019 22:40:16 +0200 Subject: Changelog 2359 - 2362 https://github.com/FreshRSS/FreshRSS/issues/2359 https://github.com/FreshRSS/FreshRSS/pull/2361 https://github.com/FreshRSS/FreshRSS/pull/2362 --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 534c7ba57..48403c8ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ # FreshRSS changelog -## 2019-0X-XX FreshRSS 1.14.2-dev +## 2019-04-XX FreshRSS 1.14.2-dev +* Bug fixing (regressions introduced in 1.14.X) + * Fix PHP 5.5- compatibility [#2359](https://github.com/FreshRSS/FreshRSS/issues/2359) +* Bug fixing (misc.) + * Fix minor code syntax warning in API [#2362](https://github.com/FreshRSS/FreshRSS/pull/2362) +* Misc. + * Add Travis check for PHP syntax [#2361](https://github.com/FreshRSS/FreshRSS/pull/2361) ## 2019-04-07 FreshRSS 1.14.1 -- cgit v1.2.3 From da53cc902c5e0ac2a05e92ad6b7780b6354d0438 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 8 Apr 2019 23:05:33 +0200 Subject: Release FreshRSS 1.14.2 --- CHANGELOG.md | 2 +- constants.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48403c8ff..7759d7a56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # FreshRSS changelog -## 2019-04-XX FreshRSS 1.14.2-dev +## 2019-04-08 FreshRSS 1.14.2 * Bug fixing (regressions introduced in 1.14.X) * Fix PHP 5.5- compatibility [#2359](https://github.com/FreshRSS/FreshRSS/issues/2359) diff --git a/constants.php b/constants.php index 0d01ae3ae..6545d862a 100644 --- a/constants.php +++ b/constants.php @@ -2,7 +2,7 @@ //NB: Do not edit; use ./constants.local.php instead. // -define('FRESHRSS_VERSION', '1.14.2-dev'); +define('FRESHRSS_VERSION', '1.14.2'); define('FRESHRSS_WEBSITE', 'https://freshrss.org'); define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/'); -- cgit v1.2.3