Update changelog and version number for 2.9.2

Author: sheabunge

Diff for: CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.9.2 (8 Sep 2017)
+* Fixed: Do not attempt to combine queries for fetching local and multisite snippets
+
 ## 2.9.1 (7 Sep 2017)
 * Fixed: Prevent illegal mix of collations errors when fetching snippets from database tables with different collations [[#](https://wordpress.org/support/topic/issue-on-multisite-with-wpml/)]
 

Diff for: code-snippets.php

@@ -10,7 +10,7 @@
  * @author    Shea Bunge <[email protected]>
  * @copyright 2012-2017 Shea Bunge
  * @license   MIT http://opensource.org/licenses/MIT
- * @version   2.9.1
+ * @version   2.9.2
  * @link      https://github.com/sheabunge/code-snippets
  */
 
@@ -20,7 +20,7 @@
 Description: An easy, clean and simple way to add code snippets to your site. No need to edit to your theme's functions.php file again!
 Author:      Shea Bunge
 Author URI:  https://bungeshea.com
-Version:     2.9.1
+Version:     2.9.2
 License:     MIT
 License URI: license.txt
 Text Domain: code-snippets
@@ -42,7 +42,7 @@
  * @since 2.0
  * @var string A PHP-standardized version number string
  */
-define( 'CODE_SNIPPETS_VERSION', '2.9.1' );
+define( 'CODE_SNIPPETS_VERSION', '2.9.2' );
 
 /**
  * The full path to the main file of this plugin

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-snippets",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "description": "Manage code snippets running on a WordPress-powered site through a graphical interface",
   "homepage": "https://wordpress.org/plugins/code-snippets",
   "main": "Gruntfile.js",

Diff for: readme.txt

@@ -4,7 +4,7 @@ Donate link: https://bungeshea.com/donate/
 Tags: code-snippets, snippets, code, php, network, multisite
 Requires at least: 3.6
 Tested up to: 4.8.1
-Stable tag: 2.9.1
+Stable tag: 2.9.2
 License: MIT
 License URI: license.txt
 
@@ -110,6 +110,9 @@ That's fantastic! Fork the [repository on GitHub](http://github.com/sheabunge/co
 
 == Changelog ==
 
+= 2.9.2 (8 Sep 2017) =
+* Fixed: Do not attempt to combine queries for fetching local and multisite snippets
+
 = 2.9.1 (7 Sep 2017) =
 * Fixed: Prevent illegal mix of collations errors when fetching snippets from database tables with different collations [[#](https://wordpress.org/support/topic/issue-on-multisite-with-wpml/)]