zena 1.2.2 → 1.2.3

data/lib/zena/use/query_node.rb

@@ -177,14 +177,14 @@ module Zena
 
         def get_scope_index_field(field_name)
           return nil if @query.main_class.real_class.column_names.include?(field_name)
-          # scope index
+          # 1. Try scope index
           klass = @query.main_class
           if index_model = klass.kind_of?(VirtualClass) ? klass.idx_class : nil
             index_model = Zena.resolve_const(index_model) rescue NilClass
             if index_model < Zena::Use::ScopeIndex::IndexMethods && index_model.column_names.include?(field_name)
               table_to_use = add_key_value_table('scope_index', index_model.table_name) do |tbl_name|
-                # This block is only executed once
-                add_filter "#{table('nodes')}.id = #{tbl_name}.node_id"
+                # This block is only executed once (ON clause)
+                "#{table('nodes')}.id = #{tbl_name}.node_id"
               end
               "#{table_to_use}.#{field_name}"
             else
@@ -192,7 +192,6 @@ module Zena
               nil
             end
           else
-            # no index model: ignore
             nil
           end
         end
@@ -220,7 +219,7 @@ module Zena
               use_name, source, target, filter = table_def
               table_to_use = add_key_value_table(use_name, target, map_def[:key]) do |tbl_name|
                 # This block is only executed once
