Commit afdf0f6c authored by Dries's avatar Dries

- Patch #850166 by kiamlaluno: string concatenation should be formatted with a...

- Patch #850166 by kiamlaluno: string concatenation should be formatted with a space separating the operators (dot .).
parent d963c364
...@@ -491,7 +491,7 @@ function form_test_storage_form($form, &$form_state) { ...@@ -491,7 +491,7 @@ function form_test_storage_form($form, &$form_state) {
} }
// Count how often the form is constructed. // Count how often the form is constructed.
$_SESSION['constructions']++; $_SESSION['constructions']++;
drupal_set_message("Form constructions: ". $_SESSION['constructions']); drupal_set_message("Form constructions: " . $_SESSION['constructions']);
$form['title'] = array( $form['title'] = array(
'#type' => 'textfield', '#type' => 'textfield',
...@@ -572,8 +572,8 @@ function form_storage_test_form_continue_validate($form, &$form_state) { ...@@ -572,8 +572,8 @@ function form_storage_test_form_continue_validate($form, &$form_state) {
* Form submit handler to finish multi-step form. * Form submit handler to finish multi-step form.
*/ */
function form_test_storage_form_submit($form, &$form_state) { function form_test_storage_form_submit($form, &$form_state) {
drupal_set_message("Title: ". check_plain($form_state['values']['title'])); drupal_set_message("Title: " . check_plain($form_state['values']['title']));
drupal_set_message("Form constructions: ". $_SESSION['constructions']); drupal_set_message("Form constructions: " . $_SESSION['constructions']);
if (isset($form_state['storage']['thing']['changed'])) { if (isset($form_state['storage']['thing']['changed'])) {
drupal_set_message("The thing has been changed."); drupal_set_message("The thing has been changed.");
} }
......
...@@ -59,7 +59,7 @@ function user_help($path, $arg) { ...@@ -59,7 +59,7 @@ function user_help($path, $arg) {
return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href="@role">Roles</a> page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the <a href="@settings">User Settings</a> page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/people/permissions/roles'), '@settings' => url('admin/config/people/accounts'))) . '</p>'; return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href="@role">Roles</a> page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the <a href="@settings">User Settings</a> page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/people/permissions/roles'), '@settings' => url('admin/config/people/accounts'))) . '</p>';
case 'admin/people/permissions/roles': case 'admin/people/permissions/roles':
$output = '<p>' . t('Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined on the <a href="@permissions">permissions page</a>. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the names and order of the roles on your site. It is recommended to order your roles from least permissive (anonymous user) to most permissive (administrator). To delete a role choose "edit role".', array('@permissions' => url('admin/people/permissions'))) . '</p>'; $output = '<p>' . t('Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined on the <a href="@permissions">permissions page</a>. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the names and order of the roles on your site. It is recommended to order your roles from least permissive (anonymous user) to most permissive (administrator). To delete a role choose "edit role".', array('@permissions' => url('admin/people/permissions'))) . '</p>';
$output .= '<p>'. t('By default, Drupal comes with two user roles:') . '</p>'; $output .= '<p>' . t('By default, Drupal comes with two user roles:') . '</p>';
$output .= '<ul>'; $output .= '<ul>';
$output .= '<li>' . t("Anonymous user: this role is used for users that don't have a user account or that are not authenticated.") . '</li>'; $output .= '<li>' . t("Anonymous user: this role is used for users that don't have a user account or that are not authenticated.") . '</li>';
$output .= '<li>' . t('Authenticated user: this role is automatically granted to all logged in users.') . '</li>'; $output .= '<li>' . t('Authenticated user: this role is automatically granted to all logged in users.') . '</li>';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment