[MERGE] trunk

bzr revid: al@openerp.com-20131203192151-szbvhmanml37a9si

addons/web/controllers/main.py

@@ -569,7 +569,6 @@ class Home(http.Controller):
             return redirect(guessed_db)
 
         if db is not None and db != request.session.db:
-            # temp hack until fixed in trunk
             request.session.logout()
             request.session.db = db
             guessed_db = db

addons/web/static/src/js/core.js

@@ -561,8 +561,8 @@ instance.web.TranslationDataBase.include({
 });
 
 /** Custom jQuery plugins */
+$.browser = $.browser || {};
 if(navigator.appVersion.indexOf("MSIE") !== -1) {
-    $.browser = $.browser || {};
     $.browser.msie = 1;
 }
 $.fn.getAttributes = function() {

addons/web/static/src/js/search.js

@@ -71,7 +71,10 @@ my.SearchQuery = B.Collection.extend({
     },
     add: function (values, options) {
         options = options || {};
-        if (!(values instanceof Array)) {
+
+        if (!values) {
+            values = [];
+        } else if (!(values instanceof Array)) {
             values = [values];
         }
 
@@ -87,6 +90,10 @@ my.SearchQuery = B.Collection.extend({
             }
             B.Collection.prototype.add.call(this, model, options);
         }, this);
+        // warning: in backbone 1.0+ add is supposed to return the added models,
+        // but here toggle may delegate to add and return its value directly.
+        // return value of neither seems actually used but should be tested
+        // before change, probably
         return this;
     },
     toggle: function (value, options) {