Skip to content

Commit

Permalink
Merge branch 'release/1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Hemberger committed May 31, 2018
2 parents c532662 + 12b298e commit 451112e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
1 change: 1 addition & 0 deletions assets/css/wampum-protected-media.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
--------------------------------------------- */

#wpm-list {
clear: both;
border: 1px solid rgba(0,0,0,0.05);
border-radius: 4px;
overflow: hidden;
Expand Down
26 changes: 14 additions & 12 deletions wampum-protected-media.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Wampum - Protected Media
* Plugin URI: https://bizbudding.com
* Description: Attach PDFs to pages/posts/cpts that can only be viewed from the pages they are attached to (via PDF.js). Requires Genesis for file display and ACF Pro for the files metabox.
* Version: 1.1.1
* Version: 1.1.2
*
* Author: Mike Hemberger, BizBudding
* Author URI: https://bizbudding.com
Expand Down Expand Up @@ -98,7 +98,7 @@ private function setup_constants() {

// Plugin version.
if ( ! defined( 'WAMPUM_PROTECTED_MEDIA_VERSION' ) ) {
define( 'WAMPUM_PROTECTED_MEDIA_VERSION', '1.1.1' );
define( 'WAMPUM_PROTECTED_MEDIA_VERSION', '1.1.2' );
}

// Plugin Folder Path.
Expand Down Expand Up @@ -160,17 +160,19 @@ public function filters() {
}

public function updater() {
/**
* Setup the updater.
*
* @uses https://github.com/YahnisElsts/plugin-update-checker/
*
* @return void
*/
if ( ! class_exists( 'Puc_v4_Factory' ) ) {
require_once MAI_FAVORITES_PLUGIN_DIR . 'plugin-update-checker/plugin-update-checker.php';
if ( is_admin() ) {
/**
* Setup the updater.
*
* @uses https://github.com/YahnisElsts/plugin-update-checker/
*
* @return void
*/
if ( ! class_exists( 'Puc_v4_Factory' ) ) {
require_once MAI_FAVORITES_PLUGIN_DIR . 'plugin-update-checker/plugin-update-checker.php';
}
$updater = Puc_v4_Factory::buildUpdateChecker( 'https://github.com/bizbudding/wampum-protected-media/', __FILE__, 'wampum-protected-media' );
}
$updater = Puc_v4_Factory::buildUpdateChecker( 'https://github.com/bizbudding/wampum-protected-media/', __FILE__, 'wampum-protected-media' );
}

/**
Expand Down

0 comments on commit 451112e

Please sign in to comment.