diff options
| -rw-r--r-- | Jenkinsfile | 4 | ||||
| -rwxr-xr-x | classes/pref/feeds.php | 4 | ||||
| -rw-r--r-- | themes/compact.css | 3 | ||||
| -rw-r--r-- | themes/compact_night.css | 3 | ||||
| -rw-r--r-- | themes/light-high-contrast.css | 3 | ||||
| -rw-r--r-- | themes/light.css | 3 | ||||
| -rw-r--r-- | themes/light/dijit_basic.less | 4 | ||||
| -rw-r--r-- | themes/night.css | 3 | ||||
| -rw-r--r-- | themes/night_blue.css | 3 |
9 files changed, 28 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 450668315..9bd7e1395 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,10 @@ pipeline { agent any + options { + buildDiscarder(logRotator(numToKeepStr: '5')) + } + stages { stage('phpunit') { steps { diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 6cf979b0a..f2e8e12da 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -373,7 +373,7 @@ class Pref_Feeds extends Handler_Protected { $order_id = 1; - $cat = $data_map[$item_id]; + $cat = ($data_map[$item_id] ?? false); if ($cat && is_array($cat)) { foreach ($cat as $item) { @@ -436,7 +436,7 @@ class Pref_Feeds extends Handler_Protected { foreach ($data['items'] as $item) { # if ($item['id'] != 'root') { - if (is_array($item['items'])) { + if (is_array($item['items'] ?? false)) { if (isset($item['items']['_reference'])) { $data_map[$item['id']] = array($item['items']); } else { diff --git a/themes/compact.css b/themes/compact.css index c58d4c419..b8a35a0b5 100644 --- a/themes/compact.css +++ b/themes/compact.css @@ -1945,6 +1945,9 @@ body.ttrss_utility.share_popup .content { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected .dijitTreeExpando { + color: white; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px; diff --git a/themes/compact_night.css b/themes/compact_night.css index 761294d86..c503f70c5 100644 --- a/themes/compact_night.css +++ b/themes/compact_night.css @@ -1847,6 +1847,9 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected .dijitTreeExpando { + color: white; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px; diff --git a/themes/light-high-contrast.css b/themes/light-high-contrast.css index 12fcb877d..0fa7b82b9 100644 --- a/themes/light-high-contrast.css +++ b/themes/light-high-contrast.css @@ -1945,6 +1945,9 @@ body.ttrss_utility.share_popup .content { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected .dijitTreeExpando { + color: white; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px; diff --git a/themes/light.css b/themes/light.css index 82a84c604..a5548d4ff 100644 --- a/themes/light.css +++ b/themes/light.css @@ -1945,6 +1945,9 @@ body.ttrss_utility.share_popup .content { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected .dijitTreeExpando { + color: white; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px; diff --git a/themes/light/dijit_basic.less b/themes/light/dijit_basic.less index f29461530..30451963b 100644 --- a/themes/light/dijit_basic.less +++ b/themes/light/dijit_basic.less @@ -141,6 +141,10 @@ .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color : white; + + .dijitTreeExpando { + color : white; + } } /*.dijitTreeRow .dijitTreeExpando { diff --git a/themes/night.css b/themes/night.css index 0bb02e2eb..5a82594d0 100644 --- a/themes/night.css +++ b/themes/night.css @@ -1848,6 +1848,9 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected .dijitTreeExpando { + color: white; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px; diff --git a/themes/night_blue.css b/themes/night_blue.css index 5f9f6b0e6..1245fd6bf 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -1848,6 +1848,9 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected .dijitTreeExpando { + color: white; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px; |