fixed bug on subfolder installations

README.md

@@ -3,7 +3,7 @@
 * Tags: admin bar, admin, development, staging
 * Requires at least: 4.0
 * Tested up to: 4.5.3
-* Stable tag: 0.9.4
+* Stable tag: 0.9.5
 * License: GNU General Public License v2 or later
 * License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -48,6 +48,9 @@ function sites_filter( $sites ) {
 
 ## Changelog ##
 
+### 0.9.5 ###
+* fixed bug for subfolder installations
+
 ### 0.9.4 ###
 * added an export and import option
 * minor improvements

apermo-adminbar.php

@@ -6,7 +6,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Apermo AdminBar
- * Version: 0.9.4
+ * Version: 0.9.5
  * Description: A simple plugin that allows you to add custom links to the AdminBar, navigation between your live and dev systems
  * Author: Christoph Daum
  * Author URI: http://apermo.de/
@@ -263,13 +263,12 @@ public function admin_bar_filter( $wp_admin_bar ) {
 						'href'		=> esc_url( $site['url'] ),
 					) );
 					// Check if we are on a different page than the homepage.
-					// Todo: Will probably break if WordPress installed in a subdirectory.
-					if ( strlen( $_SERVER['REQUEST_URI'] ) > 1 ) {
+					if ( strlen( $this->get_request() ) > 1 ) {
 						$wp_admin_bar->add_node( array(
 							'id'		=> esc_attr( 'apermo_adminbar_menu_' . $key . '-same' ),
 							'title'		=> esc_html( $site['name'] ) . ' ' . __( '(Same page)', 'apermo-adminbar' ),
 							'parent'	=> 'site-name',
-							'href'		=> esc_url( $site['url'] . $_SERVER['REQUEST_URI'] ),
+							'href'		=> esc_url( $site['url'] . $this->get_request() ),
 						) );
 					}
 				}
@@ -280,6 +279,18 @@ public function admin_bar_filter( $wp_admin_bar ) {
 		}
 	}
 
+	/**
+	 * Get the Request Part that is not Subfolder for the WordPress installation.
+	 */
+	public function get_request() {
+		$request = esc_url_raw( $_SERVER['REQUEST_URI'] );
+		$url = parse_url( $this->sites[ $this->current ]['url'] );
+		if ( isset( $url['path'] ) && 0 === strpos( $request, $url['path'] ) ) {
+			return substr( $request, strlen( $url['path'] ) );
+		}
+		return $request;
+	}
+
 	/**
 	 * Options page callback
 	 *