Commit
8abe1cc553ac50a9683e2f48e63fbf1ba4f6da90
Exists in
master
and in
29 other branches
add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options
Removing redundancy in config loading
| @@ -11,8 +11,7 @@ class GoogleMaps |
| @@ -11,8 +11,7 @@ class GoogleMaps |
11
| end |
11
| end |
12
| |
12
| |
13
| def config |
13
| def config |
14
| - @config = web2_conf['googlemaps'] if @config.nil? |
| |
15
| - @config ||= {} |
14
| + @config ||= (web2_conf['googlemaps'] || {}) |
16
| end |
15
| end |
17
| |
16
| |
18
| def enabled? |
17
| def enabled? |