Merge pull request #84 from technote-space/develop

update framework

Author: technote-space

composer.lock

@@ -114,25 +114,25 @@
     },
     {
         "name": "wp-content-framework/admin",
-        "version": "v0.0.9",
-        "version_normalized": "0.0.9.0",
+        "version": "v0.0.10",
+        "version_normalized": "0.0.10.0",
         "source": {
             "type": "git",
             "url": "https://github.com/wp-content-framework/admin.git",
-            "reference": "1f83430778f96e127e1a245c5453ef7dae370dc1"
+            "reference": "3ea5659d358f26b7b44a621284543840e7ff2625"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/wp-content-framework/admin/zipball/1f83430778f96e127e1a245c5453ef7dae370dc1",
-            "reference": "1f83430778f96e127e1a245c5453ef7dae370dc1",
+            "url": "https://api.github.com/repos/wp-content-framework/admin/zipball/3ea5659d358f26b7b44a621284543840e7ff2625",
+            "reference": "3ea5659d358f26b7b44a621284543840e7ff2625",
             "shasum": ""
         },
         "require": {
             "php": ">=5.6.0",
             "wp-content-framework/controller": "~0.0.1",
             "wp-content-framework/view": "~0.0.1"
         },
-        "time": "2019-02-16T07:43:04+00:00",
+        "time": "2019-02-16T13:36:39+00:00",
         "type": "library",
         "installation-source": "dist",
         "notification-url": "https://packagist.org/downloads/",

vendor/composer/installed.json

@@ -2,7 +2,7 @@
 /**
  * WP_Framework_Admin Classes Models Admin
  *
- * @version 0.0.9
+ * @version 0.0.10
  * @author technote-space
  * @copyright technote-space All Rights Reserved
  * @license http://www.opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2
@@ -123,15 +123,17 @@ private function add_menu() {
 			}
 		}
 
-		$hook = add_menu_page(
-			$this->get_main_menu_title(),
-			$this->get_main_menu_title(),
+		$title = $this->get_main_menu_title();
+		$slug  = $this->get_menu_slug();
+		$hook  = add_menu_page(
+			$title,
+			$title,
 			$capability,
-			$this->get_menu_slug(),
+			$slug,
 			function () {
 			},
 			$this->get_img_url( $this->app->get_config( 'config', 'menu_image' ), '' ),
-			$this->apply_filters( 'admin_menu_position' )
+			$this->get_admin_menu_position( $slug, $title )
 		);
 
 		if ( isset( $this->page ) && $this->app->user_can( $this->page->get_capability() ) ) {
@@ -166,6 +168,24 @@ function () {
 		}
 	}
 
+	/**
+	 * @param string $menu_slug
+	 * @param string $menu_title
+	 *
+	 * @return float|string
+	 */
+	private function get_admin_menu_position( $menu_slug, $menu_title ) {
+		$position = $this->apply_filters( 'admin_menu_position' );
+
+		global $wp_version, $menu;
+		if ( isset( $menu["$position"] ) && version_compare( $wp_version, '4.4', '<' ) ) {
+			$position = $position + substr( base_convert( md5( $menu_slug . $menu_title ), 16, 10 ), - 5 ) * 0.00001;
+			$position = "$position";
+		}
+
+		return $position;
+	}
+
 	/**
 	 * sort menu
 	 */
@@ -257,9 +277,9 @@ private function get_page_prefix() {
 	 * @return array
 	 */
 	protected function get_namespaces() {
-		$namespaces = [$this->app->define->plugin_namespace . '\\Classes\\Controllers\\Admin\\'];
-		foreach ($this->app->get_packages() as $package) {
-			foreach ($package->get_admin_namespaces() as $namespace) {
+		$namespaces = [ $this->app->define->plugin_namespace . '\\Classes\\Controllers\\Admin\\' ];
+		foreach ( $this->app->get_packages() as $package ) {
+			foreach ( $package->get_admin_namespaces() as $namespace ) {
 				$namespaces[] = $namespace;
 			}
 		}