SEO Ultimate - Version 7.2.7

Version Description

Download this release

Release Info

Developer JohnLamansky
Plugin Icon 128x128 SEO Ultimate
Version 7.2.7
Comparing to
See all releases

Code changes from version 7.2.6 to 7.2.7

Files changed (5) hide show
  1. modules/canonical/canonical.php +26 -15
  2. plugin/class.seo-ultimate.php +2 -2
  3. readme.txt +5 -1
  4. seo-ultimate.php +4 -4
  5. translations/seo-ultimate.pot +39 -13
modules/canonical/canonical.php CHANGED
@@ -15,6 +15,8 @@ class SU_Canonical extends SU_Module {
15
  function get_settings_key() { return 'canonical'; }
16
 
17
  function init() {
 
 
18
  //If the canonical tags are enabled, then...
19
  if ($this->get_setting('link_rel_canonical')) {
20
 
@@ -36,11 +38,17 @@ class SU_Canonical extends SU_Module {
36
  function admin_page_contents() {
37
  $this->child_admin_form_start();
38
  $this->checkboxes(array(
39
- 'link_rel_canonical' => __('Generate <code>&lt;link rel=&quot;canonical&quot; /&gt;</code> meta tags.', 'seo-ultimate')
40
- , 'http_link_rel_canonical' => __('Send <code>rel=&quot;canonical&quot;</code> HTTP headers.', 'seo-ultimate')
41
- , 'remove_nonexistent_pagination' => __('Redirect requests for nonexistent pagination.', 'seo-ultimate')
42
- ));
43
-
 
 
 
 
 
 
44
  $this->child_admin_form_end();
45
  }
46
 
@@ -154,6 +162,10 @@ class SU_Canonical extends SU_Module {
154
  }
155
  }
156
 
 
 
 
 
157
  //Return the canonical URL
158
  return $link;
159
  }
@@ -179,21 +191,20 @@ class SU_Canonical extends SU_Module {
179
  wp_redirect(remove_query_arg('page', $url), 301);
180
  }
181
 
182
- } elseif (is_paged()) {
183
- $num = absint(get_query_var('paged'));
184
- $max = absint($wp_query->max_num_pages);
185
 
186
- if ($max > 0 && ($num == 1 || ($num > 1 && $num > $max))) {
187
-
188
- if ($wp_rewrite->using_permalinks())
189
- wp_redirect(preg_replace('|/page/[0-9]{1,9}/?$|', '/', $url), 301);
190
- else
191
- wp_redirect(remove_query_arg('paged', $url), 301);
192
- }
193
  }
194
  }
195
  }
196
 
 
 
 
 
197
  function add_help_tabs($screen) {
198
 
199
  $screen->add_help_tab(array(
15
  function get_settings_key() { return 'canonical'; }
16
 
17
  function init() {
18
+ add_filter('su_get_setting-canonical-canonical_url_scheme', array(&$this, 'filter_canonical_url_scheme'));
19
+
20
  //If the canonical tags are enabled, then...
21
  if ($this->get_setting('link_rel_canonical')) {
22
 
38
  function admin_page_contents() {
39
  $this->child_admin_form_start();
40
  $this->checkboxes(array(
41
+ 'link_rel_canonical' => __('Generate <code>&lt;link rel=&quot;canonical&quot; /&gt;</code> meta tags', 'seo-ultimate')
42
+ , 'http_link_rel_canonical' => __('Send <code>rel=&quot;canonical&quot;</code> HTTP headers', 'seo-ultimate')
43
+ ), __('Canonical URL Generation', 'seo-ultimate'));
44
+ $this->radiobuttons('canonical_url_scheme', array(
45
+ '' => __('Use <code>http://</code> or <code>https://</code> depending on how the visitor accessed the page', 'seo-ultimate')
46
+ , 'http' => __('Make all canonical URLs begin with <code>http://</code>', 'seo-ultimate')
47
+ , 'https' => __('Make all canonical URLs begin with <code>https://</code>', 'seo-ultimate')
48
+ ), __('Canonical URL Scheme', 'seo-ultimate'));
49
+ $this->checkboxes(array(
50
+ 'remove_nonexistent_pagination' => __('Redirect requests for nonexistent pagination', 'seo-ultimate')
51
+ ), __('Automated 301 Redirects', 'seo-ultimate'));
52
  $this->child_admin_form_end();
53
  }
54
 
162
  }
163
  }
164
 
165
+ //Handle protocol change
166
+ if ($scheme = $this->get_setting('canonical_url_scheme', 'http'))
167
+ $link = preg_replace('@^https?://@', "$scheme://", $link);
168
+
169
  //Return the canonical URL
170
  return $link;
171
  }
191
  wp_redirect(remove_query_arg('page', $url), 301);
192
  }
193
 
194
+ } elseif (is_404() && $num = absint(get_query_var('paged'))) {
 
 
195
 
196
+ if ($wp_rewrite->using_permalinks())
197
+ wp_redirect(preg_replace('|/page/[0-9]{1,9}/?$|', '/', $url), 301);
198
+ else
199
+ wp_redirect(remove_query_arg('paged', $url), 301);
 
 
 
200
  }
