Fishpig_Wordpress_Integration - Version 4.2.1.9

Version Notes

For changes, please see http://fishpig.co.uk/magento/wordpress-integration/#changelog

Download this release

Release Info

Developer fishpig
Extension Fishpig_Wordpress_Integration
Version 4.2.1.9
Comparing to
See all releases


Code changes from version 4.2.1.8 to 4.2.1.9

Files changed (9) hide show
  1. app/code/community/Fishpig/Wordpress/Addon/WordPressSEO/Helper/Data.php +4 -0
  2. app/code/community/Fishpig/Wordpress/Helper/Plugin/Seo/Abstract.php +5 -3
  3. app/code/community/Fishpig/Wordpress/Model/Post.php +1 -1
  4. app/code/community/Fishpig/Wordpress/change-log.txt +3 -0
  5. app/code/community/Fishpig/Wordpress/etc/config.xml +1 -1
  6. app/code/community/Fishpig/Wordpress/etc/fishpig.xml +1 -1
  7. app/code/community/Fishpig/Wordpress/lib/wp/formatting.php +5358 -0
  8. app/design/frontend/base/default/template/wordpress/post/list/renderer/default.phtml +1 -1
  9. package.xml +4 -4
app/code/community/Fishpig/Wordpress/Addon/WordPressSEO/Helper/Data.php CHANGED
@@ -298,6 +298,10 @@ class Fishpig_Wordpress_Addon_WordPressSEO_Helper_Data extends Fishpig_Wordpress
298
  $meta->setRobots(implode(',', $robots));
299
  }
300
 
 
 
 
 
301
  $this->_applyMeta($meta->getData());
302
 
303
  if ($canon = $object->getMetaValue('_yoast_wpseo_canonical')) {
298
  $meta->setRobots(implode(',', $robots));
299
  }
300
 
301
+ if (!$meta->getDescription()) {
302
+ $meta->setDescription($object->getMetaDescription());
303
+ }
304
+
305
  $this->_applyMeta($meta->getData());
306
 
307
  if ($canon = $object->getMetaValue('_yoast_wpseo_canonical')) {
app/code/community/Fishpig/Wordpress/Helper/Plugin/Seo/Abstract.php CHANGED
@@ -108,10 +108,12 @@ abstract class Fishpig_Wordpress_Helper_Plugin_Seo_Abstract extends Fishpig_Word
108
  }
109
 
110
  if (($value = $this->_rewriteString($value)) !== false) {
111
- $headBlock->setData($key, $value);
 
112
 
113
- if ($key === 'title') {
114
- $this->_action->ignoreAutomaticTitles();
 
115
  }
116
  }
117
  }
108
  }
109
 
110
  if (($value = $this->_rewriteString($value)) !== false) {
111
+ if ($value) {
112
+ $headBlock->setData($key, $value);
113
 
114
+ if ($key === 'title') {
115
+ $this->_action->ignoreAutomaticTitles();
116
+ }
117
  }
118
  }
119
  }
app/code/community/Fishpig/Wordpress/Model/Post.php CHANGED
@@ -704,6 +704,6 @@ class Fishpig_Wordpress_Model_Post extends Fishpig_Wordpress_Model_Abstract
704
 
705
  public function getMetaDescription($maxWords = 30)
706
  {
707
- return $this->getPostExcerpt($maxWords);
708
  }
709
  }
704
 
705
  public function getMetaDescription($maxWords = 30)
706
  {
707
+ return strip_tags($this->getPostExcerpt($maxWords));
708
  }
709
  }
app/code/community/Fishpig/Wordpress/change-log.txt CHANGED
@@ -5,6 +5,9 @@
5
  * @author Ben Tideswell <ben@fishpig.co.uk>
6
  */
7
 
 
 
 
8
  17/02/2017 - 4.2.1.8
9
  - Fixed issue with Yoast SEO and og:description tag
10
 
5
  * @author Ben Tideswell <ben@fishpig.co.uk>
6
  */
7
 
8
+ 08/03/2017 - 4.2.1.9
9
+ - Added missing file. This fixes issue with wpautop not functioning correctly.
10
+
11
  17/02/2017 - 4.2.1.8
12
  - Fixed issue with Yoast SEO and og:description tag
13
 
app/code/community/Fishpig/Wordpress/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Fishpig_Wordpress>
5
- <version>4.2.1.8</version>
6
  </Fishpig_Wordpress>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Fishpig_Wordpress>
5
+ <version>4.2.1.9</version>
6
  </Fishpig_Wordpress>
7
  </modules>
8
  <global>
app/code/community/Fishpig/Wordpress/etc/fishpig.xml CHANGED
@@ -1,2 +1,2 @@
1
  <?xml version="1.0"?>
