Merge 3889b11 into 2d3e10a

cms/admin/placeholderadmin.py

@@ -423,12 +423,14 @@ def move_plugin(self, request):
         plugin = CMSPlugin.objects.get(pk=int(request.POST['plugin_id']))
         placeholder = Placeholder.objects.get(pk=request.POST['placeholder_id'])
         parent_id = request.POST.get('plugin_parent', None)
-        language = request.POST.get('plugin_language', plugin.language)
+        language = request.POST.get('plugin_language', None)
         source_placeholder = plugin.placeholder
         if not parent_id:
             parent_id = None
         else:
             parent_id = int(parent_id)
+        if not language and plugin.language:
+            language = plugin.language
         order = request.POST.getlist("plugin_order[]")
         if not self.has_move_plugin_permission(request, plugin, placeholder):
             return HttpResponseForbidden(force_unicode(_("You have no permission to move this plugin")))
@@ -568,4 +570,4 @@ class FrontendEditableAdmin(FrontendEditableAdminMixin):
     def __init__(self, *args, **kwargs):
         warnings.warn("Class FrontendEditableAdmin is deprecated and will be removed in 3.1. "
             "Instead, use FrontendEditableAdminMixin.", DeprecationWarning)
-        super(FrontendEditableAdmin, self).__init__(*args, **kwargs)
+        super(FrontendEditableAdmin, self).__init__(*args, **kwargs)