[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit db32cbbd47e62840e6071360ea9f42a659382d28
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 6 05:28:51 2003 +0000

            Reviewed by Don.
    
    	- fixed 3239961 - www.phiffer.com doesn't work; uses "var top; top = n;"
    
            * kjs/nodes.cpp:
            (VarDeclNode::evaluate): Check if the property exists with
    	getDirect() instead of hasProperty().
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4282 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 083b53d..870faba 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2003-05-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Don.
+
+	- fixed 3239961 - www.phiffer.com doesn't work; uses "var top; top = n;"
+	
+        * kjs/nodes.cpp:
+        (VarDeclNode::evaluate): Check if the property exists with
+	getDirect() instead of hasProperty().
+
 === Safari-77 ===
 
 2003-04-29  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 083b53d..870faba 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-05-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Don.
+
+	- fixed 3239961 - www.phiffer.com doesn't work; uses "var top; top = n;"
+	
+        * kjs/nodes.cpp:
+        (VarDeclNode::evaluate): Check if the property exists with
+	getDirect() instead of hasProperty().
+
 === Safari-77 ===
 
 2003-04-29  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index 7b694f8..b31e3cd 100644
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -1606,7 +1606,9 @@ Value VarDeclNode::evaluate(ExecState *exec)
       val = init->evaluate(exec);
       KJS_CHECKEXCEPTIONVALUE
   } else {
-      if ( variable.hasProperty(exec, ident ) ) // already declared ?
+      // already declared? - check with getDirect so you can override
+      // built-in properties of the global object with var declarations.
+      if ( variable.imp()->getDirect(ident) ) 
           return Value();
       val = Undefined();
   }

-- 
WebKit Debian packaging