2
- <config><fishpig><extensions><Fishpig_Wordpress_Addon_ACF><new_version>1.4.0.12</new_version><name>Advanced Custom Fields</name><id>advanced-custom-field</id><url>https://fishpig.co.uk/magento/wordpress-integration/advanced-custom-fields/</url></Fishpig_Wordpress_Addon_ACF><Fishpig_Wordpress_Addon_CPT><new_version>2.1.1.2</new_version><id>posttypes-taxonomies</id><name>Post Types and Taxonomies</name><url>http://fishpig.co.uk/magento/wordpress-integration/post-types-taxonomies/</url></Fishpig_Wordpress_Addon_CPT><Fishpig_Wordpress_Addon_CS><new_version>1.3.4.0</new_version><id>customer-synch</id><name>Customer Synchronisation</name><url>http://fishpig.co.uk/magento/wordpress-integration/customer-synchronisation/</url></Fishpig_Wordpress_Addon_CS><Fishpig_Wordpress_Addon_ContactForm7><new_version>1.6.0.18</new_version><id>contact-form-7</id><name>Contact Form 7</name><url>https://fishpig.co.uk/magento/wordpress-integration/contact-form-7/</url></Fishpig_Wordpress_Addon_ContactForm7><Fishpig_Wordpress_Addon_Disqus><new_version>1.3.0.1</new_version><id>disqus</id><name>Disqus</name><url>http://fishpig.co.uk/magento/wordpress-integration/disqus/</url></Fishpig_Wordpress_Addon_Disqus><Fishpig_Wordpress_Addon_EventsCalendar><new_version>1.1.0.21</new_version><id>events-calendar</id><name>The Events Calendar</name><url>http://fishpig.co.uk/magento/wordpress-integration/events-calendar/</url></Fishpig_Wordpress_Addon_EventsCalendar><Fishpig_Wordpress_Addon_FormAssembly><new_version>1.0.0.0</new_version><id>form-assembly</id><name>Form Assembly</name><url>http://fishpig.co.uk/magento/wordpress-integration/</url></Fishpig_Wordpress_Addon_FormAssembly><Fishpig_Wordpress_Addon_GravityForms><new_version>1.1.0.19</new_version><id>gravity-forms</id><name>Gravity Forms</name><url>http://fishpig.co.uk/magento/wordpress-integration/gravity-forms/</url></Fishpig_Wordpress_Addon_GravityForms><Fishpig_Wordpress_Addon_IntegratedSearch><new_version>1.3.0.0</new_version><name>Integrated Search</name><url>http://fishpig.co.uk/magento/wordpress-integration/integrated-search/</url></Fishpig_Wordpress_Addon_IntegratedSearch><Fishpig_Wordpress_Addon_Multisite><new_version>2.1.1.2</new_version><name>Multisite Integration</name><url>http://fishpig.co.uk/magento/wordpress-integration/multisite/</url></Fishpig_Wordpress_Addon_Multisite><Fishpig_Wordpress_Addon_ReCaptcha><new_version>1.3.0.1</new_version><name>ReCaptcha</name><url>http://fishpig.co.uk/magento/wordpress-integration/recaptcha/</url></Fishpig_Wordpress_Addon_ReCaptcha><Fishpig_Wordpress_Addon_RevolutionSlider><new_version>1.1.0.18</new_version><id>revolutionslider</id><name>Revolution Slider</name><url>http://fishpig.co.uk/magento/wordpress-integration/revolution-slider/</url></Fishpig_Wordpress_Addon_RevolutionSlider><Fishpig_Wordpress_Addon_Root><new_version>1.1.0.10</new_version><name>Root</name><url>http://fishpig.co.uk/magento/wordpress-integration/root/</url></Fishpig_Wordpress_Addon_Root><Fishpig_Wordpress_Addon_TOC><new_version>1.0.0.3</new_version><id>toc</id><name>Table of Contents Plus</name><url>http://fishpig.co.uk/magento/wordpress-integration/</url></Fishpig_Wordpress_Addon_TOC><Fishpig_Wordpress_Addon_Tablepress><new_version>1.1.0.17</new_version><name>Tablepress</name><id>tablepress</id><url>http://fishpig.co.uk/magento/wordpress-integration/tablepress/</url></Fishpig_Wordpress_Addon_Tablepress><Fishpig_Wordpress_Addon_UCE><new_version>1.4.0.0</new_version><id>ultimate-category-excluder</id><name>Ultimate Category Excluder</name><url>http://fishpig.co.uk/magento-wordpress-ultimate-category-excluder.html</url></Fishpig_Wordpress_Addon_UCE><Fishpig_Wordpress_Addon_VisualComposer><new_version>1.1.0.20</new_version><id>visual-composer</id><name>Visual Composer</name><url>https://fishpig.co.uk/magento/wordpress-integration/visual-composer/</url></Fishpig_Wordpress_Addon_VisualComposer><Fishpig_Wordpress_Addon_WPSubscribe><new_version>1.0.0.4</new_version><id>wp-subscribe</id><name>WP Subscribe</name><url>http://fishpig.co.uk/magento/wordpress-integration/wp-subscribe/</url></Fishpig_Wordpress_Addon_WPSubscribe></extensions></fishpig></config>
1
  <?xml version="1.0"?>
