Merge branch 'master' into bug/ch149333/fernando99-error-trying-to-add-a-custom-wmts

3 years ago · 2baa057c8f
parent 72a84eccdb 5fc5efb556
commit 2baa057c8f
2 changed files with 3 additions and 0 deletions
--- a/NEWS.md
+++ b/NEWS.md
@ -8,6 +8,7 @@ Development
 * Bump cartodb-common to v1.1.2

 ### Bug fixes / enhancements
+- Guard code for vizjson users [#16267](https://github.com/CartoDB/cartodb/pull/16267)
 - Guard code for Users and Visualizations [#16265](https://github.com/CartoDB/cartodb/pull/16265)
 - Limit start parameter of Dropbox connector [#16264](https://github.com/CartoDB/cartodb/pull/16264)
 - Support staging hostname in the catalog [#16258](https://github.com/CartoDB/cartodb/pull/16258)
--- a/app/controllers/carto/api/vizjson3_presenter.rb
+++ b/app/controllers/carto/api/vizjson3_presenter.rb
@ -181,6 +181,8 @@ module Carto
      end

      def user_info_vizjson(user)
+        return {} if user.nil?
+
        {
          fullname: user.name_or_username,
          avatar_url: user.avatar_url,