Merge branch 'develop'

Author: sheabunge

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# 1.7.1.2
+* Correct path to admin menu icon. Fixes [#8](https://github.com/bungeshea/code-snippets/issues/8)
+
 ## 1.7.1.1
 * Fixed a bug with custom capabilities and admin menus
 

README.md

@@ -2,7 +2,7 @@
 
 * __Requires at least:__ [WordPress 3.3](http://wordpress.org/download/) or later
 * __Tested up to:__ WordPress 3.6
-* __Stable version:__ [1.7.1.1](http://downloads.wordpress.org/plugin/code-snippets.latest-stable.zip)
+* __Stable version:__ [1.7.1.2](http://downloads.wordpress.org/plugin/code-snippets.latest-stable.zip)
 * __License:__ [MIT](license.txt)
 
 An easy, clean and simple way to add code snippets to your site.

code-snippets.php

@@ -16,7 +16,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: http://bungeshea.com
- * Version: 1.7.1.1
+ * Version: 1.7.1.2
  * License: MIT
  * License URI: license.txt
  * Text Domain: code-snippets
@@ -53,7 +53,7 @@ final class Code_Snippets {
 	 * @access public
 	 * @var string A PHP-standardized version number string
 	 */
-	public $version = '1.7.1.1';
+	public $version = '1.7.1.2';
 
 	/**
 	 * Variables to hold plugin paths

includes/class-admin.php

@@ -173,7 +173,7 @@ function add_admin_menus() {
 
 		/* Use a different screen icon for the MP6 interface */
 		if ( get_user_option( 'admin_color' )  !== 'mp6' )
-			$menu_icon = apply_filters( 'code_snippets_menu_icon', plugins_url( 'images/menu-icon.png', $code_snippets->file ) );
+			$menu_icon = apply_filters( 'code_snippets_menu_icon', plugins_url( 'assets/menu-icon.png', $code_snippets->file ) );
 		else
 			$menu_icon = 'div';
 

readme.txt

@@ -4,7 +4,7 @@ Donate link: http://code-snippets.bungeshea.com/donate/
 Tags: code-snippets, snippets, code, php, network, multisite
 Requires at least: 3.3
 Tested up to: 3.6
-Stable tag: 1.7.1.1
+Stable tag: 1.7.1.2
 License: MIT
 License URI: license.txt
 
@@ -111,12 +111,15 @@ That's fantastic! Join me on [GitHub](https://github.com/bungeshea/code-snippets
 
 == Changelog ==
 
+= 1.7.1.2 =
+* Correct path to admin menu icon ([#](http://wordpress.org/support/topic/icon-disappears-with-mp6?replies=6#post-4148319))
+
 = 1.7.1.1 =
 * Fix a minor bug with custom capabilities and admin menus
 
 = 1.7.1 =
 * Fix a bug with snippet being set as deactivated when saved
-* Updated PHP Documentation completely. [[View online](http://bungeshea.github.io/code-snippets/api)]
+* Updated PHP Documentation completely. [View online](http://bungeshea.github.io/code-snippets/api)
 * Only load admin functions when viewing dashboard
 * Added German translation thanks to [David Decker](http://deckerweb.de)
 * Allow or deny site administrators access to snippet admin menus. Set your preference in the **Enable Administration Menus** setting under the *Settings > Network Settings* network admin menu.
@@ -207,6 +210,9 @@ Plugin updates will be posted on the [plugin's homepage](http://code-snippets.bu
 
 == Upgrade Notice ==
 
+= 1.7.1.2 =
+Fixes the admin menu icon not loading
+
 = 1.7.1.1 =
 Fixes a minor bug with custom capabilities and admin menus