Merge pull request #153 from Freemius/develop

Develop

includes/class-freemius.php

@@ -2641,13 +2641,17 @@ private function parse_settings( &$plugin_info ) {
 			// Set the secret key after storing the plugin, we don't want to store the key in the storage.
 			$this->_plugin->secret_key = $secret_key;
 
-			if ( ! isset( $plugin_info['menu'] ) ) {
-				// Back compatibility to 1.1.2
-				$plugin_info['menu'] = array(
-					'slug' => isset( $plugin_info['menu_slug'] ) ?
+			if (! isset( $plugin_info['menu'] )) {
+				$plugin_info['menu'] = array();
+
+				if ( ! empty( $this->_storage->sdk_last_version ) &&
+				     version_compare( $this->_storage->sdk_last_version, '1.1.2', '<=' )
+				) {
+					// Backward compatibility to 1.1.2
+					$plugin_info['menu']['slug'] = isset( $plugin_info['menu_slug'] ) ?
 						$plugin_info['menu_slug'] :
-						$this->_slug
-				);
+						$this->_slug;
+				}
 			}
 
 			$this->_menu = FS_Admin_Menu_Manager::instance( $this->_slug );

includes/class-fs-logger.php

@@ -88,7 +88,7 @@ private static function init() {
 			self::$_ownerName          = get_current_user();
 			self::$_isStorageLoggingOn = ( 1 == get_option( 'fs_storage_logger', 0 ) );
 			self::$_abspathLength      = strlen( ABSPATH );
-			self::$_processID          = getmypid();
+			self::$_processID          = mt_rand(0, 32000);
 
 			// Process ID may be `false` on errors.
 			if ( ! is_numeric( self::$_processID ) ) {

start.php

@@ -15,7 +15,7 @@
 	 *
 	 * @var string
 	 */
-	$this_sdk_version = '1.2.1.6';
+	$this_sdk_version = '1.2.1.6.1';
 
 	#region SDK Selection Logic --------------------------------------------------------------------