Changeset 1585938
- Timestamp:
- 01/31/2017 05:01:42 PM (9 years ago)
- Location:
- stacksight
- Files:
-
- 2 edited
- 17 copied
-
tags/1.11.2 (copied) (copied from stacksight/trunk)
-
tags/1.11.2/assets/css/ss-admin.css (copied) (copied from stacksight/trunk/assets/css/ss-admin.css)
-
tags/1.11.2/readme.txt (copied) (copied from stacksight/trunk/readme.txt) (2 diffs)
-
tags/1.11.2/stacksight-php-sdk/SSClientBase.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/SSClientBase.php)
-
tags/1.11.2/stacksight-php-sdk/SSHttpRequest.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/SSHttpRequest.php)
-
tags/1.11.2/stacksight-php-sdk/bootstrap-drupal-6.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-drupal-6.php)
-
tags/1.11.2/stacksight-php-sdk/bootstrap-drupal-7.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-drupal-7.php)
-
tags/1.11.2/stacksight-php-sdk/bootstrap-drupal-8.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-drupal-8.php)
-
tags/1.11.2/stacksight-php-sdk/bootstrap-magento-2.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-magento-2.php)
-
tags/1.11.2/stacksight-php-sdk/bootstrap-symfony-2.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-symfony-2.php)
-
tags/1.11.2/stacksight-php-sdk/bootstrap-wp.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-wp.php)
-
tags/1.11.2/stacksight-php-sdk/composer.json (copied) (copied from stacksight/trunk/stacksight-php-sdk/composer.json)
-
tags/1.11.2/stacksight-php-sdk/platforms/SSMagento2Client.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/platforms/SSMagento2Client.php)
-
tags/1.11.2/stacksight-php-sdk/platforms/SSSymfony2Client.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/platforms/SSSymfony2Client.php)
-
tags/1.11.2/stacksight-php-sdk/requests/SSHttpRequestMultiCurl.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/requests/SSHttpRequestMultiCurl.php)
-
tags/1.11.2/stacksight-php-sdk/requests/SSHttpRequestSockets.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/requests/SSHttpRequestSockets.php)
-
tags/1.11.2/wp-stacksight.php (copied) (copied from stacksight/trunk/wp-stacksight.php) (6 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/wp-stacksight.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
stacksight/tags/1.11.2/readme.txt
r1573297 r1585938 4 4 Requires at least: 3.5 5 5 Tested up to: 4.3 6 Stable tag: 1.11. 16 Stable tag: 1.11.2 7 7 License: GPLv2 or later 8 8 … … 86 86 87 87 == Changelog == 88 = 1.11.2 = 89 - Fix inventory data for WP multisite 90 88 91 = 1.11.0 = 89 92 - Save application settings in DB -
stacksight/tags/1.11.2/wp-stacksight.php
r1573297 r1585938 4 4 * Plugin URI: https://wordpress.org/plugins/stacksight/ 5 5 * Description: Stacksight wordpress support (featuring events, error logs and updates) 6 * Version: 1.11. 16 * Version: 1.11.2 7 7 * Author: Stacksight LTD 8 8 * Author URI: http://stacksight.io … … 436 436 if($network_wide == true && is_multisite()){ 437 437 if(is_plugin_active_for_network($plugin) && in_array($plugin, (array) get_blog_option($blog_id, 'active_plugins', array()))){ 438 return false;438 return true; 439 439 } 440 440 if(!is_plugin_active_for_network($plugin) && in_array($plugin, (array) get_blog_option($blog_id, 'active_plugins', array()))){ 441 return false;441 return true; 442 442 } 443 443 if(is_plugin_active_for_network($plugin) && !in_array($plugin, (array) get_blog_option($blog_id, 'active_plugins', array()))){ … … 449 449 } else{ 450 450 if(is_plugin_active_for_network($plugin) && in_array($plugin, (array) get_option('active_plugins', array()))){ 451 return false;451 return true; 452 452 } 453 453 if(!is_plugin_active_for_network($plugin) && in_array($plugin, (array) get_option('active_plugins', array()))){ … … 836 836 if(is_multisite()){ 837 837 if($blog_id){ 838 $active = $this->is_blog_plugin_active($path, $blog_id );838 $active = $this->is_blog_plugin_active($path, $blog_id, true); 839 839 } else{ 840 $active = $this->is_blog_plugin_active($path, get_current_blog_id() );840 $active = $this->is_blog_plugin_active($path, get_current_blog_id(), true); 841 841 } 842 842 } else{ … … 859 859 } 860 860 861 $current_theme = get_current_theme(); 861 $current_blog_id = get_current_blog_id(); 862 $theme_info = ''; 863 $current_theme = ''; 864 if(!is_multisite() || (is_multisite() && $blog_id && $blog_id == $current_blog_id)){ 865 $current_theme = get_current_theme(); 866 } elseif($blog_id){ 867 $current_theme = get_blog_option($blog_id, 'current_theme', array()); 868 } 862 869 if($object_themes && is_array($object_themes)){ 863 870 foreach($object_themes as $theme_name => $theme){ … … 874 881 } 875 882 } 883 876 884 return array_merge($themes, $plugins); 877 885 } -
stacksight/trunk/readme.txt
r1573297 r1585938 4 4 Requires at least: 3.5 5 5 Tested up to: 4.3 6 Stable tag: 1.11. 16 Stable tag: 1.11.2 7 7 License: GPLv2 or later 8 8 … … 86 86 87 87 == Changelog == 88 = 1.11.2 = 89 - Fix inventory data for WP multisite 90 88 91 = 1.11.0 = 89 92 - Save application settings in DB -
stacksight/trunk/wp-stacksight.php
r1573297 r1585938 4 4 * Plugin URI: https://wordpress.org/plugins/stacksight/ 5 5 * Description: Stacksight wordpress support (featuring events, error logs and updates) 6 * Version: 1.11. 16 * Version: 1.11.2 7 7 * Author: Stacksight LTD 8 8 * Author URI: http://stacksight.io … … 436 436 if($network_wide == true && is_multisite()){ 437 437 if(is_plugin_active_for_network($plugin) && in_array($plugin, (array) get_blog_option($blog_id, 'active_plugins', array()))){ 438 return false;438 return true; 439 439 } 440 440 if(!is_plugin_active_for_network($plugin) && in_array($plugin, (array) get_blog_option($blog_id, 'active_plugins', array()))){ 441 return false;441 return true; 442 442 } 443 443 if(is_plugin_active_for_network($plugin) && !in_array($plugin, (array) get_blog_option($blog_id, 'active_plugins', array()))){ … … 449 449 } else{ 450 450 if(is_plugin_active_for_network($plugin) && in_array($plugin, (array) get_option('active_plugins', array()))){ 451 return false;451 return true; 452 452 } 453 453 if(!is_plugin_active_for_network($plugin) && in_array($plugin, (array) get_option('active_plugins', array()))){ … … 836 836 if(is_multisite()){ 837 837 if($blog_id){ 838 $active = $this->is_blog_plugin_active($path, $blog_id );838 $active = $this->is_blog_plugin_active($path, $blog_id, true); 839 839 } else{ 840 $active = $this->is_blog_plugin_active($path, get_current_blog_id() );840 $active = $this->is_blog_plugin_active($path, get_current_blog_id(), true); 841 841 } 842 842 } else{ … … 859 859 } 860 860 861 $current_theme = get_current_theme(); 861 $current_blog_id = get_current_blog_id(); 862 $theme_info = ''; 863 $current_theme = ''; 864 if(!is_multisite() || (is_multisite() && $blog_id && $blog_id == $current_blog_id)){ 865 $current_theme = get_current_theme(); 866 } elseif($blog_id){ 867 $current_theme = get_blog_option($blog_id, 'current_theme', array()); 868 } 862 869 if($object_themes && is_array($object_themes)){ 863 870 foreach($object_themes as $theme_name => $theme){ … … 874 881 } 875 882 } 883 876 884 return array_merge($themes, $plugins); 877 885 }
Note: See TracChangeset
for help on using the changeset viewer.