refinerycms 0.9.6.24 → 0.9.6.25

data/VERSION

@@ -1 +1 @@
-0.9.6.24
+0.9.6.25

data/config/application.rb

@@ -2,7 +2,7 @@
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Specified gem version of Refinery to use when vendor/plugins/refinery/lib/refinery.rb is not present.
-REFINERY_GEM_VERSION = '0.9.6.24' unless defined? REFINERY_GEM_VERSION
+REFINERY_GEM_VERSION = '0.9.6.25' unless defined? REFINERY_GEM_VERSION
 
 # Boot Rails
 require File.join(File.dirname(__FILE__), 'boot')

data/vendor/plugins/authentication/app/views/admin/users/_form.html.erb

@@ -10,8 +10,8 @@
   </div>
   <div class='field'>
     <%= f.label :password %>
-    <%= f.password_field :password %><br />
-    <span class="preview">Leaving password blank keeps the current password</span>
+    <%= f.password_field :password %>
+    <%= "<br /><span class='preview'>Leaving password blank keeps the current password</span>" unless @user.new_record? %>
   </div>
   <div class='field'>
     <%= f.label :password_confirmation %>

data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb

@@ -36,7 +36,7 @@ protected
     list = []
     page.children.each do |child|
       list << child
-      list += add_pages_branch_to_parents_list if child.children.any?
+      list += add_pages_branch_to_parents_list(child) if child.children.any?
     end
     list
   end

data/vendor/plugins/refinery/lib/refinery/initializer.rb

@@ -22,7 +22,7 @@ module Refinery
       super
 
       # add plugin lib paths to the $LOAD_PATH so that rake tasks etc. can be run when using a gem for refinery or gems for plugins.
-      search_for = Regexp.new(Refinery.root.join("vendor", "plugins", ".+?", "lib"))
+      search_for = Regexp.new(Refinery.root.join("vendor", "plugins", ".+?", "lib").to_s)
 
       # find all the plugin paths
       paths = plugins.collect{ |plugin| plugin.load_paths }.flatten

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 24
-  version: 0.9.6.24
+  - 25
+  version: 0.9.6.25
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 +13:00
+date: 2010-04-02 00:00:00 +13:00
 default_executable: 
 dependencies: []