-                add_filter filter.gsub(
+                filter.gsub(
                   'TABLE1', table(source)
                 ).gsub(
                   'TABLE2', tbl_name
@@ -241,20 +240,6 @@ module Zena
           elsif field_name == 'random'
             Zena::Db.sql_function(field_name, nil)
           else
-            if processing_filter? && field_name =~ /^(.*)_ids?$/
-              # tag_id = 33  ===> join links as lk, nodes as tt .......
-              rel = $1
-
-              # Fake field_or_attr so it does not use 'zip' on nodes
-              context[:processing] = :relation
-                if join_relation($1, 'jnode')
-                  res = "#{table('jnode')}.zip"
-                end
-              context[:processing] = :filter
-
-              return res
-            end
-
             # property or real column
 
             # FIXME !!!! Why does this happen ?
@@ -279,12 +264,14 @@ module Zena
 
               tbl = add_key_value_table(group_name, index_table, field_name) do |tbl_name|
                 # This block is only executed once
-                add_filter "#{tbl_name}.node_id = #{table}.id"
-                add_filter "#{tbl_name}.key = #{quote(field_name)}"
+                on_clause = "#{tbl_name}.node_id = #{table}.id AND #{tbl_name}.key = #{quote(field_name)}"
                 if group_name.to_s =~ /^ml_/
-                  add_filter "#{tbl_name}.lang = #{quote(visitor.lang)}"
+                  on_clause << " AND #{tbl_name}.lang = #{quote(visitor.lang)}"
                 end
                 # no need for distinct, the new table makes a 1-1 relation
+                # ON CLAUSE
+                on_clause
+                
               end
 
               "#{tbl}.value"
@@ -364,8 +351,44 @@ module Zena
           if fld = get_scope_index_field(scope_idx_field)
             return [[:idx_field, fld], function]
           else
-            # not a scope index field
-            return [arg1, arg2]
+            # 2. Try to use relation as scope filter 'hot.title = "xxx"', 'hot.title = "xxx"'
+            # Multiple links with hot.id = 334 and hot2.id = 323...
+            rel = class_name.sub(/\d$/,'')
+
+            source_kpath = @query.main_class.kpath
+
+            if rel = RelationProxy.find_by_role(rel.singularize, source_kpath)
+              table_to_use = add_key_value_table('jnode', 'nodes', class_name) do |tbl_name|
+                # This block is only executed once per relation name (once for 'hot', once for 'hot2')
+                # TODO: Can we remove this ?
+                distinct!
+                lnk = add_key_value_table('links', 'links', class_name) do |lt|
+                  "#{lt}.#{rel.link_side} = #{table(main_table)}.id AND #{lt}.relation_id = #{rel.id}"
+                end
+                
+                %Q{#{tbl_name}.id = #{lnk}.#{rel.other_side}}
+              end
+              
+              # Temporarily move to the remote class
+              tbl_alias_bak = context[:table_alias]
+              context[:table_alias] = table_to_use
+              main_class_bak = @query.main_class
+              
+                @query.main_class = rel.other_vclass
+                fld = process_field(field_name)
+                
+              # Move back
+              @query.main_class = main_class_bak
+              context[:table_alias] = tbl_alias_bak
+              if fld
+                [[:idx_field, fld], function]
+              else
+                nil
+              end
+            else
+              # not a scope index field
+              return [arg1, arg2]
+            end
           end
         end
 
@@ -465,6 +488,24 @@ module Zena
                 add_filter "#{table('comments')}.discussion_id = #{table('discussions')}.id"
                 # after_parse
               end
+            when 'tag_cloud'
+              # tag cloud
+              if last?
+                change_processor Link.query_compiler, :rubyless_helper => @rubyless_helper
+                # no need to load discussions, versions and all the mess
+                add_table('links')
+                lnk = table('links')
+                add_filter "(#{lnk}.source_id = #{process_attr('id')} OR #{lnk}.target_id = #{process_attr('id')}) AND #{lnk}.relation_id IS NULL"
+              else
+                after_process # Make sure we secure the current part
+                change_processor Link.query_compiler, :rubyless_helper => @rubyless_helper
+                
+                add_table('links')
+                lnk = table('links')
+                add_filter "(#{lnk}.source_id = #{table('nodes')}.id OR #{lnk}.target_id = #{table('nodes')}.id) AND #{lnk}.relation_id IS NULL"
+              end
+              @query.group = " GROUP BY #{lnk}.comment"
+              add_select("COUNT(#{table('nodes')}.id)", 'link_count')
             else
               return nil
             end
@@ -603,14 +644,9 @@ module Zena
             end
 
             if rel = RelationProxy.find_by_role(relation.singularize, source_kpath)
-              if use_name
-                # Doing a jnode.. (node for filtering), we need to reverse relation
-                rel.side = rel.side == :source ? :target : :source
-                add_table(use_name, main_table)
-              else
-                add_table(main_table)
-                set_main_class(rel.other_vclass)
-              end
+
+              add_table(main_table)
+              set_main_class(rel.other_vclass)
 
               add_table('links')
 

data/lib/zena/use/relations.rb

@@ -130,7 +130,7 @@ module Zena
         def l_status
           return @l_status if defined? @l_status
           val = @link ? @link[:status] : self['l_status']
-          val ? val.to_i : nil
+          val ? val.to_f : nil
         end
 
         # TODO: could we use LINK_ATTRIBUTES and 'define_method' here ?
@@ -151,19 +151,6 @@ module Zena
           @link ? @link[:id] : (self[:link_id] == -1 ? nil : self[:link_id]) # -1 == dummy link
         end
 
-        def link_id=(v)
-          if @link && @link[:id].to_i != v.to_i
-            @link = nil
-          end
-          self[:link_id] = v.to_i
-          if @link_attributes_to_update
-            if rel = relation_proxy_from_link
-              @link_attributes_to_update.each do |k,v|
-                rel.send("other_#{k}=",v)
-              end
-            end
-          end
-        end
 
         # FIXME: this method does an 'update' not only 'add'
         def add_link(role, hash)
@@ -228,13 +215,19 @@ module Zena
           @l_comment = v.blank? ? nil : v
           if rel = relation_proxy_from_link
             rel.other_comment = @l_comment
+          else
+            l = @link_attributes_to_update ||= {}
+            l[:comment] = @l_comment
           end
         end
 
         def l_status=(v)
-          @l_status = v.blank? ? nil : v.to_i
+          @l_status = v.blank? ? nil : v
           if rel = relation_proxy_from_link
             rel.other_status = @l_status
+          else
+            l = @link_attributes_to_update ||= {}
+            l[:status] = @l_status
           end
         end
 
@@ -242,6 +235,23 @@ module Zena
           @l_date = v.blank? ? nil : v
           if rel = relation_proxy_from_link
             rel.other_date = @l_date
+          else
+            l = @link_attributes_to_update ||= {}
+            l[:date] = @l_date
+          end
+        end
+        
+        def link_id=(v)
+          if @link && @link[:id].to_i != v.to_i
+            @link = nil
+          end
+          self[:link_id] = v.to_i
+          if @link_attributes_to_update
+            if rel = relation_proxy_from_link
+              @link_attributes_to_update.each do |k,v|
+                rel.send("other_#{k}=",v)
+              end
+            end
           end
         end
 

data/lib/zena/use/rendering.rb

@@ -35,6 +35,7 @@ module Zena
       module ControllerMethods
         def self.included(base)
           base.send(:helper_attr, :js_data, :zafu_headers)
+          base.send(:helper_method, :set_caching)
           base.send(:layout, false)
         end
 
@@ -45,6 +46,12 @@ module Zena
         def zafu_headers
           @zafu_headers ||= {}
         end
+        
+        def set_caching(opts)
+          if request.query_string =~ opts[:allow_query]
+            @cache_query = request.query_string
+          end
+        end
 
         # TODO: test
         # Our own handling of exceptions
@@ -147,10 +154,18 @@ module Zena
               }
             end
 
-            if result[:type] == 'text/html'
+            if error = result[:error]
               # error reporting from rendering engine
               opts[:cache] = false
-              render :text => result[:data]
+              @render_error = error
+              render :file => 'nodes/render_error'
+            
+            elsif result[:type] == 'text/html'
+              # debugging mode from rendering engine
+              opts[:cache] = false
+              
+              render :inline => result[:data]
+              
             else
               if zafu_headers
                 if disposition = zafu_headers.delete('Content-Disposition')
@@ -182,9 +197,13 @@ module Zena
             cache_page(:content_data => result[:data], :content_path => result[:file]) if opts[:cache]
           else
             # html
-            render :file => template_url(opts), :layout=>false, :status => opts[:status]
-            headers.merge!(zafu_headers)
-            cache_page(:url => opts[:cache_url]) if opts[:cache]
+            if opts.delete(:as_string)
+              render_to_string :file => template_url(opts), :layout => false
+            else
+              render :file => template_url(opts), :layout => false, :status => opts[:status]
+              headers.merge!(zafu_headers)
+              cache_page(:url => opts[:cache_url]) if opts[:cache]
+            end
           end
         # This does not work, Rendering::Redirect is wrapped in TemplateError
         # rescue Zena::Use::Rendering::Redirect
@@ -204,14 +223,15 @@ module Zena
         def cache_page(opts={})
           if cachestamp_format?(params['format'])
             headers['Expires'] = (Time.now + 365*24*3600).strftime("%a, %d %b %Y %H:%M:%S GMT")
-            headers['Cache-Control'] = (!current_site.authentication? && @node.public?) ? 'public' : 'private'
+            headers['Cache-Control'] = (!current_site.authentication? && @node.v_public?) ? 'public' : 'private'
           end
 
           if perform_caching && caching_allowed(:authenticated => opts.delete(:authenticated))
           
             url = page_cache_file(opts.delete(:url))
+            
             opts = {:expire_after  => nil,
-                    :path          => (current_site.public_path + url),
+                    :path          => (current_site.cache_path + url),
                     :content_data  => response.body,
                     :node_id       => @node[:id]
                     }.merge(opts)
@@ -221,7 +241,7 @@ module Zena
 
         # Return true if we can cache the current page
         def caching_allowed(opts = {})
-          return false if current_site.authentication? || query_params != {}
+          return false if current_site.authentication? || (query_params != {} && !@cache_query)
           # Cache even if authenticated (public content).
           #                       Content viewed by anonymous user should be cached anyway.
           opts[:authenticated] || visitor.is_anon?
@@ -229,16 +249,23 @@ module Zena
 
         # Cache file path that reflects the called url
         def page_cache_file(url = nil)
-          path = url || url_for(:only_path => true, :skip_relative_url_root => true, :cachestamp => nil)
+          path = url || url_for(:only_path => true, :skip_relative_url_root => true)
           path = ((path.empty? || path == "/") ? "/index" : URI.unescape(path))
           ext = params[:format].blank? ? 'html' : params[:format]
-          path << ".#{ext}" unless path =~ /\.#{ext}(\?\d+|)$/
-          #
+
           # FULL QUERY_STRING in cached page ?
+          if @cache_query
+            # This builds blog29.htmlp=2.html and it is OK (helps make rewrite rules simple)
+            path << @cache_query << ".#{ext}"
+          else
+            path << ".#{ext}" unless path =~ /\.#{ext}(\?\d+|)$/
+          end
+          
           if cachestamp_format?(params['format'])
-            # We have to use a '.' because apache cannot serve static files with '?'.
-            path << "." << make_cachestamp(@node, params['mode'])
+            # Set expire
+            response.headers['Expires'] = 1.year.from_now.httpdate
           end
+          
           path
         end
 
@@ -272,14 +299,15 @@ module Zena
           # urls to localhost (the rendering engine is external to Zena and will need to
           # make calls to get assets).
           def baseurl
-            if Zena::ASSET_PORT
+            if Zena::ASSET_PORT > 0
               if Zena::ASSET_PORT == request.port
                 raise Exception.new("Custom rendering not allowed on this process (port == asset_port).")
               else
                 "http://127.0.0.1:#{Zena::ASSET_PORT}"
               end
             else
-              raise Exception.new("Using custom rendering without an asset host ('asset_port' setting in bricks.yml).")
+              # This can break if using mongrel and round-robin (deadlock)
+              "#{ssl_request? ? 'https' : 'http'}://#{current_site.host}"
             end
           end
 
@@ -304,6 +332,29 @@ module Zena
             out "<% set_headers(#{headers.join(', ')}) %>"
           end
         end
+        
+        # <r:cache rebuild='true' allow_query='p=1?[0-9]'/>
+        # <r:cache rebuild='true' allow_query='p=1?[0-9]'/>
+        def r_cache
+          params_list = []
+          if re = @params[:allow_query]
+            reg_test = %r{^#{re}$}
+            params_list << ":allow_query => #{reg_test.inspect}"
+          end
+          
+          if rebuild = @params[:rebuild]
+            # TODO: implement "replace if changed (diff)" instead of cache removal if there is the rebuild
+            # setting so that the cached timestamp does not change.
+            params_list << ":rebuild => #{@params[:rebuild].inspect}"
+          end
+          
+          if at = @params[:expire_at]
+            params_list << ":rebuild => #{@params[:rebuild].inspect}"
+          end
+          out "<% set_caching(:allow_query => #{reg_test.inspect}, :rebuild => #{@params[:rebuild].inspect}) %>"
+        rescue => err
+          parser_error("Invalid regular expression (#{err.message})")
+        end
 
         def r_style
           @markup.tag = 'style'

data/lib/zena/use/upload.rb

@@ -5,6 +5,8 @@ require 'uuidtools'
 module Zena
   module Use
     module Upload
+      UPLOAD_KEY = defined?(Mongrel) ? 'upload_id' : "X-Progress-ID"
+      
       def self.has_network?
         response = nil
         Net::HTTP.new('example.com', '80').start do |http|
@@ -41,6 +43,7 @@ module Zena
             yield(att, error) if block_given?
             [att, error]
           end
+          
 
         private
           def fetch_uri(uri_str, max_file_size = 10)
@@ -141,13 +144,37 @@ module Zena
               end
             end
           end
+          
+          def render_upload
+            responds_to_parent do # execute the redirect in the iframe's parent window
+              render :update do |page|
+                if @node.new_record?
+                  page.replace_html 'form_errors', error_messages_for(:node, :object => @node)
+                  page.call 'UploadProgress.setAsError'
+                else
+                  page.call 'UploadProgress.setAsFinished'
+                  page.delay(1) do # allow the progress bar fade to complete
+                    if js = params[:js]
+                      page << js.gsub('NODE_ID', @node.zip.to_s)
+                    end
+                    if params[:reload]
+                      page << "Zena.t().Zena.reload(#{params[:reload].inspect})"
+                    end
+                    if params[:redir]
+                      page << "Zena.reload_and_close(#{params[:redir].inspect})"
+                    else
+                      page.redirect_to document_url(@node[:zip], :reload => params[:reload], :js => params[:js])
+                    end
+                  end
+                end
+              end
+            end
+          end
       end # ControllerMethods
 
       module ViewMethods
         include RubyLess
-        safe_method [:upload_field, {:type => String}] => String
 
-        UPLOAD_KEY = defined?(Mongrel) ? 'upload_id' : "X-Progress-ID"
         def upload_form_tag(url_opts, html_opts = {})
           @uuid = UUIDTools::UUID.random_create.to_s.gsub('-','')
           html_opts.reverse_merge!(:multipart => true, :id => "UploadForm#{@uuid}")
@@ -165,6 +192,8 @@ module Zena
         end
 
         def upload_field(opts = {})
+          uuid = opts[:uuid] || @uuid
+          dom  = opts[:dom]  || 'node'
           case opts[:type].to_s
           when 'onclick'
             link = link_to_remote(_("change"), :update=>'upload_field', :url => get_uf_documents_path(:uuid => @uuid), :method => :get, :complete=>"['file', 'upload_field'].each(Element.toggle);")
@@ -174,11 +203,11 @@ module Zena
 <div id="upload_field" class='toggle_div' style='display:none;'></div>
 TXT
           else
-            attach_file_id, attach_url_id = "af#{@uuid}", "au#{@uuid}"
-            onchange = %Q{onchange="Zena.get_filename(this,'node_title'); $('node_title').focus(); $('node_title').select();"}
+            attach_file_id, attach_url_id = "af#{uuid}", "au#{uuid}"
+            onchange = %Q{onchange="Zena.get_filename(this,'#{dom}_title'); $('#{dom}_title').focus(); $('#{dom}_title').select();"}
             <<-TXT
 <div id='#{attach_file_id}' class='attach'><label for='attachment' onclick=\"['#{attach_file_id}', '#{attach_url_id}'].each(Element.toggle);\">#{_('file')} / <span class='off'>#{_('url')}</span></label>
-<input  style='line-height:1.5em;' id="attachment#{@uuid}" name="attachment" #{onchange} class='file' type="file" /></div>
+<input  style='line-height:1.5em;' id="attachment#{uuid}" name="attachment" #{onchange} class='file' type='file'/></div>
 
 <div id='#{attach_url_id}' class='attach' style='display:none;'><label for='url' onclick=\"['#{attach_file_id}', '#{attach_url_id}'].each(Element.toggle);\"><span class='off'>#{_('file')}</span> / #{_('url')}</label>
 <input  style='line-height:1.5em;' size='30' id='attachment_url' type='text' #{onchange} name='attachment_url'/><br/></div>

data/lib/zena/use/urls.rb

@@ -18,10 +18,12 @@ module Zena
       }
 
 
-      ALLOWED_REGEXP = /\A(([a-zA-Z]+)([0-9]+)|([#{String::ALLOWED_CHARS_IN_URL}\-%]+))(_[a-zA-Z]+|)(\..+|)\Z/
+      ALLOWED_REGEXP = /\A(([a-zA-Z]+)([0-9]+)|([#{String::ALLOWED_CHARS_IN_URL}\-%]+))(_[a-zA-Z]+|)(=[a-z0-9]+|)(\..+|)\Z/
 
       module Common
-        CACHESTAMP_FORMATS = ['jpg', 'png', 'gif', 'css', 'js']
+        # This is directly related to the FileMatch clause in httpd.rhtml (mod_expires for apaches)
+        CACHESTAMP_FORMATS = %w{ico flv jpg jpeg png gif js css swf}
+        
         def prefix
           if visitor.is_anon?
             visitor.lang
@@ -99,7 +101,7 @@ module Zena
           end
 
           if node.kind_of?(Document) && format == node.ext
-            if node.public? && !visitor.site.authentication?
+            if node.v_public? && !visitor.site.authentication?
               # force the use of a cacheable path for the data, even when navigating in '/oo'
               pre = node.version.lang
             end
@@ -108,12 +110,9 @@ module Zena
           if asset = opts.delete(:asset)
             mode   = nil
           end
-
-
+            
           if should_cachestamp?(node, format, asset)
-            opts[:cachestamp] = make_cachestamp(node, mode)
-          else
-            opts.delete(:cachestamp) # cachestamp
+            stamp = make_cachestamp(node, mode)
           end
 
           path = if !asset && node[:id] == visitor.site[:root_id] && mode.nil? && format == 'html'
@@ -122,7 +121,8 @@ module Zena
             "#{abs_url_prefix}/#{pre}/" +
             basepath_as_url(node.basepath) +
             (mode  ? "_#{mode}"  : '') +
-            (asset ? ".#{asset}" : '') +
+            (asset ? "=#{asset}" : '') +
+            (stamp ? ".#{stamp}" : '') +
             (format == 'html' ? '' : ".#{format}")
           else
             "#{abs_url_prefix}/#{pre}/" +
@@ -130,7 +130,8 @@ module Zena
             (node.klass.downcase   ) +
             (node[:zip].to_s       ) +
             (mode  ? "_#{mode}"  : '') +
-            (asset ? ".#{asset}" : '') +
+            (asset ? "=#{asset}" : '') +
+            (stamp ? ".#{stamp}" : '') +
             ".#{format}"
           end
           append_query_params(path, opts)
@@ -150,7 +151,6 @@ module Zena
           if opts == {}
             path
           else
-            cachestamp = opts.delete(:cachestamp)
             tz = opts.delete(:tz)
             list = opts.keys.map do |k|
               # FIXME: DOC
@@ -181,14 +181,10 @@ module Zena
                 nil
               end
             end.flatten.compact
-            if cachestamp
-              result = path + "?#{cachestamp}" + (list.empty? ? '' : "&#{list.sort.join('&')}")
-              result
-            else
-              # TODO: replace '&' by '&' ? Or escape later ? Use h before zen_path in templates ? What about css/xls/other stuff ?
-              # Best solution: use 'h' in template when set in default
-              path + (list.empty? ? '' : "?#{list.sort.join('&')}")
-            end
+            
+            # TODO: replace '&' by '&' ? Or escape later ? Use h before zen_path in templates ? What about css/xls/other stuff ?
+            # Best solution: use 'h' in template when set in default
+            path + (list.empty? ? '' : "?#{list.sort.join('&')}")
           end
         end
 
@@ -218,7 +214,7 @@ module Zena
         end
 
         def make_cachestamp(node, mode)
-          if mode
+          str = if mode
             if node.kind_of?(Image)
               if iformat = Iformat[mode]
                 "#{node.updated_at.to_i + iformat[:hash_id]}"
@@ -234,6 +230,8 @@ module Zena
           else
             node.updated_at.to_i.to_s
           end
+          
+          Digest::SHA1.hexdigest(str)[0..4]
         end
 
         # Url parameters (without format/mode/prefix...)
@@ -695,7 +693,7 @@ module Zena
 
           def insert_ajax_args(target, hash_params, action)
             hash_params << ":s => start_id"
-            hash_params << ":link_id => this.link_id" if @context[:has_link_id] && node.will_be?(Node)
+            hash_params << ":link_id => this.link_id" if @context[:has_link_id] && node.will_be?(Node) && !node.list_context?
             
             # FIXME: when we have proper markup.dyn_params[:id] support,
             # we should not need this crap anymore.
@@ -816,6 +814,7 @@ module Zena
           end
 
           def text_for_link(default = nil)
+            
             if dynamic_blocks?
               expand_with
             else
@@ -826,15 +825,19 @@ module Zena
               end
 
               if method
-                method.literal ? erb_escape(method.literal) : "<%= #{method} %>"
+                if method.opts[:html_safe]
+                  method.literal || "<%= #{method} %>"
+                else
+                  method.literal ? ::ERB::Util.html_escape(method.literal) : "<%=h #{method} %>"
+                end
               elsif default
                 default
               elsif node.will_be?(Node)
-                "<%= #{node(Node)}.prop['title'] %>"
+                "<%=h #{node(Node)}.prop['title'] %>"
               elsif node.will_be?(Version)
-                "<%= #{node(Version)}.node.prop['title'] %>"
+                "<%=h #{node(Version)}.node.prop['title'] %>"
               elsif node.will_be?(Link)
-                "<%= #{node(Link)}.name %>"
+                "<%=h #{node(Link)}.name %>"
               else
                 _('edit')
               end

data/lib/zena/use/version_hash.rb

@@ -59,11 +59,23 @@ module Zena
           end
         end
 
-        def version_id(lang = nil)
+        def version_id(lang = nil, ugps = visitor.group_ids)
           lang ||= visitor.lang
-          access = can_see_redactions? ? vhash['w'] : vhash['r']
+          access = can_see_redactions?(ugps) ? vhash['w'] : vhash['r']
           access[lang] || access[self[:ref_lang]] || access.values.first
         end
+        
+        # Return true if the current version can be seen by the public.
+        def v_public?
+          visitor.is_anon? ||
+          begin
+            anon = visitor.site.anon
+            # visible by anonymous
+            can_read?(anon, anon.group_ids) &&
+            # anonymous would see this exact version
+            version.id == version_id(visitor.lang, visitor.site.anon.group_ids)
+          end
+        end
 
         # Return the list of versions that are stored in the vhash and could be loaded depending
         # on the visitor.