= 1.0.6 =

* Fix: Url to widget section leads to 127.0.0.1 = 1.0.5 = * Fix: Check if Quick AdSense is installed is throwing error message when it is not installed. * New: Show a  Quicktag button in the html editor. Necessary to hide ads on not defined post_types like woocommerce product pages * Tweak: Tested up to WP 4.5 * Tweak: Change author name to Rene Hermenau
lwesolowski · Feb 24, 2016 · 6042e5c · 6042e5c
1 parent d22357d
commit 6042e5c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 26 deletions.
diff --git a/includes/admin/settings/register-settings.php b/includes/admin/settings/register-settings.php
@@ -259,7 +259,7 @@ function quads_get_registered_settings() {
                                 'widget_header' => array(
 					'id' => 'widget_header',
 					'name' => '<strong>' . __( 'Widgets Code', 'quick-adsense-reloaded' ) . '</strong>',
-					'desc' => sprintf( __( 'Every code block creates an unique ad widget in the <a href="%1$s" target="_self">widget section</a> of WordPress', 'quick-adsense-reloaded' ) , 'http://127.0.0.1/dev/wp-admin/widgets.php'),
+					'desc' => sprintf( __( 'Every code block creates an unique ad widget in the <a href="%1$s" target="_self">widget section</a> of WordPress', 'quick-adsense-reloaded' ) , admin_url() . 'wp-admin/widgets.php'),
 					'type' => 'header'
 				),
                                 'ad1_widget' => array(
@@ -1462,23 +1462,6 @@ function quads_adsense_code_callback($args){
         echo $html;
 }
 
-
-
-/**
- * Check if Quick AdSense is installed and active
- * 
- * 
- * @return boolean true when it is installed
- */
-function quads_check_quick_adsense_status(){
-    $plugin_file = 'quick-adsense/quick-adsense.php';
-    $plugin_abs_path = get_home_path() . '/wp-content/plugins/quick-adsense/quick-adsense.php';
-
-     if ( is_plugin_active( $plugin_file ) ) {
-            return true;   
-    } 
-}
-
 /**
  * 
  * Return array of alignment options

diff --git a/includes/admin/tools.php b/includes/admin/tools.php
@@ -545,12 +545,20 @@ function quads_check_quick_adsense_version(){
     $plugin_abs_path = get_home_path() . '/wp-content/plugins/quick-adsense/quick-adsense.php';
     $checkVersion = '1.9.2';
 
-     if ( is_plugin_active( $plugin_file ) || is_plugin_inactive ($plugin_file) ) {
+    if ( is_plugin_active( $plugin_file ) ) {
         $plugin_data = get_plugin_data( $plugin_abs_path, $markup = true, $translate = true );
 
         if ($plugin_data['Version'] === $checkVersion)
             return true;   
-    } 
+    }
+
+    if ( is_plugin_inactive( $plugin_file ) ) {
+        $plugin_data = get_plugin_data( $plugin_abs_path, $markup = true, $translate = true );
+
+        if ($plugin_data['Version'] === $checkVersion)
+            return true;   
+    }
+
 }
 
 /**

diff --git a/includes/scripts.php b/includes/scripts.php
@@ -94,7 +94,10 @@ function quads_ads_head_script() {
 				edButtons[edButtons.length]=new edButton("random_ads","RndAds","\n<!--RndAds-->\n","","",-1);
 				edaddID[edaddID.length] = "random_ads";
 				edaddNm[edaddNm.length] = "RndAds";
-			<?php } ?>	
+			<?php } ?>
+                                edButtons[edButtons.length]=new edButton("no_ads","NoAds","\n<!--NoAds-->\n","","",-1);
+				edaddID[edaddID.length] = "no_ads";
+				edaddNm[edaddNm.length] = "NoAds";
 			<?php //if( !isset( $quads_options['quicktags']['QckOffs'] ) ){ ?>
 				//edButtons[edButtons.length]=new edButton("no_ads","NoAds","\n<!--NoAds-->\n","","",-1);
 				//edaddID[edaddID.length] = "no_ads";

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quick-adsense-reloaded",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-contrib-clean": "~0.6.0",

diff --git a/quick-adsense-reloaded.php b/quick-adsense-reloaded.php
@@ -5,7 +5,7 @@
  * Description: Insert Google AdSense or any Ads code into your website. A fork of Quick AdSense
  * Author: Rene Hermenau, WP-Staging
  * Author URI: https://wordpress.org/plugins/quick-adsense-reloaded/
- * Version: 1.0.4
+ * Version: 1.0.6
  * Text Domain: quick-adsense-reloaded
  * Domain Path: languages
  * Credits: WP QUADS - Quick AdSense Reloaded is a fork of Quick AdSense
@@ -34,7 +34,7 @@
 
 // Plugin version
 if (!defined('QUADS_VERSION')) {
-    define('QUADS_VERSION', '1.0.4');
+    define('QUADS_VERSION', '1.0.6');
 }
 
 // Define some globals

diff --git a/readme.txt b/readme.txt
@@ -9,7 +9,7 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: advertising, ads, adsense, google, google adsense, posts, post, page, sidebar, shortcode, admin, plugin 
 Requires at least: 3.6+
 Tested up to: 4.5
-Stable tag: 1.0.4
+Stable tag: 1.0.6
 
 Quick Adsense Reloaded! The quickest way to insert Google AdSense and other ads code into your website.
 
@@ -111,7 +111,12 @@ Alternative Installation:
 
 == Changelog == 
 
-= 1.0.5 not released =
+= 1.0.6 =
+* Fix: Url to widget section leads to 127.0.0.1
+
+= 1.0.5 =
+* Fix: Check if Quick AdSense is installed is throwing error message when it is not installed.
+* New: Show a <!--NoAds--> Quicktag button in the html editor. Necessary to hide ads on not defined post_types like woocommerce product pages
 * Tweak: Tested up to WP 4.5
 * Tweak: Change author name to Rene Hermenau