Merge pull request #3231 from ExpressionEngine/7.dev

ExpressionEngine 7.2.14

.github/DISCUSSION_TEMPLATE/feature-requests.yml

@@ -2,7 +2,7 @@ title: "🚀 Feature request"
 body:
   - type: textarea
     attributes:
-      placeholder: Suggest an idea for ExpressionEngine
+      label: Suggest an idea for ExpressionEngine
       value: |
         **Is your feature request related to a problem? Please describe.**
         A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

build-tools/build.json

@@ -1,5 +1,5 @@
 {
-    "tag": "7.2.13",
+    "tag": "7.2.14",
 
     "repositories": {
         "app": "git@github.com:ExpressionEngine/ExpressionEngine",

system/ee/ExpressionEngine/Addons/member/mod.member_auth.php

@@ -168,7 +168,7 @@ public function member_login()
             $return_link = reduce_double_slashes(ee()->functions->form_backtrack());
         }
 
-        if ($current_idx === false) {
+        if (!empty($sites) && $current_idx === false) {
             ee()->output->show_user_error('general', lang('multi_auth_redirect_site_not_found'));
         }
 

system/ee/ExpressionEngine/Tests/bootstrap.php

@@ -11,7 +11,7 @@
 define('BASEPATH', SYSPATH . 'ee/legacy/');
 define('PATH_CACHE', SYSPATH . 'user/cache/');
 define('APPPATH', BASEPATH);
-define('APP_VER', '7.2.13');
+define('APP_VER', '7.2.14');
 define('PATH_THEMES', realpath(SYSPATH . '/../themes') . '/');
 define('DOC_URL', 'http://our.doc.url/');
 define('PATH_THIRD', SYSPATH . 'user/addons/');

system/ee/installer/controllers/wizard.php

@@ -13,7 +13,7 @@
  */
 class Wizard extends CI_Controller
 {
-    public $version = '7.2.13'; // The version being installed
+    public $version = '7.2.14'; // The version being installed
     public $installed_version = '';  // The version the user is currently running (assuming they are running EE)
     public $schema = null; // This will contain the schema object with our queries
     public $languages = array(); // Available languages the installer supports (set dynamically based on what is in the "languages" folder)

system/ee/installer/updates/ud_7_02_14.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This source file is part of the open source project
+ * ExpressionEngine (https://expressionengine.com)
+ *
+ * @link      https://expressionengine.com/
+ * @copyright Copyright (c) 2003-2023, Packet Tide, LLC (https://www.packettide.com)
+ * @license   https://expressionengine.com/license Licensed under Apache License, Version 2.0
+ */
+
+namespace ExpressionEngine\Updater\Version_7_2_14;
+
+/**
+ * Update
+ */
+class Updater
+{
+    public $version_suffix = '';
+
+    /**
+     * Do Update
+     *
+     * @return TRUE
+     */
+    public function do_update()
+    {
+        return true;
+    }
+}
+
+// EOF

system/ee/legacy/libraries/Core.php

@@ -74,8 +74,8 @@ public function bootstrap()
 
         // application constants
         define('APP_NAME', 'ExpressionEngine');
-        define('APP_BUILD', '20230330');
-        define('APP_VER', '7.2.13');
+        define('APP_BUILD', '20230405');
+        define('APP_VER', '7.2.14');
         define('APP_VER_ID', '');
         define('SLASH', '/');
         define('LD', '{');

tests/cypress/cypress/integration/members/login.ee6.js

@@ -0,0 +1,40 @@
+/// <reference types="Cypress" />
+const { _, $ } = Cypress
+
+
+context('Member Registration', () => {
+
+    before(function() {
+        cy.task('db:seed')
+
+        cy.eeConfig({ item: 'save_tmpl_files', value: 'y' })
+        cy.eeConfig({ item: 'require_captcha', value: 'n' })
+
+        //copy templates
+		cy.task('filesystem:copy', { from: 'support/templates/*', to: '../../system/user/templates/' }).then(() => {
+            cy.authVisit('admin.php?/cp/design')
+        })
+    })
+
+
+    it('login on front-end', function() {
+        cy.clearCookies()
+        cy.visit('index.php/members/login');
+        cy.get('.sidebar').should('contain', 'Logged out')
+        cy.logFrontendPerformance()
+        cy.intercept("**?ACT=**").as('ajax')
+        cy.get('input[name=username]').clear().type('admin');
+        cy.get('input[name=password]').clear().type('password');
+        cy.get('input[name=submit]').click();
+        cy.hasNoErrors();
+        cy.get('body').should('not.contain', 'errors were encountered')
+
+        cy.get('.sidebar').should('not.contain', 'Logged out')
+        cy.get('.sidebar a').contains('Logout').click()
+        cy.get('button').contains('Logout').click()
+        cy.hasNoErrors();
+        cy.get('body').should('not.contain', 'errors were encountered')
+        cy.get('.sidebar').should('contain', 'Logged out')
+    })
+
+})

tests/cypress/support/config/config.php

@@ -13,7 +13,7 @@
 
 $config['log_date_format'] = 'Y-m-d H:i:s';
 $config['log_threshold'] = '1';
-$config['app_version'] = '7.2.13';
+$config['app_version'] = '7.2.14';
 $config['encryption_key'] = '4b9e521eb02751d8466a3e9b764524aff14b91ad';
 $config['session_crypt_key'] = '1f307a8afe66e692c2689508a5d9f783606379a8';
 $config['base_path'] = $_SERVER['DOCUMENT_ROOT'];

tests/cypress/support/templates/default_site/members.group/_sidebar.html

@@ -1,31 +1,31 @@
 {if logged_in}
 	<p>Logged in as <b>{username}</b></p>
 	<ul>
-		<li><a href="/members/logout">Logout ✔</a></li>
-		<li><a href="/members/delete">Delete</a></li>
-		<li><a href="/members/profile">View Profile</a></li>
-		<li><a href="/members/profile-edit">Edit Profile</a></li>
-		<li><a href="/members/invite">Invite</a></li>
+		<li><a href="{path=members/logout}">Logout ✔</a></li>
+		<li><a href="{path=members/delete}">Delete</a></li>
+		<li><a href="{path=members/profile}">View Profile</a></li>
+		<li><a href="{path=members/profile-edit}">Edit Profile</a></li>
+		<li><a href="{path=members/invite}">Invite</a></li>
 	</ul>
 {if:else}
 	<p>Logged out</p>
 	<ul>
-		<li><a href="/members/login">Login ✔</a>
+		<li><a href="{path=members/login}">Login ✔</a>
 			<ul>
-				<li><a href="/members/forgot-password">Forgot Password ✔</a></li>
-				<li><a href="/members/forgot-username">Forgot Username ✔</a></li>
-				<li><a href="/members/reset-password">Reset Password ✔</a></li>
+				<li><a href="{path=members/forgot-password}">Forgot Password ✔</a></li>
+				<li><a href="{path=members/forgot-username}">Forgot Username ✔</a></li>
+				<li><a href="{path=members/reset-password}">Reset Password ✔</a></li>
 			</ul>
 		</li>
-		<li><a href="/members/registration">Register ✔</a></li>
-		<li><a href="/members/registration-custom">Register - Custom ✔</a></li>
+		<li><a href="{path=members/registration}">Register ✔</a></li>
+		<li><a href="{path=members/registration-custom}">Register - Custom ✔</a></li>
 	</ul>
 {/if}
 
 <ul>
-	<li><a href="/members/members">Members</a></li>
-	<li><a href="/members/search">Search for Members</a></li>
-	<li><a href="/members/results">Search Results</a></li>
-	<li><a href="/members/role-groups">Role Groups</a></li>
-	<li><a href="/members/roles">Roles</a></li>
+	<li><a href="{path=members/members}">Members</a></li>
+	<li><a href="{path=members/search}">Search for Members</a></li>
+	<li><a href="{path=members/results}">Search Results</a></li>
+	<li><a href="{path=members/role-groups}">Role Groups</a></li>
+	<li><a href="{path=members/roles}">Roles</a></li>
 </ul>