Revert "Issue #1074672 by claudiu.cristea, mikewink: Added Allow language select to be rearranged inside node form."

This reverts commit f4791b9c416d7f3538f307ac16cc2dfce4f32672.

1 files changed, 10 insertions, 18 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index 0893f4d9b..fe8ee5169 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -590,25 +590,17 @@ function node_add_body_field($type, $label = 'Body') {
  */
 function node_field_extra_fields() {
   $extra = array();
-  $module_language_enabled = module_exists('language');
-  $description = t('Node module element');
-
-  foreach (node_type_get_types() as $bundle) {
-    if ($bundle->has_title) {
-      $extra['node'][$bundle->type]['form']['title'] = array(
-        'label' => $bundle->title_label,
-        'description' => $description,
-        'weight' => -5,
-      );
-    }
 
-    // Add also the 'language' select if Language module is enabled and the
-    // bundle has multilingual support.
-    if ($module_language_enabled && variable_get('node_type_language_' . $bundle->type, 0)) {
-      $extra['node'][$bundle->type]['form']['language'] = array(
-        'label' => t('Language'),
-        'description' => $description,
-        'weight' => 0,
+  foreach (node_type_get_types() as $type) {
+    if ($type->has_title) {
+      $extra['node'][$type->type] = array(
+        'form' => array(
+          'title' => array(
+            'label' => $type->title_label,
+            'description' => t('Node module element'),
+            'weight' => -5,
+          ),
+        ),
       );
     }
   }