Merge branch 'support/2.4.x' of github.com:pulilab/django-cms into support/2.4.x

Author: nagyv

cms/__init__.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '2.4.3'
+__version__ = '2.4.3-support'

cms/admin/pageadmin.py

@@ -1129,7 +1129,7 @@ def add_plugin(self, request):
         # page add-plugin
         if page:
             # this only runs when both page and placeholder are not empty.
-            language = request.POST['language'] or get_language_from_request(request)
+            language = request.POST.get('language') or get_language_from_request(request)
             position = CMSPlugin.objects.filter(language=language, placeholder=placeholder).count()
             try:
                 has_reached_plugin_limit(placeholder, plugin_type, language, template=page.get_template())

cms/templates/cms/toolbar/toolbar.html

@@ -38,7 +38,7 @@
 	window.$ = _$ || jQuery;
 </script>
 {% endaddtoblock %}
-<div id="cms_toolbar" class="cms_reset" style="display:none;">
+<div id="cms_toolbar" class="cms_reset" style="display:none;" dir="ltr">
 	<!-- start: toolbar -->
 	<div class="cms_toolbar">
 		<div id="cms_toolbar-toggle">

cms/urls.py

@@ -2,7 +2,7 @@
 from cms.apphook_pool import apphook_pool
 from cms.views import details
 from django.conf import settings
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 if settings.APPEND_SLASH:
     reg = url(r'^(?P<slug>[0-9A-Za-z-_.//]+)/$', details, name='pages-details-by-slug')

docs/extending_cms/testing.rst

@@ -73,7 +73,6 @@ So you could do::
 
         def setUp(self):
             self.plugin = MyPlugin()
-            self.plugin.save()
 
         def test_plugin(self):
             context = {'info': 'value'}