Merge branch 'release/1.2.1'

purothemes · Mar 5, 2018 · 839bdf6 · 839bdf6
2 parents 06a6bb3 + 708ffe1
commit 839bdf6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,8 @@
 == Changelog ==
 
+= 1.2.1 - 27 February 2018 =
+* Temporarily removed the SiteOrigin layouts folder setup.
+
 = 1.2 - 25 February 2018 =
 * Added additional compatibility for Page Builder by SiteOrigin.
 * Removed smooth scrolling from external page anchors.

diff --git a/inc/siteorigin-panels.php b/inc/siteorigin-panels.php
@@ -11,11 +11,11 @@
 /**
  * Register a custom layouts folder location.
  */
-function polestar_layouts_folder( $layout_folders ) {
-    $layout_folders[] = get_template_directory() . '/inc/layouts';
-    return $layout_folders;
-}
-add_filter( 'siteorigin_panels_local_layouts_directories', 'polestar_layouts_folder' );
+// function polestar_layouts_folder( $layout_folders ) {
+//     $layout_folders[] = get_template_directory() . '/inc/layouts';
+//     return $layout_folders;
+// }
+// add_filter( 'siteorigin_panels_local_layouts_directories', 'polestar_layouts_folder' );
 
 /**
  * Remove Post Loop widget templates that aren't complete loops.