Skip to content

Commit

Permalink
Merge pull request #448 from bmlt-enabled:force-handlebar-tag-inline
Browse files Browse the repository at this point in the history
force handlebar tag to be an inline #447
  • Loading branch information
otrok7 authored Nov 15, 2023
2 parents 7069365 + 5ed18b6 commit eee2d7a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
13 changes: 7 additions & 6 deletions crouton.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Description: A tabbed based display for showing meeting information.
Author: bmlt-enabled
Author URI: https://bmlt.app
Version: 3.17.5
Version: 3.17.6
*/
/* Disallow direct access to the plugin file */
if (basename($_SERVER['PHP_SELF']) == basename(__FILE__)) {
Expand All @@ -18,6 +18,11 @@ class Crouton
// phpcs:enable PSR1.Classes.ClassDeclaration.MissingNamespace
{
public $optionsName = 'bmlt_tabs_options';
/**
* configuration
*
* @var mixed[]
*/
public $options = array();
public $croutonBlockInitialized = false;
public static $HOUR_IN_SECONDS = 3600;
Expand Down Expand Up @@ -350,7 +355,7 @@ public function bmltHandlebar($atts, $template = null)
add_action("wp_footer", [$this,'handlebarFooter']);
}
$this->has_handlebars = true;
return sprintf('<bmlt-handlebar><div style="display:none;">%s</div>Fetching...</bmlt-handlebar>', htmlspecialchars($template));
return sprintf('<bmlt-handlebar style="display:none;"><span style="display:none;">%s</span>Fetching...</bmlt-handlebar>', htmlspecialchars($template));
}
public function croutonMap($atts, $content = null)
{
Expand Down Expand Up @@ -981,10 +986,6 @@ private function templateToParameter($name)
}
return html_entity_decode($template);
}
/**
* @param $root_server
* @return string
*/
private function getAllMeetings($root_server)
{
$results = wp_remote_get($root_server . "/client_interface/json/?switcher=GetSearchResults&data_field_key=weekday_tinyint,start_time,service_body_bigint,id_bigint,meeting_name,location_text,email_contact&sort_keys=meeting_name,service_body_bigint,weekday_tinyint,start_time");
Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Tags: na, meeting list, meeting finder, maps, recovery, addiction, webservant, b
Requires at least: 4.0
Required PHP: 5.6
Tested up to: 6.2.2
Stable tag: 3.17.5
Stable tag: 3.17.6
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
crouton implements a Tabbed UI for BMLT.
Expand Down Expand Up @@ -36,6 +36,9 @@ https://demo.bmlt.app/crouton

== Changelog ==

= 3.17.6 =
* Bug fix release - better parsing of <bmlt-handlebar> tags.

= 3.17.5 =
* hide meeting-details map if google maps but no api key
* meeting details on crouton_map pages, too
Expand Down

0 comments on commit eee2d7a

Please sign in to comment.