radiant-archive_tabs-extension 1.0.1 → 1.0.2

data/lib/radiant-archive_tabs-extension/application_helper.rb

@@ -12,8 +12,10 @@ module RadiantArchiveTabsExtension
     end
 
     def current_url_with_archive?(options)
-      if current_object.respond_to?(:parent) && archive_page?(current_object.parent)
-        parent_url = url_for index_page_for_model_with_archive
+      if respond_to?(:current_object) && current_object.respond_to?(:parent) && archive_page?(current_object.parent)
+        # get the index url without pagination variables
+        parent_url = index_page_for_model_with_archive
+        parent_url.delete(:p)
 
         url = case options
         when Hash
@@ -22,7 +24,7 @@ module RadiantArchiveTabsExtension
           options.to_s
         end
 
-        parent_url == clean(url)
+        clean(url_for parent_url) == clean(url)
       else
         current_url_without_archive?(options)
       end

data/lib/radiant-archive_tabs-extension/version.rb

@@ -1,3 +1,3 @@
 module RadiantArchiveTabsExtension
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-archive_tabs-extension
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jason Taylor
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +10:00
+date: 2011-05-28 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -52,7 +52,7 @@ has_rdoc: true
 homepage: http://github.com/jsntv200/radiant-archive_tabs-extension
 licenses: []
 
-post_install_message: "\n  Edit your Radiant environment.rb file and add the following :\n\n  1. Ensure Archive Tabs is loaded last\n\n    config.extensions = [ :all, :archive_tabs ]\n\n  2. Load Archive Tabs by adding the gem\n\n    config.gem 'radiant-archive_tabs-extension', :version => '1.0.1'\n  "
+post_install_message: "\n  Edit your Radiant environment.rb file and add the following :\n\n  1. Ensure Archive Tabs is loaded last\n\n    config.extensions = [ :all, :archive_tabs ]\n\n  2. Load Archive Tabs by adding the gem\n\n    config.gem 'radiant-archive_tabs-extension', :version => '1.0.2'\n  "
 rdoc_options: []
 
 require_paths: