Skip to content

Commit f9b4f71

Browse files
selulselul
authored
Release 3.0.7
Fixed is_new when pro is active. Fixed redundant auto options. Fixed auto option in widget for image option.
2 parents fcac86b + b853ee3 commit f9b4f71

File tree

8 files changed

+62
-91
lines changed

8 files changed

+62
-91
lines changed

‎css/feedzy-rss-feeds.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* feedzy-rss-feeds.css
33
* Feedzy RSS Feed
44
* Copyright: (c) 2016 Themeisle, themeisle.com
5-
* Version: 3.0.6
5+
* Version: 3.0.7
66
* Plugin Name: FEEDZY RSS Feeds
77
* Plugin URI: http://themeisle.com/plugins/feedzy-rss-feeds/
88
* Author: Themeisle

‎feedzy-rss-feed.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Plugin Name: Feedzy RSS Feeds Lite
1616
* Plugin URI: https://themeisle.com/plugins/feedzy-rss-feeds-lite/
1717
* Description: This is a short description of what the plugin does. It's displayed in the WordPress admin area.
18-
* Version: 3.0.6
18+
* Version: 3.0.7
1919
* Author: Themeisle
2020
* Author URI: http://themeisle.com
2121
* License: GPL-2.0+

‎includes/admin/feedzy-rss-feeds-ui-lang.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,6 @@ public static function get_form_elements() {
124124
'type' => 'select',
125125
'value' => '',
126126
'opts' => array(
127-
'auto' => array(
128-
'label' => __( 'Auto', 'feedzy-rss-feeds' ),
129-
'value' => '',
130-
),
131127
'yes' => array(
132128
'label' => __( 'Yes', 'feedzy-rss-feeds' ),
133129
'value' => 'yes',
@@ -185,10 +181,6 @@ public static function get_form_elements() {
185181
'type' => 'select',
186182
'value' => '',
187183
'opts' => array(
188-
'auto' => array(
189-
'label' => __( 'Auto', 'feedzy-rss-feeds' ),
190-
'value' => '',
191-
),
192184
'yes' => array(
193185
'label' => __( 'Yes', 'feedzy-rss-feeds' ),
194186
'value' => 'yes',
@@ -204,10 +196,6 @@ public static function get_form_elements() {
204196
'type' => 'select',
205197
'value' => '',
206198
'opts' => array(
207-
'auto' => array(
208-
'label' => __( 'Auto', 'feedzy-rss-feeds' ),
209-
'value' => '',
210-
),
211199
'yes' => array(
212200
'label' => __( 'Yes', 'feedzy-rss-feeds' ),
213201
'value' => 'yes',
@@ -289,10 +277,6 @@ public static function get_form_elements() {
289277
'disabled' => true,
290278
'value' => '',
291279
'opts' => array(
292-
'auto' => array(
293-
'label' => __( 'Auto', 'feedzy-rss-feeds' ),
294-
'value' => '',
295-
),
296280
'yes' => array(
297281
'label' => __( 'Yes', 'feedzy-rss-feeds' ),
298282
'value' => 'yes',

‎includes/admin/feedzy-wp-widget.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,12 @@ public static function bool_to_enum( $value ) {
157157
if ( $value == '1' || $value == 'true' ) {
158158
return 'yes';
159159
}
160-
if ( $value == '0' || $value == 'false' || $value == '' ) {
160+
if ( $value == '0' || $value == 'false' ) {
161161
return 'no';
162162
}
163-
163+
if ( $value == '' ) {
164+
return 'auto';
165+
}
164166
return $value;
165167

166168
}

‎includes/feedzy-rss-feeds-feed-tweaks.php

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
11
<?php
22
/**
3-
* The file that alter the main blog feed
3+
* Useful helper functions for plugin.
44
*
55
* @link http://themeisle.com
66
* @since 3.0.0
77
*
88
* @package feedzy-rss-feeds
99
* @subpackage feedzy-rss-feeds/includes
1010
*/
11-
/**
12-
*
13-
* Insert cover picture to main rss feed content
14-
*
15-
* @since 3.0.0
16-
* @access public
17-
*
18-
* @param string $content The item feed content.
19-
*
20-
* @return string
21-
*/
2211
// @codingStandardsIgnoreStart
2312
/**
2413
* @param string $content
@@ -64,7 +53,7 @@ function feedzy_options() {
6453
* @return bool If the users is before 3.0.3 or after
6554
*/
6655
function feedzy_is_new() {
67-
return feedzy_options()->get_var( 'is_new' ) === 'yes';
56+
return feedzy_options()->get_var( 'is_new' ) === 'yes' && ! feedzy_is_pro();
6857
}
6958

7059
/**

‎includes/feedzy-rss-feeds.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static function instance() {
104104
*/
105105
public function init() {
106106
self::$plugin_name = 'feedzy-rss-feeds';
107-
self::$version = '3.0.6';
107+
self::$version = '3.0.7';
108108
self::$instance->load_dependencies();
109109
self::$instance->set_locale();
110110
self::$instance->define_admin_hooks();

‎languages/feedzy-rss-feeds.pot

Lines changed: 52 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# This file is distributed under the GPL-2.0+.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: Feedzy RSS Feeds Lite 3.0.5\n"
5+
"Project-Id-Version: Feedzy RSS Feeds Lite 3.0.7\n"
66
"Report-Msgid-Bugs-To: https://github.com/Codeinwp/feedzy-rss-feeds/issues\n"
7-
"POT-Creation-Date: 2017-01-27 10:26:59+00:00\n"
7+
"POT-Creation-Date: 2017-02-03 12:00:17+00:00\n"
88
"MIME-Version: 1.0\n"
99
"Content-Type: text/plain; charset=utf-8\n"
1010
"Content-Transfer-Encoding: 8bit\n"
@@ -109,174 +109,170 @@ msgid "Should we display the RSS title?"
109109
msgstr ""
110110

111111
#: includes/admin/feedzy-rss-feeds-ui-lang.php:128
112-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:152
113-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:189
114-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:208
115-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:252
116-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:293
117-
msgid "Auto"
118-
msgstr ""
119-
120-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:132
121-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:193
122-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:212
123-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:256
124-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:297
112+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:185
113+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:200
114+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:244
115+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:281
125116
msgid "Yes"
126117
msgstr ""
127118

128-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:136
129-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:197
130-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:216
131-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:260
132-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:301
119+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:132
120+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:189
121+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:204
122+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:248
123+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:285
133124
msgid "No"
134125
msgstr ""
135126

136-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:144
127+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:140
137128
msgid "Item Options"
138129
msgstr ""
139130

140-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:147
131+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:143
141132
msgid "Links may be opened in the same window or a new tab."
142133
msgstr ""
143134

144-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:156
135+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:148
136+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:240
137+
msgid "Auto"
138+
msgstr ""
139+
140+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:152
145141
msgid "_blank"
146142
msgstr ""
147143

148-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:160
144+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:156
149145
msgid "_self"
150146
msgstr ""
151147

152-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:164
148+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:160
153149
msgid "_parent"
154150
msgstr ""
155151

156-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:168
152+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:164
157153
msgid "_top"
158154
msgstr ""
159155

160-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:172
156+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:168
161157
msgid "framename"
162158
msgstr ""
163159

164-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:178
160+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:174
165161
msgid "Trim the title of the item after X characters."
166162
msgstr ""
167163

168-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:179
169-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:224
164+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:175
165+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:212
170166
msgid "(eg: 160)"
171167
msgstr ""
172168

173-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:184
169+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:180
174170
msgid "Should we display the date of publication and the author name?"
175171
msgstr ""
176172

177-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:203
173+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:195
178174
msgid "Should we display a description (abstract) of the retrieved item?"
179175
msgstr ""
180176

181-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:222
177+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:210
182178
msgid "Crop description (summary) of the element after X characters."
183179
msgstr ""
184180

185-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:228
181+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:216
186182
msgid ""
187183
"Only display item if title contains specific keyword(s) (comma-separated "
188184
"list/case sensitive)."
189185
msgstr ""
190186

191-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:229
187+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:217
192188
msgid "(eg: news, sports etc.)"
193189
msgstr ""
194190

195-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:235
191+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:223
196192
msgid ""
197193
"Exclude items if title or content contains specific keyword(s) "
198194
"(comma-separated list/case sensitive). "
199195
msgstr ""
200196

201-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:236
197+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:224
202198
msgid "(eg: politics, gossip etc.)"
203199
msgstr ""
204200

205-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:244
201+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:232
206202
msgid "Item Image Options"
207203
msgstr ""
208204

209-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:247
205+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:235
210206
msgid "Should we display the first image of the content if it is available?"
211207
msgstr ""
212208

213-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:266
209+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:254
214210
msgid "Default thumbnail URL if no image is found."
215211
msgstr ""
216212

217-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:267
213+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:255
218214
msgid "Image URL"
219215
msgstr ""
220216

221-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:271
217+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:259
222218
msgid "Select from Gallery"
223219
msgstr ""
224220

225-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:275
221+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:263
226222
msgid "Thumblails dimension. Do not include \"px\". Eg: 150"
227223
msgstr ""
228224

229-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:276
225+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:264
230226
msgid "(eg: 150)"
231227
msgstr ""
232228

233-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:283
229+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:271
234230
msgid "PRO Options"
235231
msgstr ""
236232

237-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:284
233+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:272
238234
msgid ""
239235
"Get access to more options and customizations with full version of Feedzy "
240236
"RSS Feeds . Use existing templates or extend them and make them your own."
241237
msgstr ""
242238

243-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:284
239+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:272
244240
msgid "See more features of Feedzy RSS Feeds "
245241
msgstr ""
246242

247-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:287
243+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:275
248244
msgid "Should we display the price from the feed if it is available?"
249245
msgstr ""
250246

251-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:307
247+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:291
252248
msgid "Referral URL parameters (w/o \"?\")."
253249
msgstr ""
254250

255-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:308
251+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:292
256252
msgid "(eg. promo_code=feedzy_is_awesome)"
257253
msgstr ""
258254

259-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:314
255+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:298
260256
msgid "How many columns we should use to display the feed items"
261257
msgstr ""
262258

263-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:315
259+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:299
264260
msgid "(eg. 1, 2, ..., 6)"
265261
msgstr ""
266262

267-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:321
263+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:305
268264
msgid "Template to use when displaying the feed."
269265
msgstr ""
270266

271-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:327
267+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:311
272268
msgid "Default"
273269
msgstr ""
274270

275-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:331
271+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:315
276272
msgid "Style 1"
277273
msgstr ""
278274

279-
#: includes/admin/feedzy-rss-feeds-ui-lang.php:335
275+
#: includes/admin/feedzy-rss-feeds-ui-lang.php:319
280276
msgid "Style 2"
281277
msgstr ""
282278

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "feedzy-rss-feeds",
3-
"version": "3.0.6",
3+
"version": "3.0.7",
44
"description": "FEEDZY RSS Feeds is a small and lightweight RSS aggregator plugin",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)