Navigation

Changeset 201

Timestamp:

12/17/04 00:25:32 (4 years ago)

Author:

david

Message:

Fixed a bug that would cause an ApplicationController to require itself three times and hence cause filters to be run three times [evl]

Files:

r198	r201
	1	1.0.1
	2
	3	* Fixed a bug that would cause an ApplicationController to require itself three times and hence cause filters to be run three times [evl]
	4
	5
1	6	1.0
2	7

r194	r201
33	33	# end
34	34	#
35		# Please note that a controller like ApplicationController will automatically attempt to require_dependency on a model of its name and a helper
36		# of its name. If nothing is found, no error is raised. This is especially useful for concrete controllers like PostController:
	35	# Please note that a controller like ApplicationController will automatically attempt to require_dependency on a model of its
	36	# singuralized name and a helper of its name. If nothing is found, no error is raised. This is especially useful for concrete
	37	# controllers like PostController:
37	38	#
38	39	# class PostController < ApplicationController
…	…
95	96	def inherited(child)
96	97	inherited_without_model(child)
	98	return if child.controller_name == "application" # otherwise the ApplicationController in Rails will include itself
97	99	begin
98		~~child.model(child.controller_name)~~
99	100	child.model(Inflector.singularize(child.controller_name))
100	101	rescue LoadError

r198	r201
9	9	PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
10	10	PKG_NAME = 'actionpack'
11		PKG_VERSION = '1.0.0' + PKG_BUILD
	11	PKG_VERSION = '1.0.1' + PKG_BUILD
12	12	PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
13	13