Content Egg - Version 1.6.1

Version Description

  • Fix: Error in uninstallation process.
Download this release

Release Info

Developer keywordrush
Plugin Icon 128x128 Content Egg
Version 1.6.1
Comparing to
See all releases

Code changes from version 1.6.0 to 1.6.1

Files changed (5) hide show
  1. application/Installer.php +12 -10
  2. application/Plugin.php +1 -1
  3. application/admin/PluginAdmin.php +1 -1
  4. content-egg.php +1 -1
  5. readme.txt +5 -2
application/Installer.php CHANGED
@@ -3,7 +3,7 @@
3
  namespace ContentEgg\application;
4
 
5
  use ContentEgg\application\Plugin;
6
- use ContentEgg\application\Autoupdate;
7
 
8
  /**
9
  * Installer class file
@@ -37,7 +37,7 @@ class Installer {
37
 
38
  \add_action('admin_init', array($this, 'upgrade'));
39
  \add_action('admin_init', array($this, 'redirect_after_activation'));
40
- }
41
 
42
  static public function dbVesrion()
43
  {
@@ -48,9 +48,9 @@ class Installer {
48
  {
49
  if (!\current_user_can('activate_plugins'))
50
  return;
51
-
52
- self::requirements();
53
-
54
  \add_option(Plugin::slug . '_do_activation_redirect', true);
55
  self::upgrade_tables();
56
  }
@@ -87,14 +87,14 @@ class Installer {
87
  if (!$errors)
88
  return;
89
  unset($_GET['activate']);
90
- deactivate_plugins(plugin_basename(\ContentEgg\PLUGIN_FILE));
91
  $e = sprintf('<div class="error"><p>%1$s</p><p><em>%2$s</em> ' . __('не может быть установлен!', 'content-egg') . '</p></div>', join('</p><p>', $errors), $name[0]);
92
- wp_die($e);
93
  }
94
 
95
  private static function upgrade_tables()
96
  {
97
- update_option(Plugin::slug . '_db_version', self::dbVesrion());
98
  }
99
 
100
  public static function uninstall()
@@ -103,8 +103,9 @@ class Installer {
103
  if (!current_user_can('activate_plugins'))
104
  return;
105
 
106
- delete_option(Plugin::slug . '_db_version');
107
- delete_option(LicConfig::getInstance()->option_name());
 
108
  }
109
 
110
  public static function upgrade()
@@ -123,4 +124,5 @@ class Installer {
123
  \wp_redirect(\get_admin_url(\get_current_blog_id(), 'admin.php?page=' . Plugin::slug));
124
  }
125
  }
 
126
  }
3
  namespace ContentEgg\application;
4
 
5
  use ContentEgg\application\Plugin;
6
+ use ContentEgg\application\admin\LicConfig;
7
 
8
  /**
9
  * Installer class file
37
 
38
  \add_action('admin_init', array($this, 'upgrade'));
39
  \add_action('admin_init', array($this, 'redirect_after_activation'));
40
+ }
41
 
42
  static public function dbVesrion()
43
  {
48
  {
49
  if (!\current_user_can('activate_plugins'))
50
  return;
51
+
52
+ self::requirements();
53
+
54
  \add_option(Plugin::slug . '_do_activation_redirect', true);
55
  self::upgrade_tables();
56
  }
87
  if (!$errors)
88
  return;
89
  unset($_GET['activate']);
90
+ \deactivate_plugins(\plugin_basename(\ContentEgg\PLUGIN_FILE));
91
  $e = sprintf('<div class="error"><p>%1$s</p><p><em>%2$s</em> ' . __('не может быть установлен!', 'content-egg') . '</p></div>', join('</p><p>', $errors), $name[0]);
92
+ \wp_die($e);
93
  }
94
 
95
  private static function upgrade_tables()
96
  {
97
+ \update_option(Plugin::slug . '_db_version', self::dbVesrion());
98
  }
99
 
100
  public static function uninstall()
103
  if (!current_user_can('activate_plugins'))
104
  return;
105
 
106
+ \delete_option(Plugin::slug . '_db_version');
107
+ if (Plugin::isPro())
108
+ \delete_option(LicConfig::getInstance()->option_name());
109
  }
110
 
111
  public static function upgrade()
124
  \wp_redirect(\get_admin_url(\get_current_blog_id(), 'admin.php?page=' . Plugin::slug));
125
  }
126
  }
127
+
128
  }
application/Plugin.php CHANGED
@@ -13,7 +13,7 @@ use ContentEgg\application\admin\GeneralConfig;
13
  */
