Skip to content

Commit

Permalink
Merge pull request #15 in WP/idx-broker-plugin from release/1.3.1 to …
Browse files Browse the repository at this point in the history
…master

* commit '4c79e08949c21561d91ba395f88f6a66f71a18a4':
  Update readme file.
  Fix bug where the omnibar does not work properly on strict servers.
  Fix an issue with duplicate dynamic wrapper tags when equity is intalled. Fix a bug with errors being reported.
  • Loading branch information
sheparddw committed Nov 19, 2015
2 parents 53f3641 + 4c79e08 commit 5472054
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
6 changes: 3 additions & 3 deletions idx-broker-platinum/idx-broker-platinum.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: IDX Broker
Plugin URI: http://www.idxbroker.com
Description: Over 600 IDX/MLS feeds serviced. The #1 IDX/MLS solution just got even better!
Version: 1.3.0
Version: 1.3.1
Author: IDX Broker
Contributors: IDX, LLC
Author URI: http://www.idxbroker.com/
Expand All @@ -12,13 +12,13 @@

// Report all errors during development. Remember to hash out when sending to production.

error_reporting(E_ALL);
// error_reporting(E_ALL);

new Idx_Broker_Plugin();
class Idx_Broker_Plugin
{
//placed here for convenient updating
const IDX_WP_PLUGIN_VERSION = '1.3.0';
const IDX_WP_PLUGIN_VERSION = '1.3.1';

public function __construct()
{
Expand Down
4 changes: 2 additions & 2 deletions idx-broker-platinum/idx/omnibar/create-omnibar.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public function idx_omnibar_basic($plugin_dir, $idx_url)
//inserts inline variable for the results page url
wp_localize_script('idx-omnibar-js', 'idxUrl', $idx_url);
wp_enqueue_script('idx-omnibar-js');
wp_enqueue_script('idx-location-list', plugins_url('../../assets/js/locationlist.json', __FILE__));
wp_enqueue_script('idx-location-list', plugins_url('../../assets/js/locationlist.js', __FILE__));

return <<<EOD
<form class="idx-omnibar-form idx-omnibar-original-form">
Expand All @@ -37,7 +37,7 @@ public function idx_omnibar_extra($plugin_dir, $idx_url)
//inserts inline variable for the results page url
wp_localize_script('idx-omnibar-js', 'idxUrl', $idx_url);
wp_enqueue_script('idx-omnibar-js');
wp_enqueue_script('idx-location-list', plugins_url('../../assets/js/locationlist.json', __FILE__));
wp_enqueue_script('idx-location-list', plugins_url('../../assets/js/locationlist.js', __FILE__));

return <<<EOD
<form class="idx-omnibar-form idx-omnibar-extra-form">
Expand Down
2 changes: 1 addition & 1 deletion idx-broker-platinum/idx/omnibar/get-locations.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private function initiate_get_locations()
$locations = 'idxOmnibar({' . $cities . $counties . $zipcodes . '})';
//test to confirm API call worked properly before updating JSON file etc.
if (!empty($system_links_call) && empty($system_links_call->errors)) {
file_put_contents(dirname(dirname(dirname(__FILE__))) . '/assets/js/locationlist.json', $locations);
file_put_contents(dirname(dirname(dirname(__FILE__))) . '/assets/js/locationlist.js', $locations);

//update database with new results url
//get base Url for client's results page for use on omnibar.js front end
Expand Down
2 changes: 1 addition & 1 deletion idx-broker-platinum/idx/wrappers.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function does_theme_include_idx_tag()
}
}
}
if ($does_theme_include_idx_tag) {
if ($does_theme_include_idx_tag || function_exists('equity')) {
$post_content = '';
}

Expand Down
7 changes: 6 additions & 1 deletion idx-broker-platinum/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Contributors: idxco
Author URL: http://www.idxbroker.com
Tags: IDX, MLS, multiple listing service, idx broker, idx broker platinum, IDX plugin, idx wordpress, idx wordpress plugin, idxbroker, integrated idx, real estate, real estate wordpress, RETS, wordpress idx, wordpress mls, WordPress Plugin, platinum, realtor, idx broker lite, idx lite, idxbroker lite
Tested up to: 4.3.1
Stable tag: 1.3.0
Stable tag: 1.3.1
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -80,6 +80,11 @@ This plugin requires a PHP version higher than 5.2. For security reasons, we rec

== Changelog ==

= 1.3.1 =
* Fixed an issue with duplicate start and stop tags for dynamic wrappers when Equity is installed.
* Fixed a bug where errors were being reported.
* Fixed an issue where the omnibar would not load or update on servers with strict restrictions.

= 1.3.0 =
* Improved compatability with WP caching plugins fixing a bug that caused an API overage.
* Simplified the Admin UI.
Expand Down

0 comments on commit 5472054

Please sign in to comment.