Merge branch 'master' into develop

CherryFramework · Feb 6, 2017 · 3cc7c43 · 3cc7c43
2 parents b092e64 + 5787fe7
commit 3cc7c43
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cherry-framework b/cherry-framework
diff --git a/includes/public/class-cherry-search-form-public.php b/includes/public/class-cherry-search-form-public.php
@@ -94,7 +94,7 @@ public function set_search_query( $query ) {
 		 */
 		public function build_search_form( $search_form = null ) {
 			if ( null === $this->template_manager ) {
-				$this->template_manager = Cherry_Template_Manager::get_instance( cherry_search()->get_core() );
+				$this->template_manager = new Cherry_Template_Manager( cherry_search()->get_core() );
 			}
 
 			$this->messages['serverError'] = esc_html( $this->get_setting( 'server_error' ) );

diff --git a/includes/public/class-cherry-search-macros-callback.php b/includes/public/class-cherry-search-macros-callback.php
@@ -59,7 +59,7 @@ class Cherry_Search_Macros_Callback extends Cherry_Search_Settings_Manager {
 		 * @return void
 		 */
 		public function __construct() {
-			$this->template_manager = Cherry_Template_Manager::get_instance();
+			$this->template_manager = new Cherry_Template_Manager( cherry_search()->get_core() );
 			$this->set_variable();
 		}