[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ggaren at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 54b34e0c6a94e4dc9dc4238d0f355621a0607efd
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 00:04:50 2009 +0000

    https://bugs.webkit.org/show_bug.cgi?id=32498
    <rdar://problem/7471495>
    REGRESSION(r51978-r52039): AJAX "Mark This Forum Read" function no longer
    works
    
    Reviewed by Sam "r=me" Weinig.
    
    Fixed a tyop.
    
    * runtime/Operations.h:
    (JSC::jsAdd): Use the '&&' operator, not the ',' operator.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52182 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 283e0dd..8282f82 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,19 @@
 2009-12-15  Geoffrey Garen  <ggaren at apple.com>
 
+        Reviewed by Sam "r=me" Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32498
+        <rdar://problem/7471495>
+        REGRESSION(r51978-r52039): AJAX "Mark This Forum Read" function no longer
+        works
+        
+        Fixed a tyop.
+
+        * runtime/Operations.h:
+        (JSC::jsAdd): Use the '&&' operator, not the ',' operator.
+
+2009-12-15  Geoffrey Garen  <ggaren at apple.com>
+
         Try to fix the windows build: don't export this inlined function.
 
         * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
diff --git a/JavaScriptCore/runtime/Operations.h b/JavaScriptCore/runtime/Operations.h
index a56893c..a5718d3 100644
--- a/JavaScriptCore/runtime/Operations.h
+++ b/JavaScriptCore/runtime/Operations.h
@@ -326,7 +326,7 @@ namespace JSC {
     ALWAYS_INLINE JSValue jsAdd(CallFrame* callFrame, JSValue v1, JSValue v2)
     {
         double left = 0.0, right;
-        if (v1.getNumber(left), v2.getNumber(right))
+        if (v1.getNumber(left) && v2.getNumber(right))
             return jsNumber(callFrame, left + right);
         
         if (v1.isString()) {

-- 
WebKit Debian packaging