Permalink
Browse files

r3258@asus: jeremy | 2005-11-21 00:33:59 -0800

 Apply [3139] to stable.  Use Kernel.binding rather than binding to allow columns of that name.  Closes #2973.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3140 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 4a9847f commit 81f3a923d75b9fe51921d35e930a8351f4b9c777 @jeremy jeremy committed Nov 21, 2005
@@ -1,5 +1,7 @@
*SVN*
+* Use Kernel.binding rather than binding to allow columns of that name. #2973 [arc@uchicago.edu]
+
* Add tasks to create, drop and rebuild the MySQL and PostgreSQL test databases. [Marcel Molina Jr.]
* Correct boolean handling in generated reader methods. #2945 [don.park@gmail.com, Stefan Kaes]
@@ -332,7 +332,7 @@ def callback(method)
when Symbol
self.send(callback)
when String
- eval(callback, binding)
+ eval(callback, Kernel.binding)
when Proc, Method
callback.call(self)
else
@@ -254,7 +254,7 @@ def condition_block?(condition)
def evaluate_condition(condition, record)
case condition
when Symbol: record.send(condition)
- when String: eval(condition, binding)
+ when String: eval(condition, Kernel.binding)
else
if condition_block?(condition)
condition.call(record)
@@ -757,7 +757,7 @@ def run_validations(validation_method)
if validation.is_a?(Symbol)
self.send(validation)
elsif validation.is_a?(String)
- eval(validation, binding)
+ eval(validation, Kernel.binding)
elsif validation_block?(validation)
validation.call(self)
elsif validation_class?(validation, validation_method)

0 comments on commit 81f3a92

Please sign in to comment.