Skip to content

Commit

Permalink
More 4.4.1 changes from develop to master (#658)
Browse files Browse the repository at this point in the history
  • Loading branch information
martinkrcho authored Mar 24, 2022
1 parent ce2940f commit ee6b1ca
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
6 changes: 3 additions & 3 deletions classes/Views/addons/html-view.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@
$trial_link = add_query_arg( $trial_args, admin_url( 'admin.php' ) );

// If user is not super admin and website is multisite then change the URL.
if ( $this->_plugin->IsMultisite() && ! is_super_admin() ) {
if ( $this->plugin->is_multisite() && ! is_super_admin() ) {
$buy_now = 'https://wpactivitylog.com/pricing/';
$trial_link = 'https://wpactivitylog.com/pricing/';
$buy_now_target = ' target="_blank"';
} elseif ( $this->_plugin->IsMultisite() && is_super_admin() ) {
} elseif ( $this->plugin->is_multisite() && is_super_admin() ) {
$buy_now = add_query_arg( 'page', 'wsal-auditlog-pricing', network_admin_url( 'admin.php' ) );
$trial_link = add_query_arg( $trial_args, network_admin_url( 'admin.php' ) );
} elseif ( ! $this->_plugin->IsMultisite() && ! current_user_can( 'manage_options' ) ) {
} elseif ( $this->plugin->is_multisite() && ! current_user_can( 'manage_options' ) ) {
$buy_now = 'https://wpactivitylog.com/pricing/';
$trial_link = 'https://wpactivitylog.com/pricing/';
$buy_now_target = ' target="_blank"';
Expand Down
2 changes: 1 addition & 1 deletion third-party/vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit15d14b180a0d0fb89285c7ccb541f565::getLoader();
return ComposerAutoloaderInitb9d672d234a3d43fa8ace493e8708e77::getLoader();
8 changes: 4 additions & 4 deletions third-party/vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInit15d14b180a0d0fb89285c7ccb541f565
class ComposerAutoloaderInitb9d672d234a3d43fa8ace493e8708e77
{
private static $loader;

Expand All @@ -22,15 +22,15 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInit15d14b180a0d0fb89285c7ccb541f565', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitb9d672d234a3d43fa8ace493e8708e77', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit15d14b180a0d0fb89285c7ccb541f565', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitb9d672d234a3d43fa8ace493e8708e77', 'loadClassLoader'));

$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';

call_user_func(\Composer\Autoload\ComposerStaticInit15d14b180a0d0fb89285c7ccb541f565::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitb9d672d234a3d43fa8ace493e8708e77::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
Expand Down
5 changes: 2 additions & 3 deletions third-party/vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInit15d14b180a0d0fb89285c7ccb541f565
class ComposerStaticInitb9d672d234a3d43fa8ace493e8708e77
{
public static $classMap = array (
'WSAL_Vendor\\MirazMac\\Requirements\\Checker' => __DIR__ . '/..' . '/mirazmac/php-requirements-checker/src/Checker.php',
Expand All @@ -15,8 +15,7 @@ class ComposerStaticInit15d14b180a0d0fb89285c7ccb541f565
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->classMap = ComposerStaticInit15d14b180a0d0fb89285c7ccb541f565::$classMap;

$loader->classMap = ComposerStaticInitb9d672d234a3d43fa8ace493e8708e77::$classMap;
}, null, ClassLoader::class);
}
}

0 comments on commit ee6b1ca

Please sign in to comment.