| @@ -2,9 +2,9 @@ | ||
| 2 | 2 | /* |
| 3 | 3 | Plugin Name: FeedWordPress |
| 4 | 4 | Plugin URI: http://projects.radgeek.com/feedwordpress |
| 5 | 5 | Description: simple and flexible Atom/RSS syndication for WordPress |
| 6 | -Version: 2009.0618 | |
| 6 | +Version: 2009.0613 | |
| 7 | 7 | Author: Charles Johnson |
| 8 | 8 | Author URI: http://radgeek.com/ |
| 9 | 9 | License: GPL |
| 10 | 10 | */ |
| @@ -506,9 +506,9 @@ | ||
| 506 | 506 | <?php |
| 507 | 507 | endif; |
| 508 | 508 | } /* function fwp_check_debug () */ |
| 509 | 509 | |
| 510 | -define('EXPECTED_MAGPIE_VERSION', '2009.0618'); | |
| 510 | +define('EXPECTED_MAGPIE_VERSION', '2009.0613'); | |
| 511 | 511 | function fwp_check_magpie () { |
| 512 | 512 | if (isset($_REQUEST['feedwordpress_magpie_fix'])) : |
| 513 | 513 | if ($_REQUEST['feedwordpress_magpie_fix']=='ignored') : |
| 514 | 514 | ?> |
| @@ -1252,9 +1252,9 @@ | ||
| 1252 | 1252 | if (!is_array($default_custom_settings)) : |
| 1253 | 1253 | $default_custom_settings = array(); |
| 1254 | 1254 | endif; |
| 1255 | 1255 | |
| 1256 | - $custom_settings = (isset($this->link->settings['postmeta']) ? $this->link->settings['postmeta'] : null); | |
| 1256 | + $custom_settings = $this->link->settings['postmeta']; | |
| 1257 | 1257 | if ($custom_settings) : |
| 1258 | 1258 | $custom_settings = unserialize($custom_settings); |
| 1259 | 1259 | endif; |
| 1260 | 1260 | if (!is_array($custom_settings)) : |
| @@ -1317,10 +1317,10 @@ | ||
| 1317 | 1317 | // Store a hash of the post content for checking whether something needs to be updated |
| 1318 | 1318 | $this->post['meta']['syndication_item_hash'] = $this->update_hash(); |
| 1319 | 1319 | |
| 1320 | 1320 | // Feed-by-feed options for author and category creation |
| 1321 | - $this->post['named']['unfamiliar']['author'] = (isset($this->feedmeta['unfamiliar author']) ? $this->feedmeta['unfamiliar author'] : null); | |
| 1322 | - $this->post['named']['unfamiliar']['category'] = (isset($this->feedmeta['unfamiliar category']) ? $this->feedmeta['unfamiliar category'] : null); | |
| 1321 | + $this->post['named']['unfamiliar']['author'] = $this->feedmeta['unfamiliar author']; | |
| 1322 | + $this->post['named']['unfamiliar']['category'] = $this->feedmeta['unfamiliar category']; | |
| 1323 | 1323 | |
| 1324 | 1324 | // Categories: start with default categories, if any |
| 1325 | 1325 | $fc = get_option("feedwordpress_syndication_cats"); |
| 1326 | 1326 | if ($fc) : |
| @@ -1328,9 +1328,9 @@ | ||
| 1328 | 1328 | else : |
| 1329 | 1329 | $this->post['named']['preset/category'] = array(); |
| 1330 | 1330 | endif; |
| 1331 | 1331 | |
| 1332 | - if (isset($this->feedmeta['cats']) and is_array($this->feedmeta['cats'])) : | |
| 1332 | + if (is_array($this->feedmeta['cats'])) : | |
| 1333 | 1333 | $this->post['named']['preset/category'] = array_merge($this->post['named']['preset/category'], $this->feedmeta['cats']); |
| 1334 | 1334 | endif; |
| 1335 | 1335 | |
| 1336 | 1336 | // Now add categories from the post, if we have 'em |
| @@ -1357,9 +1357,9 @@ | ||
| 1357 | 1357 | else : |
| 1358 | 1358 | $this->post['tags_input'] = array(); |
| 1359 | 1359 | endif; |
| 1360 | 1360 | |
| 1361 | - if (isset($this->feedmeta['tags']) and is_array($this->feedmeta['tags'])) : | |
| 1361 | + if (is_array($this->feedmeta['tags'])) : | |
| 1362 | 1362 | $this->post['tags_input'] = array_merge($this->post['tags_input'], $this->feedmeta['tags']); |
| 1363 | 1363 | endif; |
| 1364 | 1364 | |
| 1365 | 1365 | endif; |
