Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

main/auth/inscription.php

@@ -121,14 +121,18 @@ if ($user_already_registered_show_terms === false &&
             $form->addRule('status', get_lang('ThisFieldIsRequired'), 'required');
         }
     }
-
+    $LastnameLabel = get_lang('LastName');
+    if (api_get_configuration_value('registration_add_helptext_for_2_names') == true) 
+    {
+        $LastnameLabel = [$LastnameLabel, get_lang('InsertTwoNames')];
+    }
     if (api_is_western_name_order()) {
         // FIRST NAME and LAST NAME
         $form->addElement('text', 'firstname', get_lang('FirstName'), ['size' => 40]);
-        $form->addElement('text', 'lastname', get_lang('LastName'), ['size' => 40]);
+        $form->addElement('text', 'lastname', $LastnameLabel, ['size' => 40]);
     } else {
         // LAST NAME and FIRST NAME
-        $form->addElement('text', 'lastname', get_lang('LastName'), ['size' => 40]);
+        $form->addElement('text', 'lastname', $LastnameLabel, ['size' => 40]);
         $form->addElement('text', 'firstname', get_lang('FirstName'), ['size' => 40]);
     }
     $form->applyFilter(['lastname', 'firstname'], 'trim');

main/install/configuration.dist.php

@@ -1356,6 +1356,9 @@ ALTER TABLE notification_event ADD COLUMN event_id INT NULL;
 // create new user text extra field called 'notification_event' to save the persistent settings.
 // $_configuration['notification_event'] = false;
 
+//Add help text to put 2 names in registration form
+//$_configuration['registration_add_helptext_for_2_names'] = false;
+
 // KEEP THIS AT THE END
 // -------- Custom DB changes
 // Add user activation by confirmation email