Replace APP_CONFIG[:terse_pod_url] with uri object.
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684, using the well-defined semantics of the uri object. The pod_url is normalized using module URI's functions, always with a trailing /. The diaspora-handle will always reflect the pod_url with this patch i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se; previous code stripped the www. prefix. If this is a problem, it should be addressed by another setting, since one cannot presume that www.domain.tld resolves to the same address as domain.tld.
parent
416a36ea
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/mailers/notifier.rb 6 ajouts, 6 suppressionsapp/mailers/notifier.rb
- app/models/user.rb 2 ajouts, 2 suppressionsapp/models/user.rb
- app/views/devise/sessions/new.haml 4 ajouts, 4 suppressionsapp/views/devise/sessions/new.haml
- app/views/devise/sessions/new.mobile.haml 2 ajouts, 2 suppressionsapp/views/devise/sessions/new.mobile.haml
- app/views/publics/host_meta.erb 2 ajouts, 2 suppressionsapp/views/publics/host_meta.erb
- config/initializers/_load_app_config.rb 18 ajouts, 5 suppressionsconfig/initializers/_load_app_config.rb
- config/initializers/mailer_config.rb 1 ajout, 1 suppressionconfig/initializers/mailer_config.rb
- spec/config/config_spec.rb 1 ajout, 1 suppressionspec/config/config_spec.rb
- spec/models/person_spec.rb 2 ajouts, 2 suppressionsspec/models/person_spec.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter