1.1 --- a/app/main/member_image/_show.lua	Wed Jun 27 14:48:35 2012 +0200
     1.2 +++ b/app/main/member_image/_show.lua	Wed Jun 27 19:28:39 2012 +0200
     1.3 @@ -2,7 +2,6 @@
     1.4  local member_id = member and member.id or param.get("member_id", atom.integer)
     1.5  
     1.6  local image_type = param.get("image_type")
     1.7 -local show_dummy = param.get("show_dummy", atom.boolean)
     1.8  local class = param.get("class")
     1.9  local popup_text = param.get("popup_text")
    1.10  
    1.11 @@ -12,38 +11,21 @@
    1.12    class = ""
    1.13  end
    1.14  
    1.15 ---[[
    1.16 -local image = member:get_reference_selector("images")
    1.17 -  :add_where{ "image_type = ?", image_type }
    1.18 -  :optional_object_mode()
    1.19 -  :exec()
    1.20  
    1.21 -if image or show_dummy then
    1.22 -  if config.fastpath_url_func then
    1.23 -    ui.image{
    1.24 -      attr = { title = popup_text, class = "member_image member_image_" .. image_type .. class },
    1.25 -      external = config.fastpath_url_func(member.id, image_type)
    1.26 +if config.fastpath_url_func then
    1.27 +  ui.image{
    1.28 +    attr = { title = popup_text, class = "member_image member_image_" .. image_type .. class },
    1.29 +    external = config.fastpath_url_func(member.id, image_type)
    1.30 +  }
    1.31 +else
    1.32 +  ui.image{
    1.33 +    attr = { title = popup_text, class = "member_image member_image_" .. image_type .. class },
    1.34 +    module = "member_image",
    1.35 +    view = "show",
    1.36 +    extension = "jpg",
    1.37 +    id = member_id,
    1.38 +    params = {
    1.39 +      image_type = image_type
    1.40      }
    1.41 -  else
    1.42 -    if not image then
    1.43 -      ui.image{
    1.44 -        attr = { title = popup_text, class = "member_image member_image_" .. image_type .. class },
    1.45 -        external = encode.url{ static = (config.member_image_default_file[image_type] or 'icons/16/lightning.png')},
    1.46 -      }
    1.47 -    else
    1.48 ---]]
    1.49 -      ui.image{
    1.50 -        attr = { title = popup_text, class = "member_image member_image_" .. image_type .. class },
    1.51 -        module = "member_image",
    1.52 -        view = "show",
    1.53 -        extension = "jpg",
    1.54 -        id = member_id,
    1.55 -        params = {
    1.56 -          image_type = image_type
    1.57 -        }
    1.58 -      }
    1.59 -    --[[
    1.60 -    end
    1.61 -  end
    1.62 +  }
    1.63  end
    1.64 ---]]
    1.65 \ No newline at end of file