0
@@ -1,6 +1,6 @@
0
 * SVN *
0
 
0
-* Allow hyphens as an allowed separator for permalink styles. [Chris Wanstrath]
0
+* RESTRICT hyphens as a possible separator for permalink styles. [Chris Wanstrath]
0
 
0
 * Initial article/asset assignment support.  Perfect for podcasting.  
0
 

0
@@ -212,7 +212,7 @@ class Site < ActiveRecord::Base
0
     def check_permalink_style
0
       permalink_style.sub! /^\//, ''
0
       permalink_style.sub! /\/$/, ''
0
-      pieces = permalink_style.split(Regexp.new('/|-'))
0
+      pieces = permalink_style.split('/')
0
       errors.add :permalink_style, 'cannot have blank paths' if pieces.any?(&:blank?)
0
       pieces.each do |p|
0
         errors.add :permalink_style, "cannot contain '#{p}' variable" unless p.blank? || permalink_variable_format?(p).nil? || permalink_variable?(p)

0
@@ -43,9 +43,9 @@ context "Site Permalink Validations" do
0
     assert_equal "cannot contain ':foo' variable", @site.errors.on(:permalink_style)
0
   end
0
 
0
-  specify "should recongize hyphens as token separators" do
0
+  specify "should not recongize hyphens as token separators" do
0
     @site.permalink_style = ':id-:permalink'
0
-    assert_valid @site
0
+    assert !@site.valid?
0
   end
0
 end
0