Django

Code

Show
Ignore:
Timestamp:
02/15/08 11:05:48 (11 months ago)
Author:
jkocherhans
Message:

newforms-admin: Merged from trunk up to [7120].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7021 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7120

  • django/branches/newforms-admin/django/contrib/syndication/feeds.py

    r6613 r7121  
    77 
    88def add_domain(domain, url): 
    9     if not url.startswith('http://'): 
     9    if not (url.startswith('http://') or url.startswith('https://')): 
    1010        # 'url' must already be ASCII and URL-quoted, so no need for encoding 
    1111        # conversions here. 
    …… 
    8383            description = self.__get_dynamic_attr('description', obj), 
    8484            language = settings.LANGUAGE_CODE.decode(), 
    85             feed_url = add_domain(current_site, self.__get_dynamic_attr('feed_url', obj)), 
     85            feed_url = add_domain(current_site.domain, 
     86                                  self.__get_dynamic_attr('feed_url', obj)), 
    8687            author_name = self.__get_dynamic_attr('author_name', obj), 
    8788            author_link = self.__get_dynamic_attr('author_link', obj),