Merge branch '1.17.5-rc'

Author: TheNewCoke

.vagrant/bootstrap.sh

@@ -50,6 +50,7 @@ if [ ! -f "${runfile}" ]; then
 	echo "  done"
 
 	echo "Configuring apache ..."
+	cp /vagrant/.vagrant/vagrant-mounted.conf /etc/init/ > /dev/null 2> /dev/null
 	rm -f /etc/apache2/httpd.conf
 	ln -sf /vagrant/.vagrant/httpd.conf /etc/apache2/httpd.conf
 	rm -f /etc/apache2/sites-enabled/000-default
@@ -65,6 +66,7 @@ if [ ! -f "${runfile}" ]; then
 		rm -f /etc/php5/apache2/php.ini
 		cp -f /usr/share/php5/php.ini-development /etc/php5/apache2/php.ini
 	fi
+	echo "  done"
 
 fi
 
@@ -80,11 +82,6 @@ if [ ! -f "${runfile}" ]; then
 	mv phpunit.phar /usr/local/bin/phpunit
 	echo "  done"
 
-	# Fixing issues with WordPress API host
-	echo "Adding entries to hosts file ..."
-	echo "66.155.40.202 api.wordpress.org" >> /etc/hosts
-	echo "  done"
-
 	touch "${runfile}"
 
 fi

.vagrant/vagrant-mounted.conf

@@ -0,0 +1,3 @@
+start on vagrant-mounted
+
+exec sudo service apache2 start

.vagrant/wordpress.sh

@@ -7,32 +7,37 @@ publicIp=$(/sbin/ifconfig eth1 | grep 'inet addr:' | cut -d: -f2 | awk '{ print
 
 if [ ! -f "${runfile}" ]; then
 
-    echo "Installing wordpress ..."
+	echo "Installing WordPress ..."
     rm -rf /var/www/*
     git clone --depth 1 --branch $wpVersion git://develop.git.wordpress.org/ /var/www > /dev/null
+	echo "  done"
 
-    echo "Configure wordpress ..."
+	echo "Configuring WordPress ..."
     # rm -f /var/www/wp-config.php
     # cp -fs /vagrant/.vagrant/wp-config.php /var/www/wp-config.php
     rm -f /var/www/src/.htaccess
     cp -f /vagrant/.vagrant/wp-htaccess /var/www/src/.htaccess
     export WP_DEVELOP_DIR=/var/www
     cp -f /vagrant/.vagrant/wp-tests-config.php /var/www/wp-tests-config.php
+	echo "  done"
 
-    echo "Set project directory ..."
+	echo "Setting project directory: /var/www/src/wp-content/plugins/wolfnet-idx-for-wordpress"
     ln -fs "/wolfnet-idx-for-wordpress" "/var/www/src/wp-content/plugins/wolfnet-idx-for-wordpress"
 
-    echo "Updating file ownership ..."
+	echo "Updating file ownership of /var/www"
     chown -R www-data:www-data /var/www
 
-    echo "Configure mysql ..."
+	echo "Configuring mysql ..."
     cat /vagrant/.vagrant/wp-prep.sql | mysql -u root
     # cat /vagrant/.vagrant/wp3.5.1-setup.sql | mysql -u root
+	echo "  done"
 
     echo "Start apache ..."
     service apache2 start
+	echo "  done"
+
+	echo "Performing WordPress Setup ..."
 
-    echo "Perform WordPress Setup ..."
     curl -s -d "dbname=wordpress&uname=root&pwd=&dbhost=localhost&prefix=wp_" \
         -H "Host:${publicIp}" http://127.0.0.1/wp-admin/setup-config.php?step=2 > /dev/null
 
@@ -44,6 +49,8 @@ if [ ! -f "${runfile}" ]; then
     # Enable WordPress Debug mode - here because the config file does exist until this point.
     sed -i "s/define('WP_DEBUG', false);/define('WP_DEBUG', true);/g" /var/www/wp-config.php
 
+	echo "  done"
+
     touch "${runfile}"
 
 fi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wolfnet-idx-for-wordpress",
-  "version": "1.17.4",
+  "version": "1.17.5",
   "description": "WolfNet IDX for WordPress",
   "homepage": "https://github.com/wolfnet/wordpressplugin",
   "bugs": "https://github.com/wolfnet/wordpressplugin/issues",

readme.md

@@ -15,11 +15,7 @@ License URI:        | https://www.gnu.org/licenses/gpl-2.0.html
 website.
 
 ## Description
-The WolfNet IDX for WordPress plugin provides IDX search solution integration with any WordPress
-website. To integrate WolfNet IDX data with your WordPress website, you must have a WolfNet IDX
-property search solution. To activate the plugin, you must have a unique product key. Please contact
-WolfNet Customer Service for support via phone at 612-342-0088 or toll free at 1-866-WOLFNET, or via
-email at service@wolfnet.com. You may also find us online at [WolfNet.com](http://wolfnet.com).
+The WolfNet IDX for WordPress plugin provides IDX search solution integration with any WordPress website. To integrate WolfNet IDX data with your WordPress website, you must have a WolfNet IDX property search solution. To access MLS data, you must have a unique product key. Contact WolfNet for more information.
 
 ## Installation
 There are no special instructions for installing the plugin, however a valid product key must be
@@ -93,6 +89,11 @@ Please upgrade to the latest version of the plugin as we will be disabling our o
 
 ## Changelog
 
+### 1.17.5
+
+* Fix for the error-handling in the Search Manager
+* Fix to prevent older Quick Search widgets from using keys that no longer exist
+
 ### 1.17.4
 
 * Fix to keep the featured listings scroller from halting at some widths

src/module/QuickSearch.php

@@ -78,24 +78,32 @@ public function routeQuickSearch($formData)
         $highestMatchKey = '';
 
         foreach (explode(',', $formData['keyids']) as $keyID) {
+
             try {
+
                 $key = $this->plugin->keyService->getById($keyID);
 
+                if ($key != null) {
                 $listings = $this->plugin->api->sendRequest(
                     $key,
                     '/listing?detaillevel=1&startrow=1&maxrows=1',
                     'GET',
                     $formData
                 );
+
                 $count = $listings['responseData']['data']['total_rows'];
 
-                if($count > $highestCount) {
+                if ($count > $highestCount) {
                     $highestCount = $count;
                     $highestMatchKey = $key;
                 }
+
+				}
+
             } catch (Wolfnet_Exception $e) {
                 echo $this->plugin->displayException($e);
             }
+
         }
 
         /*

src/module/SearchManager.php

@@ -98,8 +98,7 @@ public function searchManagerHtml($productKey = null)
                 return array('body' => '');
             }
         } else {
-            $http['body'] = $this->plugin->getWpError($http);
-            return $http;
+			return array('body' => $this->plugin->getWpError($http));
         }
 
     }