14
  class Plugin {
15
 
16
- const version = '1.6.0';
17
  const wp_requires = '4.2.2';
18
  const slug = 'content-egg';
19
  const api_base = 'http://www.keywordrush.com/api/v1';
13
  */
14
  class Plugin {
15
 
16
+ const version = '1.6.1';
17
  const wp_requires = '4.2.2';
18
  const slug = 'content-egg';
19
  const api_base = 'http://www.keywordrush.com/api/v1';
application/admin/PluginAdmin.php CHANGED
@@ -61,7 +61,7 @@ class PluginAdmin {
61
 
62
  public function add_plugin_row_meta(array $links, $file)
63
  {
64
- if ($file == plugin_basename(\ContentEgg\PLUGIN_FILE) && LicConfig::getInstance()->option('license_key'))
65
  {
66
  return array_merge(
67
  $links, array(
61
 
62
  public function add_plugin_row_meta(array $links, $file)
63
  {
64
+ if ($file == plugin_basename(\ContentEgg\PLUGIN_FILE) && (Plugin::isActivated() || Plugin::isFree()))
65
  {
66
  return array_merge(
67
  $links, array(
content-egg.php CHANGED
@@ -6,7 +6,7 @@ namespace ContentEgg;
6
  Plugin Name: Content Egg
7
  Plugin URI: http://www.keywordrush.com/contentegg
8
  Description: Plugin for adding additional content for your posts. Let you to earn money from affiliate programs.
9
- Version: 1.6.0
10
  Author: keywordrush.com
11
  Author URI: http://www.keywordrush.com
12
  Text Domain: content-egg
6
  Plugin Name: Content Egg
7
  Plugin URI: http://www.keywordrush.com/contentegg
8
  Description: Plugin for adding additional content for your posts. Let you to earn money from affiliate programs.
9
+ Version: 1.6.1
10
  Author: keywordrush.com
11
  Author URI: http://www.keywordrush.com
12
  Text Domain: content-egg
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: keywordrush
3
  Tags: content, affiliate, amazon, flickr, youtube, images, wikipedia, freebase, autoblogging, ecommerce, links, shortcode, monetize, search engine optimization, moneymaking, price comparison, google images, timesaving
4
  Requires at least: 4.2.2
5
  Tested up to: 4.3
6
- Stable tag: 1.6.0
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -20,7 +20,7 @@ Good news, we solved this problem for our projects and we want to offer you the
20
  > <strong>PRO version</strong><br>
21
  >Do you want to get even more? Pro version offers tons of additional modules and extended functions.
22
  >
23
- >Modules of free version: Amazon, Google images, Youtube, Freebase.
24
  >
25
  >Additional modules of PRO version: Ebay, Zanox, Aliexpress, Flickr, Bing images, Google books, Google News, Twitter, Vk news, Yandex Market.
26
  >
@@ -104,5 +104,8 @@ If you can do any Wordpress page templates – you can do also templates for Con
104
 
105
  == Changelog ==
106
 
 
 
 
107
  = 1.6.0 =
108
  * Initial release.
3
  Tags: content, affiliate, amazon, flickr, youtube, images, wikipedia, freebase, autoblogging, ecommerce, links, shortcode, monetize, search engine optimization, moneymaking, price comparison, google images, timesaving
4
  Requires at least: 4.2.2
5
  Tested up to: 4.3
6
+ Stable tag: 1.6.1
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
20
  > <strong>PRO version</strong><br>
21
  >Do you want to get even more? Pro version offers tons of additional modules and extended functions.
22
  >
23
+ >Modules of free version: Amazon, Google Images, Youtube, Freebase.
24
  >
25
  >Additional modules of PRO version: Ebay, Zanox, Aliexpress, Flickr, Bing images, Google books, Google News, Twitter, Vk news, Yandex Market.
26
  >
104
 
105
  == Changelog ==
106
 
107
+ = 1.6.1 =
108
+ * Fix: Error in uninstallation process.
109
+
110
  = 1.6.0 =
111
  * Initial release.