<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -10,8 +10,17 @@ module Merb
       #
       # ==== Alternatives
       # If name is a hash, it will be merged with params.
-      def url(name, params={})
-        Merb::Router.generate(name, params)
+      def url(name, *args)
+        unless Symbol === name
+          args.unshift(name)
+          name = :default
+        end
+        
+        unless route = Merb::Router.named_routes[name]
+          raise Merb::Router::GenerationError, &quot;Named route not found: #{name}&quot;
+        end
+        
+        route.generate(args)
       end
 
       # Reloads classes using Merb::BootLoader::ReloadClasses.</diff>
      <filename>lib/merb-core/rack/adapter/irb.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>a0fd9e391b2b705c1aea60d9a192de0de7e6e348</id>
    </parent>
  </parents>
  <author>
    <name>Foy Savas</name>
    <email>foysavas@gmail.com</email>
  </author>
  <url>http://github.com/foysavas/merb-core/commit/a8fa88d465c9d049f9d7f6a580c520f5caa4fd3f</url>
  <id>a8fa88d465c9d049f9d7f6a580c520f5caa4fd3f</id>
  <committed-date>2008-09-27T18:41:21-07:00</committed-date>
  <authored-date>2008-09-27T18:41:21-07:00</authored-date>
  <message>Bring merb.url back into action</message>
  <tree>a2438f19221bf1e2d01463cda69c8ab5a8787c12</tree>
  <committer>
    <name>Foy Savas</name>
    <email>foysavas@gmail.com</email>
  </committer>
</commit>
