Skip to content

Commit

Permalink
Squashed 'includes/libraries/aihrus-framework/' changes from 4570a11.…
Browse files Browse the repository at this point in the history
….c79cf54

c79cf54 Version 1.2.4RC1
5c54123 Version 1.2.4RC1
1a33ab9 set sslverify to falst in get_remote_get function
d0e93e6 Removed disable_license_notice parameter from aihr_notice_license
c62fb47 Version 1.2.3
7b2375a RESOLVE #8 Remove activation helpers
02b4924 Version 1.3.1RC3
4966091 Merge commit '87434dc139ada0d9da3e7a49795c0dd9057de29e' into C16280
87434dc Squashed 'includes/libraries/parsedown/' changes from 0e89e37..fa005fd
b066dd8 Merge branch '1.2.3RC1' into C16280
f580146 RELATES #7 Blank license response check
34ede0f Update Parsedown 1.5.4 library
fbd6396 Squashed 'includes/libraries/parsedown/' changes from a9dfc97..0e89e37
19b132f Merge commit 'fbd6396c905dd78601db21434bc457121b0058c2' into 1.2.3RC1
26fc0ea Modified aihr_notice_license() function to add disable license error notice
893f2ae RESOLVE axelerant/testimonials-widget#184 Remove deprecated constructor calls for WP_Widget
b2922b5 Version 1.2.3RC1
fc59104 Squashed 'includes/libraries/parsedown/' changes from 93f7b26..a9dfc97
13885c6 Merge commit 'fc59104ce654a8877ccf12203410cfcf9fd96f28' into 1.2.2

git-subtree-dir: includes/libraries/aihrus-framework
git-subtree-split: c79cf54d594a54defbc11a57b1906c8512e28ebc
  • Loading branch information
saurabhsirdixit committed Nov 23, 2015
1 parent d8e2bb2 commit b95b1df
Show file tree
Hide file tree
Showing 36 changed files with 953 additions and 593 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,13 @@

## master

## 1.2.3
* RELATES #7 Add option to disable the license not saved notice
* RESOLVE #8 Remove activation helpers
* RESOLVE michael-cannon/testimonials-widget#184 Remove deprecated constructor calls for WP_Widget
* Tested with WordPress 4.4
* Update Parsedown 1.5.4 library

## 1.2.2
* Add Inside Axelerant link
* Store branding updates
Expand Down
4 changes: 2 additions & 2 deletions README.md
@@ -1,7 +1,7 @@
# Aihrus Framework

Tested up to: 4.1.0
Stable tag: 1.2.2
Tested up to: 4.4.0
Stable tag: 1.2.4RC1

A helper library for WordPress plugins by Aihrus and maintained by [Axelerant](//axelerant.com).

Expand Down
20 changes: 3 additions & 17 deletions aihrus-framework.php
Expand Up @@ -35,7 +35,7 @@
}

if ( ! defined( 'AIHR_VERSION' ) ) {
define( 'AIHR_VERSION', '1.2.2' );
define( 'AIHR_VERSION', '1.2.4RC1' );
}

require_once ABSPATH . 'wp-admin/includes/plugin.php';
Expand Down Expand Up @@ -232,22 +232,8 @@ function aihr_notice_updated( $text, $class = 'updated' ) {
}

if ( ! function_exists( 'aihr_notice_version' ) ) {
function aihr_notice_version( $required_base, $required_name, $required_slug, $required_version, $item_name ) {
$is_active = is_plugin_active( $required_base );
if ( $is_active ) {
$link = sprintf( __( '<a href="%1$s">update to</a>' ), self_admin_url( 'update-core.php' ) );
} else {
$plugins = get_plugins();
if ( empty( $plugins[ $required_base ] ) ) {
$install = esc_url( wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $required_slug ), 'install-plugin_' . $required_slug ) );
$link = sprintf( __( '<a href="%1$s">install</a>' ), $install );
} else {
$activate = esc_url( wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=' . $required_base ), 'activate-plugin_' . $required_base ) );
$link = sprintf( __( '<a href="%1$s">activate</a>' ), $activate );
}
}

$text = sprintf( __( 'Plugin "%3$s" has been deactivated. Please %1$s "%4$s" version %2$s or newer before activating "%3$s".' ), $link, $required_version, $item_name, $required_name );
function aihr_notice_version( $required_name, $required_version, $item_name ) {
$text = sprintf( __( 'Plugin "%2$s" has been deactivated. Please install and activate "%3$s" version %1$s or newer before activating "%2$s".' ), $required_version, $item_name, $required_name );

aihr_notice_error( $text );
}
Expand Down
4 changes: 2 additions & 2 deletions includes/class-aihrus-licensing.php
Expand Up @@ -133,7 +133,7 @@ public function get_api_call( $action ) {


public function get_remote_get( $api_call ) {
$response = wp_remote_get( $api_call );
$response = wp_remote_get( $api_call, array( 'sslverify' => false ) );

return $response;
}
Expand All @@ -158,7 +158,7 @@ public function activate_license() {
public function get_license_data( $action = 'check_license' ) {
$api_call = $this->get_api_call( $action );
$response = $this->get_remote_get( $api_call );
if ( is_wp_error( $response ) ) {
if ( empty( $response) || is_wp_error( $response ) ) {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion includes/class-aihrus-widget.php
Expand Up @@ -52,7 +52,7 @@ public function __construct( $classname, $description, $id_base, $title ) {
);

// Create the widget
$this->WP_Widget(
parent::__construct(
static::ID,
$title,
$widget_ops,
Expand Down
10 changes: 8 additions & 2 deletions includes/libraries/parsedown/.travis.yml
@@ -1,10 +1,16 @@
language: php

php:
- 7.0
- 5.6
- 5.5
- 5.4
- 5.3
- 5.2
- hhvm

- hhvm-nightly

matrix:
fast_finish: true
allow_failures:
- php: 7.0
- php: hhvm-nightly

0 comments on commit b95b1df

Please sign in to comment.