diff --git a/docs/installation/updating.md b/docs/installation/updating.md index 47b4a0b49..23654de96 100755 --- a/docs/installation/updating.md +++ b/docs/installation/updating.md @@ -22,6 +22,8 @@ WARN: **Important** Upgrading major version (example from v5.x to v6.x) typicall ExpressionEngine supports one-click updating as of **Version 4.0** or newer. If you are running a version older than 4, then you must perform a [manual update](#updating-manually). +NOTE: **Note:** If updating from a version prior to ExpressionEngine 6, you may need to rename or remove `system/ee/EllisLab` directory manually. You will also need to manually copy the [latest index.php and admin.php files](_downloads/EE6_Index_Admin.zip) to your site's root folder. + When an update is available, you'll see the version number in the control panel footer turn yellow or red. Click the version number, then click "Update Now". **Upgrade Steps** @@ -31,8 +33,6 @@ When an update is available, you'll see the version number in the control panel In the rare case an update fails, please read [Troubleshooting Automatic Updates](troubleshooting/general.md#troubleshooting-automatic-updates). -NOTE: **Note:** If updating from a version prior to ExpressionEngine 6, you may need to rename or remove `system/ee/EllisLab` directory manually. You will also need to manually copy the [latest index.php and admin.php files](_downloads/EE6_Index_Admin.zip) to your site's root folder. - ## Updating Via EECLI diff --git a/docs/member/login.md b/docs/member/login.md index 95ec17c13..9c9ee453f 100644 --- a/docs/member/login.md +++ b/docs/member/login.md @@ -34,12 +34,6 @@ Output a login form. Allows you to specify the action attribute of the <form> tag. Handy if you need to ensure that authentication points to SSL portions of your site from non-SSL portions. Often used in conjunction with the return= parameter and the [{current_url} global variable](templates/globals/single-variables.md#current_url) so your visitors will go back to the page and domain they logged in from. -### `error_handling=` - - error_handling="inline" - -Choose to display error messages inline (see [Error Messages](#errors)). By default, errors are displayed with the user message template. - ### `form_class=` form_class="login" @@ -113,35 +107,6 @@ It is recommended that you use this variable as indicated in the example code at {/if} - -## Variable Pairs - -### `{errors}` - -Form submission errors are displayed using a "looping pair" as there can be more than 1 error in a form submission. - - {errors} -

{error}

- {/errors} - -#### Error Tag Pair Parameters - -##### `backspace=` - - backspace="3" - -The `backspace=` parameter will remove characters, including spaces and line breaks, from the last iteration of the tag pair. - -#### Error Tag Pair Variables - -##### `{error}` - - {error} - -The error text. - - - ## Example @@ -167,4 +132,4 @@ The error text.

Forgot password?     Forgot username?

- {/exp:member:login_form} \ No newline at end of file + {/exp:member:login_form} diff --git a/docs/member/registration.md b/docs/member/registration.md index ea4599f7d..6f55e381a 100644 --- a/docs/member/registration.md +++ b/docs/member/registration.md @@ -17,12 +17,6 @@ Output a member registration form. ## Parameters -### `error_handling=` - - error_handling="inline" - -Choose to display error messages inline (see [Error Messages](#errors)). By default, errors are displayed with the user message template. - ### `return=` return="member/registration/success" @@ -73,11 +67,13 @@ Member username. This is a **required** field and must be unique across the site - +Custom member fields that have "Show in registration?" setting turned on can be used in member registration form. +Please note you need to address those by ID and not name, e.g. `m_field_id_8` + + + ## Variables @@ -105,33 +101,6 @@ Member username. This is a **required** field and must be unique across the site {if username}{username}{/if} -## Variable Pairs - -### `{errors}` - -Form submission errors are displayed using a "looping pair" as there can be more than 1 error in a form submission. - - {errors} -

{error}

- {/errors} - -#### Error Tag Pair Parameters - -##### `backspace=` - - backspace="3" - -The `backspace=` parameter will remove characters, including spaces and line breaks, from the last iteration of the tag pair. - -#### Error Tag Pair Variables - -##### `{error}` - - {error} - -The error text. - - ## Example @@ -199,5 +168,3 @@ The error text. {/exp:member:registration_form} - - diff --git a/docs/templates/conditionals.md b/docs/templates/conditionals.md index 677e414e8..4a70b38c9 100755 --- a/docs/templates/conditionals.md +++ b/docs/templates/conditionals.md @@ -312,17 +312,29 @@ There are a handful of variables that are always available to conditionals. You can test against the email address of the currently logged in user. -### `logged_in_group_description` +### `logged_in_primary_role_id` - {if logged_in_group_description *= 'games'} Shall we play a game? {/if} + {if logged_in_role_id == '7'} You're an "Editor"! {/if} -You can test against the group description of the currently logged in user. +You can test against the Primary Role of the currently logged in user. -### `logged_in_role_id` +### `logged_in_primary_role_name` - {if logged_in_role_id == '7'} You're an "Editor"! {/if} + {if logged_in_primary_role_name *= 'games'} Shall we play a game? {/if} -You can test against the Primary Role of the currently logged in user. +You can test against the primary role name of the currently logged in user. + +### `logged_in_primary_role_description` + + {if logged_in_primary_role_description *= 'games'} Shall we play a game? {/if} + +You can test against the primary role description of the currently logged in user. + +### `has_role_*X*` + + {if has_role_editor} Logged in with editor permissions {/if} + +With `X` being short role name, you can use this conditional to check whether logged in user has certain role. This takes into account all the 'secondary' roles assigned. ### `logged_in_ip_address` diff --git a/docs/templates/globals/single-variables.md b/docs/templates/globals/single-variables.md index 1c4c45a7e..125c8cfd1 100755 --- a/docs/templates/globals/single-variables.md +++ b/docs/templates/globals/single-variables.md @@ -259,18 +259,18 @@ The email address for the site, as specified in [Email Configuration](control-pa The email address for the currently logged-in user. -### `{logged_in_group_description}` - -The Primary Role description for the currently logged-in user. - -### `{logged_in_role_id}` +### `{logged_in_primary_role_id}` The Primary Role ID number for the currently logged-in user. -### `{logged_in_role_title}` +### `{logged_in_primary_role_name}` The title of the Primary Role for the currently logged-in user. +### `{logged_in_primary_role_description}` + +The Primary Role description for the currently logged-in user. + ### `{logged_in_ip_address}` This variable will be substituted with the IP address of the currently logged in user.