2
+ <config><fishpig><extensions><Fishpig_Wordpress_Addon_ACF><new_version>1.4.0.12</new_version><name>Advanced Custom Fields</name><id>advanced-custom-field</id><url>https://fishpig.co.uk/magento/wordpress-integration/advanced-custom-fields/</url></Fishpig_Wordpress_Addon_ACF><Fishpig_Wordpress_Addon_CPT><new_version>2.1.1.3</new_version><id>posttypes-taxonomies</id><name>Post Types and Taxonomies</name><url>http://fishpig.co.uk/magento/wordpress-integration/post-types-taxonomies/</url></Fishpig_Wordpress_Addon_CPT><Fishpig_Wordpress_Addon_CS><new_version>1.3.4.0</new_version><id>customer-synch</id><name>Customer Synchronisation</name><url>http://fishpig.co.uk/magento/wordpress-integration/customer-synchronisation/</url></Fishpig_Wordpress_Addon_CS><Fishpig_Wordpress_Addon_ContactForm7><new_version>1.6.0.18</new_version><id>contact-form-7</id><name>Contact Form 7</name><url>https://fishpig.co.uk/magento/wordpress-integration/contact-form-7/</url></Fishpig_Wordpress_Addon_ContactForm7><Fishpig_Wordpress_Addon_Disqus><new_version>1.3.0.1</new_version><id>disqus</id><name>Disqus</name><url>http://fishpig.co.uk/magento/wordpress-integration/disqus/</url></Fishpig_Wordpress_Addon_Disqus><Fishpig_Wordpress_Addon_EventsCalendar><new_version>1.1.0.21</new_version><id>events-calendar</id><name>The Events Calendar</name><url>http://fishpig.co.uk/magento/wordpress-integration/events-calendar/</url></Fishpig_Wordpress_Addon_EventsCalendar><Fishpig_Wordpress_Addon_FormAssembly><new_version>1.0.0.0</new_version><id>form-assembly</id><name>Form Assembly</name><url>http://fishpig.co.uk/magento/wordpress-integration/</url></Fishpig_Wordpress_Addon_FormAssembly><Fishpig_Wordpress_Addon_GravityForms><new_version>1.1.0.19</new_version><id>gravity-forms</id><name>Gravity Forms</name><url>http://fishpig.co.uk/magento/wordpress-integration/gravity-forms/</url></Fishpig_Wordpress_Addon_GravityForms><Fishpig_Wordpress_Addon_IntegratedSearch><new_version>1.3.0.1</new_version><name>Integrated Search</name><url>http://fishpig.co.uk/magento/wordpress-integration/integrated-search/</url></Fishpig_Wordpress_Addon_IntegratedSearch><Fishpig_Wordpress_Addon_Multisite><new_version>2.1.1.2</new_version><name>Multisite Integration</name><url>http://fishpig.co.uk/magento/wordpress-integration/multisite/</url></Fishpig_Wordpress_Addon_Multisite><Fishpig_Wordpress_Addon_ReCaptcha><new_version>1.3.0.1</new_version><name>ReCaptcha</name><url>http://fishpig.co.uk/magento/wordpress-integration/recaptcha/</url></Fishpig_Wordpress_Addon_ReCaptcha><Fishpig_Wordpress_Addon_RevolutionSlider><new_version>1.1.0.18</new_version><id>revolutionslider</id><name>Revolution Slider</name><url>http://fishpig.co.uk/magento/wordpress-integration/revolution-slider/</url></Fishpig_Wordpress_Addon_RevolutionSlider><Fishpig_Wordpress_Addon_Root><new_version>1.1.0.10</new_version><name>Root</name><url>http://fishpig.co.uk/magento/wordpress-integration/root/</url></Fishpig_Wordpress_Addon_Root><Fishpig_Wordpress_Addon_TOC><new_version>1.0.0.3</new_version><id>toc</id><name>Table of Contents Plus</name><url>http://fishpig.co.uk/magento/wordpress-integration/</url></Fishpig_Wordpress_Addon_TOC><Fishpig_Wordpress_Addon_Tablepress><new_version>1.1.0.17</new_version><name>Tablepress</name><id>tablepress</id><url>http://fishpig.co.uk/magento/wordpress-integration/tablepress/</url></Fishpig_Wordpress_Addon_Tablepress><Fishpig_Wordpress_Addon_UCE><new_version>1.4.0.0</new_version><id>ultimate-category-excluder</id><name>Ultimate Category Excluder</name><url>http://fishpig.co.uk/magento-wordpress-ultimate-category-excluder.html</url></Fishpig_Wordpress_Addon_UCE><Fishpig_Wordpress_Addon_VisualComposer><new_version>1.1.0.20</new_version><id>visual-composer</id><name>Visual Composer</name><url>https://fishpig.co.uk/magento/wordpress-integration/visual-composer/</url></Fishpig_Wordpress_Addon_VisualComposer><Fishpig_Wordpress_Addon_WPSubscribe><new_version>1.0.0.4</new_version><id>wp-subscribe</id><name>WP Subscribe</name><url>http://fishpig.co.uk/magento/wordpress-integration/wp-subscribe/</url></Fishpig_Wordpress_Addon_WPSubscribe></extensions></fishpig></config>
app/code/community/Fishpig/Wordpress/lib/wp/formatting.php ADDED
@@ -0,0 +1,5358 @@