← Back to branch summary

~ubuntu-branches/ubuntu/saucy/python-django/saucy-updates

« back to all changes in this revision

Viewing changes to django/contrib/contenttypes/generic.py

  • Committer: Package Import Robot
  • Author(s): Luke Faraone
  • Date: 2013-08-13 16:49:39 UTC
  • mfrom: (1.1.22) (4.4.28 sid)
  • Revision ID: package-import@ubuntu.com-20130813164939-ct6oweybhkuyq4tt
Tags: 1.5.2-1
* New upstream security release.
  https://www.djangoproject.com/weblog/2013/aug/13/security-releases-issued/
  - Cross-site scripting (XSS) in admin interface
  - Possible XSS via is_safe_url

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/contrib/contenttypes/generic.py
432
432
    """
433
433
    Returns a ``GenericInlineFormSet`` for the given kwargs.
434
434
 
435
 
    You must provide ``ct_field`` and ``object_id`` if they different from the
436
 
    defaults ``content_type`` and ``object_id`` respectively.
 
435
    You must provide ``ct_field`` and ``fk_field`` if they are different from
 
436
    the defaults ``content_type`` and ``object_id`` respectively.
437
437
    """
438
438
    opts = model._meta
439
439
    # Avoid a circular import.