From a8c068e195613b98b92bad7b11efcc089430dfbf Mon Sep 17 00:00:00 2001
From: colin-marshall <colin.michael.marshall@gmail.com>
Date: Sat, 12 Dec 2015 12:09:24 -0700
Subject: [PATCH 1/2] Changed WP sticky post class to .wp-sticky

---
 functions.php            |  3 +++
 library/sticky-posts.php | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100755 library/sticky-posts.php

diff --git a/functions.php b/functions.php
index b33d818f4..ba43b2e75 100755
--- a/functions.php
+++ b/functions.php
@@ -42,6 +42,9 @@
 /** Add Nav Options to Customer */
 require_once( 'library/custom-nav.php' );
 
+/** Change WP's sticky post class */
+require_once( 'library/sticky-posts.php' );
+
 /** If your site requires protocol relative url's for theme assets, uncomment the line below */
 // require_once( 'library/protocol-relative-theme-assets.php' );
 
diff --git a/library/sticky-posts.php b/library/sticky-posts.php
new file mode 100755
index 000000000..a4c248322
--- /dev/null
+++ b/library/sticky-posts.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Change the class for sticky posts to .wp-sticky to avoid conflicts with Foundation's Sticky plugin
+ *
+ * @package WordPress
+ * @subpackage FoundationPress
+ * @since FoundationPress 2.2.0
+ */
+
+if ( ! function_exists( 'foundationpress_sticky_posts' ) ) :
+function foundationpress_sticky_posts($classes) {
+	$classes = array_diff($classes, array("sticky"));
+	$classes[] = 'wp-sticky';
+	return $classes;
+}
+add_filter('post_class','foundationpress_sticky_posts');
+
+endif;
+?>

From 9b3b0700c593e53117a23b3c69a9d92f08feb4a7 Mon Sep 17 00:00:00 2001
From: colin-marshall <colin.michael.marshall@gmail.com>
Date: Sat, 12 Dec 2015 13:59:39 -0700
Subject: [PATCH 2/2] Fixed Travis build errors

---
 library/sticky-posts.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/sticky-posts.php b/library/sticky-posts.php
index a4c248322..e2f608eb8 100755
--- a/library/sticky-posts.php
+++ b/library/sticky-posts.php
@@ -8,8 +8,8 @@
  */
 
 if ( ! function_exists( 'foundationpress_sticky_posts' ) ) :
-function foundationpress_sticky_posts($classes) {
-	$classes = array_diff($classes, array("sticky"));
+function foundationpress_sticky_posts( $classes ) {
+	$classes = array_diff($classes, array('sticky'));
 	$classes[] = 'wp-sticky';
 	return $classes;
 }