Changeset 1813564

Timestamp:

02/01/2018 03:18:56 PM (8 years ago)

Author:

pressshack

Message:

Releasing 1.9.7

Location:

publishpress/trunk

Files:

• includes.php (modified) (1 diff)
• publishpress.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

publishpress/trunk/includes.php

@@ -41 +41 @@
 
     // Define contants
-    define( 'PUBLISHPRESS_VERSION', '1.9.6' );
+    define( 'PUBLISHPRESS_VERSION', '1.9.7' );
     define( 'PUBLISHPRESS_ROOT', dirname( __FILE__ ) );
     define( 'PUBLISHPRESS_FILE_PATH', PUBLISHPRESS_ROOT . '/' . basename( __FILE__ ) );

publishpress/trunk/publishpress.php

@@ -6 +6 @@
  * Author: PublishPress
  * Author URI: https://publishpress.com
- * Version: 1.9.6
+ * Version: 1.9.7
  * Text Domain: publishpress
  * Domain Path: /languages
@@ -421 +421 @@
     public function filter_custom_menu_order( $menu_ord ) {
         global $submenu;
-
         if ( isset( $submenu['pp-calendar'] ) ) {
+
             $submenu_pp  = $submenu['pp-calendar'];
             $new_submenu = array();
 
+            // Get the index for the menus.
+            $relevantMenus = array(
+                'pp-calendar' => null,
+                'pp-content-overview' => null,
+                'pp-addons' => null,
+                'pp-modules-settings' => null,
+                'edit.php?post_type=psppnotif_workflow' => null,
+            );
+
+            foreach ($submenu_pp as $index => $item) {
+                if (array_key_exists($item[2], $relevantMenus)) {
+                    $relevantMenus[$item[2]] = $index;
+                }
+            }
+
             // Calendar
-            if (isset($submenu_pp[0])) {
-                $new_submenu[] = $submenu_pp[0];
+            if (! is_null($relevantMenus['pp-calendar'])) {
+                $new_submenu[] = $submenu_pp[$relevantMenus['pp-calendar']];
+
+                unset($submenu_pp[$relevantMenus['pp-calendar']]);
             }
 
             // Content Overview
-            if (isset($submenu_pp[1])) {
-                $new_submenu[] = $submenu_pp[1];
+            if (! is_null($relevantMenus['pp-content-overview'])) {
+                $new_submenu[] = $submenu_pp[$relevantMenus['pp-content-overview']];
+
+                unset($submenu_pp[$relevantMenus['pp-content-overview']]);
             }
 
             // Notifications
-            if (isset($submenu_pp[4])) {
-                $new_submenu[] = $submenu_pp[4];
+            if (! is_null($relevantMenus['edit.php?post_type=psppnotif_workflow'])) {
+                $new_submenu[] = $submenu_pp[$relevantMenus['edit.php?post_type=psppnotif_workflow']];
+
+                unset($submenu_pp[$relevantMenus['edit.php?post_type=psppnotif_workflow']]);
+            }
+
+            // Check if we have other menu items, except settings and add-ons. They will be added to the end.
+            if (count($submenu_pp) > 2) {
+                // Add the additional items
+                foreach ($submenu_pp as $index => $item) {
+                    if (! in_array($index, $relevantMenus)) {
+                        $new_submenu[] = $item;
+                        unset($submenu_pp[$index]);
+                    }
+                }
             }
 
             // Settings
-            if (isset($submenu_pp[3])) {
-                $new_submenu[] = $submenu_pp[3];
+            if (! is_null($relevantMenus['pp-modules-settings'])) {
+                $new_submenu[] = $submenu_pp[$relevantMenus['pp-modules-settings']];
+
+                unset($submenu_pp[$relevantMenus['pp-modules-settings']]);
             }
 
             // Add-ons
-            if (isset($submenu_pp[2])) {
-                $new_submenu[] = $submenu_pp[2];
-            }
-
-            // Contact Us
-            if (isset($submenu_pp[5])) {
-                $new_submenu[] = $submenu_pp[5];
-            }
-
-            // Check if we have additional items and add to the end
-            if ( count( $submenu_pp ) > 6 ) {
-                $new_submenu = array_merge( $new_submenu, array_splice( $submenu_pp, 6 ) );
+            if (! is_null($relevantMenus['pp-addons'])) {
+                $new_submenu[] = $submenu_pp[$relevantMenus['pp-addons']];
+
+                unset($submenu_pp[$relevantMenus['pp-addons']]);
             }
 
@@ -491 +517 @@
     public function notice_editflow_deactivated() {
         ?>
-        <div class="updated notice">
-            <p><?php _e( 'Edit Flow was deactivated by PublishPress. If you want to activate it, deactive PublishPress first.', 'publishpress' ); ?></p>
-        </div>
+        <div class="updated notice">
+            <p><?php _e( 'Edit Flow was deactivated by PublishPress. If you want to activate it, deactive PublishPress first.', 'publishpress' ); ?></p>
+        </div>
         <?php
     }

publishpress/trunk/readme.txt

@@ -7 +7 @@
 Requires PHP: 5.4
 Tested up to: 4.9
-Stable tag: 1.9.6
+Stable tag: 1.9.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -156 +156 @@
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+= [1.9.7] - 2018-02-01 =
+
+*Fixed:*
+
+* Fixed broken menu;
+
 = [1.9.6] - 2018-02-01 =