201
  }
202
  }
203
 
204
+ function filter_canonical_url_scheme($scheme) {
205
+ return sustr::preg_filter('a-z', $scheme);
206
+ }
207
+
208
  function add_help_tabs($screen) {
209
 
210
  $screen->add_help_tab(array(
plugin/class.seo-ultimate.php CHANGED
@@ -1230,7 +1230,7 @@ class SEO_Ultimate {
1230
  );
1231
 
1232
  $change_labels = array(
1233
- 'module' => array(__('new module', 'seo-ultimate'), __('new modules', 'seo-ultimate'))
1234
  , 'feature' => array(__('new feature', 'seo-ultimate'), __('new features', 'seo-ultimate'))
1235
  , 'bugfix' => array(__('bugfix', 'seo-ultimate'), __('bugfixes', 'seo-ultimate'))
1236
  , 'improvement' => array(__('improvement', 'seo-ultimate'), __('improvements', 'seo-ultimate'))
@@ -1239,7 +1239,7 @@ class SEO_Ultimate {
1239
  , 'updated-lang'=> array(__('language pack update', 'seo-ultimate'), __('language pack updates', 'seo-ultimate'))
1240
  );
1241
 
1242
- $changes = array();
1243
 
1244
  $versions = $this->download_changelog();
1245
  if (!is_array($versions) || !count($versions)) return '';
1230
  );
1231
 
1232
  $change_labels = array(
1233
+ 'module' => array(__('new module', 'seo-ultimate'), __('new modules', 'seo-ultimate'))
1234
  , 'feature' => array(__('new feature', 'seo-ultimate'), __('new features', 'seo-ultimate'))
1235
  , 'bugfix' => array(__('bugfix', 'seo-ultimate'), __('bugfixes', 'seo-ultimate'))
1236
  , 'improvement' => array(__('improvement', 'seo-ultimate'), __('improvements', 'seo-ultimate'))
1239
  , 'updated-lang'=> array(__('language pack update', 'seo-ultimate'), __('language pack updates', 'seo-ultimate'))
1240
  );
1241
 
1242
+ $changes = array_fill_keys($change_types, 0);
1243
 
1244
  $versions = $this->download_changelog();
1245
  if (!is_array($versions) || !count($versions)) return '';
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: SEO Design Solutions, JohnLamansky
3
  Tags: seo, SEO Ultimate, suite, google, yahoo, bing, search engines, admin, post, page, custom post types, categories, tags, terms, custom taxonomies, base, title, title tag, wp_title, meta, robots, noindex, nofollow, canonical, HTTP headers, 404, robots.txt, htaccess, slugs, url, anchor, more, link, excerpt, permalink, links, autolinks, code, footer, settings, redirect, 301, 302, 307, modules, uninstallable, reinstallable, downgradable, import, export, CSV, affiliate
4
  Requires at least: 3.3
5
  Tested up to: 3.4.1
6
- Stable tag: 7.2.6
7
 
8
  This all-in-one SEO plugin gives you control over title tags, noindex, meta tags, slugs, canonical, autolinks, 404 errors, rich snippets, and more.
9
 
@@ -259,6 +259,10 @@ Frequently asked questions, settings help, and troubleshooting tips for SEO Ulti
259
 
260
  == Changelog ==
261
 
 
 
 
 
262
  = Version 7.2.6 (July 3, 2012) =
263
  * Improvement: Updated the Webmaster Verification Assistant interface to further clarify its functionality
264
  * Security Fix: Webmaster Verification Assistant no longer allows users without the unfiltered_html capability to insert arbitrary `<meta>` tags (and, theoretically, other HTML)
3
  Tags: seo, SEO Ultimate, suite, google, yahoo, bing, search engines, admin, post, page, custom post types, categories, tags, terms, custom taxonomies, base, title, title tag, wp_title, meta, robots, noindex, nofollow, canonical, HTTP headers, 404, robots.txt, htaccess, slugs, url, anchor, more, link, excerpt, permalink, links, autolinks, code, footer, settings, redirect, 301, 302, 307, modules, uninstallable, reinstallable, downgradable, import, export, CSV, affiliate
4
  Requires at least: 3.3
5
  Tested up to: 3.4.1
6
+ Stable tag: 7.2.7
7
 
8
  This all-in-one SEO plugin gives you control over title tags, noindex, meta tags, slugs, canonical, autolinks, 404 errors, rich snippets, and more.
9
 
259
 
260
  == Changelog ==
261
 
262
+ = Version 7.2.7 (July 5, 2012) =
263
+ * Feature: Canonicalizer now lets you force a URL scheme (`http://` or `https://`) across all canonical URLs
264
+ * Bugfix: Canonicalizer's "Redirect requests for nonexistent pagination" once again works for archive pages
265
+
266
  = Version 7.2.6 (July 3, 2012) =
267
  * Improvement: Updated the Webmaster Verification Assistant interface to further clarify its functionality
268
  * Security Fix: Webmaster Verification Assistant no longer allows users without the unfiltered_html capability to insert arbitrary `<meta>` tags (and, theoretically, other HTML)
seo-ultimate.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: SEO Ultimate
4
  Plugin URI: http://www.seodesignsolutions.com/wordpress-seo/
5
  Description: This all-in-one SEO plugin gives you control over title tags, noindex/nofollow, meta tags, rich snippets, slugs, canonical tags, autolinks, 404 errors, rich snippets, and more.
6
- Version: 7.2.6
7
  Author: SEO Design Solutions
8
  Author URI: http://www.seodesignsolutions.com/
9
  Text Domain: seo-ultimate
@@ -12,7 +12,7 @@ Text Domain: seo-ultimate
12
  /**
13
  * The main SEO Ultimate plugin file.
14
  * @package SeoUltimate
15
- * @version 7.2.6
16
  * @link http://www.seodesignsolutions.com/wordpress-seo/ SEO Ultimate Homepage
17
  */
18
 
@@ -47,10 +47,10 @@ define('SU_MINIMUM_WP_VER', '3.1.3');
47
  //Reading plugin info from constants is faster than trying to parse it from the header above.
48
  define('SU_PLUGIN_NAME', 'SEO Ultimate');
49
  define('SU_PLUGIN_URI', 'http://www.seodesignsolutions.com/wordpress-seo/');
50
- define('SU_VERSION', '7.2.6');
51
  define('SU_AUTHOR', 'SEO Design Solutions');
52
  define('SU_AUTHOR_URI', 'http://www.seodesignsolutions.com/');
53
- define('SU_USER_AGENT', 'SeoUltimate/7.2.6');
54
 
55
  /********** INCLUDES **********/
56
 
3
  Plugin Name: SEO Ultimate
4
  Plugin URI: http://www.seodesignsolutions.com/wordpress-seo/
5
  Description: This all-in-one SEO plugin gives you control over title tags, noindex/nofollow, meta tags, rich snippets, slugs, canonical tags, autolinks, 404 errors, rich snippets, and more.
6
+ Version: 7.2.7
7
  Author: SEO Design Solutions
8
  Author URI: http://www.seodesignsolutions.com/
9
  Text Domain: seo-ultimate
12
  /**
13
  * The main SEO Ultimate plugin file.
14
  * @package SeoUltimate
15
+ * @version 7.2.7
16
  * @link http://www.seodesignsolutions.com/wordpress-seo/ SEO Ultimate Homepage
17
  */
18
 
47
  //Reading plugin info from constants is faster than trying to parse it from the header above.
48
  define('SU_PLUGIN_NAME', 'SEO Ultimate');
49
  define('SU_PLUGIN_URI', 'http://www.seodesignsolutions.com/wordpress-seo/');
50
+ define('SU_VERSION', '7.2.7');
51
  define('SU_AUTHOR', 'SEO Design Solutions');
52
  define('SU_AUTHOR_URI', 'http://www.seodesignsolutions.com/');
53
+ define('SU_USER_AGENT', 'SeoUltimate/7.2.7');
54
 
55
  /********** INCLUDES **********/
56
 
translations/seo-ultimate.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the SEO Ultimate package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: SEO Ultimate 7.2.6\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/seo-ultimate\n"
7
- "POT-Creation-Date: 2012-07-03 18:47:01+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -205,7 +205,7 @@ msgstr ""
205
  msgid "404 Monitor"
206
  msgstr ""
207
 
208
- #: modules/404s/fofs.php:19 modules/canonical/canonical.php:201
209
  #: modules/files/files.php:144 modules/link-nofollow/link-nofollow.php:130
210
  #: modules/linkbox/linkbox.php:91 modules/meta/meta-descriptions.php:180
211
  #: modules/meta/meta-keywords.php:172 modules/meta/meta-robots.php:53
@@ -563,24 +563,50 @@ msgstr ""
563
  msgid "Negative match"
564
  msgstr ""
565
 
566
- #: modules/canonical/canonical.php:12 modules/canonical/canonical.php:201
567
  msgid "Canonicalizer"
568
  msgstr ""
569
 
570
- #: modules/canonical/canonical.php:39
571
  msgid ""
572
- "Generate <code>&lt;link rel=&quot;canonical&quot; /&gt;</code> meta tags."
573
  msgstr ""
574
 
575
- #: modules/canonical/canonical.php:40
576
- msgid "Send <code>rel=&quot;canonical&quot;</code> HTTP headers."
577
  msgstr ""
578
 
579
- #: modules/canonical/canonical.php:41
580
- msgid "Redirect requests for nonexistent pagination."
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
581
  msgstr ""
582
 
583
- #: modules/canonical/canonical.php:202
584
  msgid ""
585
  "\r\n"
586
  "<ul>\r\n"
@@ -2107,7 +2133,7 @@ msgstr ""
2107
  msgid "SEO Design Solutions Whitepapers"
2108
  msgstr ""
2109
 
2110
- #. #-#-#-#-# plugin.pot (SEO Ultimate 7.2.6) #-#-#-#-#
2111
  #. Author of the plugin/theme
2112
  #: modules/sds-blog/sds-blog.php:49
2113
  msgid "SEO Design Solutions"
@@ -2427,7 +2453,7 @@ msgstr ""
2427
  msgid "SEO Ultimate Plugin Settings"
2428
  msgstr ""
2429
 
2430
- #. #-#-#-#-# plugin.pot (SEO Ultimate 7.2.6) #-#-#-#-#
2431
  #. Plugin Name of the plugin/theme
2432
  #: modules/settings/settings.php:26 plugin/class.seo-ultimate.php:851
2433
  msgid "SEO Ultimate"
2
  # This file is distributed under the same license as the SEO Ultimate package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: SEO Ultimate 7.2.7\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/seo-ultimate\n"
7
+ "POT-Creation-Date: 2012-07-05 15:00:49+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
205
  msgid "404 Monitor"
206
  msgstr ""
207
 
208
+ #: modules/404s/fofs.php:19 modules/canonical/canonical.php:212
209
  #: modules/files/files.php:144 modules/link-nofollow/link-nofollow.php:130
210
  #: modules/linkbox/linkbox.php:91 modules/meta/meta-descriptions.php:180
211
  #: modules/meta/meta-keywords.php:172 modules/meta/meta-robots.php:53
563
  msgid "Negative match"
564
  msgstr ""
565
 
566
+ #: modules/canonical/canonical.php:12 modules/canonical/canonical.php:212
567
  msgid "Canonicalizer"
568
  msgstr ""
569
 
570
+ #: modules/canonical/canonical.php:41
571
  msgid ""
572
+ "Generate <code>&lt;link rel=&quot;canonical&quot; /&gt;</code> meta tags"
573
  msgstr ""
574
 
575
+ #: modules/canonical/canonical.php:42
576
+ msgid "Send <code>rel=&quot;canonical&quot;</code> HTTP headers"
577
  msgstr ""
578
 
579
+ #: modules/canonical/canonical.php:43
580
+ msgid "Canonical URL Generation"
581
+ msgstr ""
582
+
583
+ #: modules/canonical/canonical.php:45
584
+ msgid ""
585
+ "Use <code>http://</code> or <code>https://</code> depending on how the "
586
+ "visitor accessed the page"
587
+ msgstr ""
588
+
589
+ #: modules/canonical/canonical.php:46
590
+ msgid "Make all canonical URLs begin with <code>http://</code>"
591
+ msgstr ""
592
+
593
+ #: modules/canonical/canonical.php:47
594
+ msgid "Make all canonical URLs begin with <code>https://</code>"
595
+ msgstr ""
596
+
597
+ #: modules/canonical/canonical.php:48
598
+ msgid "Canonical URL Scheme"
599
+ msgstr ""
600
+
601
+ #: modules/canonical/canonical.php:50
602
+ msgid "Redirect requests for nonexistent pagination"
603
+ msgstr ""
604
+
605
+ #: modules/canonical/canonical.php:51
606
+ msgid "Automated 301 Redirects"
607
  msgstr ""
608
 
609
+ #: modules/canonical/canonical.php:213
610
  msgid ""
611
  "\r\n"
612
  "<ul>\r\n"
2133
  msgid "SEO Design Solutions Whitepapers"
2134
  msgstr ""
2135
 
2136
+ #. #-#-#-#-# plugin.pot (SEO Ultimate 7.2.7) #-#-#-#-#
2137
  #. Author of the plugin/theme
2138
  #: modules/sds-blog/sds-blog.php:49
2139
  msgid "SEO Design Solutions"
2453
  msgid "SEO Ultimate Plugin Settings"
2454
  msgstr ""
2455
 
2456
+ #. #-#-#-#-# plugin.pot (SEO Ultimate 7.2.7) #-#-#-#-#
2457
  #. Plugin Name of the plugin/theme
2458
  #: modules/settings/settings.php:26 plugin/class.seo-ultimate.php:851
2459
  msgid "SEO Ultimate"