Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UR-1121 Fix - Conflict with TranslatePress #587

Merged
merged 1 commit into from
Aug 7, 2023
Merged

UR-1121 Fix - Conflict with TranslatePress #587

merged 1 commit into from
Aug 7, 2023

Conversation

lekhnath005
Copy link
Contributor

All Submissions:

Changes proposed in this Pull Request:

When WPML plugin is not installed and TranslatePress plugin activated then got undefined function error. Issue occurs due to previously we were checking wpml installed or not using has_filter but the same filter was used by the TranslatePress then our plugin detect that wpml is installed and it called icl function which is in the wpml plugin and since wpml plugin is not installed then it throws error. This PR fixes this issue.

How to test the changes in this Pull Request:

  1. Install TranslatePress plugin and then translate myaccount page
  2. Try to open myaccount page in different language and validate whether you are not getting any error.

Types of changes:

  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (modification of the currently available functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Other information:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you successfully ran tests with your changes locally?
  • Have you updated the documentation accordingly?

Changelog entry

Fix - Conflict with TranslatePress.

@lekhnath005 lekhnath005 self-assigned this Aug 6, 2023
iamprazol
iamprazol approved these changes Aug 7, 2023
View reviewed changes
Copy link
Member

@iamprazol iamprazol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !! 👍

@iamprazol iamprazol merged commit d5d4a9a into develop Aug 7, 2023
1 check passed
@iamprazol iamprazol deleted the fix/conflict-with-translatepress branch August 7, 2023 04:13
lekhnath005 pushed a commit that referenced this pull request Aug 8, 2023
@lekhnathpandey
Version bump to 3.0.3 for internal release
a958ec7 
Squashed with the following commits :
commit 2c0acb7 (HEAD -> develop, origin/develop)
Author: dipuchaudhary <[email protected]>
Date:   Mon Aug 7 21:13:52 2023 +0545

    Tweak - Header format of mail

commit 8d210aa
Author: Dipu chaudhary <[email protected]>
Date:   Mon Aug 7 17:15:23 2023 +0545

    UR-830 Feature -  Email preview (#551)

    * Tweak - Remove redundant code

    * Add - Preview feature for emails

    * Implemented default template in emails and preview

    * Enhance - Default template added to wrap emails while sending and previewing

    * Sync code to Pro

    * default email template design fixes

    * Tweak - Remove wp header and footer from preview

    * default email template font family set

    * not scrolling when multiple content fixed

    * Tweak - Generate a link to preview and button at top of header

    * Tweak - Extra checks for addons emails

    * Fix - Selected email template not parsing issue due to extra parameter passed to function

    ---------

    Co-authored-by: Prajjwal <[email protected]>
    Co-authored-by: Salim Shrestha <[email protected]>
    Co-authored-by: Ayush Shrestha <[email protected]>
    Co-authored-by: Milan Chaudhary <[email protected]>

commit 9af1c7b
Author: Lekhnath Pandey <[email protected]>
Date:   Mon Aug 7 17:14:46 2023 +0545

    UR-1116 Fix - Lost Password not working for translated myaccount page. (#586)

    * Fix - Lost Password Translation issue

    * Fix - Check current page id while reset password

    ---------

    Co-authored-by: Milan Chaudhary <[email protected]>

commit d5d4a9a
Author: Lekhnath Pandey <[email protected]>
Date:   Mon Aug 7 09:58:04 2023 +0545

    Fix - Conflict with TranslatePress (#587)

commit c85f08f
Author: Lekhnath Pandey <[email protected]>
Date:   Fri Aug 4 10:37:32 2023 +0545

    Fix - Compatibility with all editors (#579)

commit 1405c06
Author: Milan Chaudhary <[email protected]>
Date:   Fri Aug 4 10:33:46 2023 +0545

    Enhancement - Unique id smart tag (#584)

    * Add - Unique id smart tag

    * Add - Filter to change unique id prefix and entropy

    ---------

    Co-authored-by: Prajjwal Poudel <[email protected]>

commit a3aa5e6
Author: Milan Chaudhary <[email protected]>
Date:   Fri Aug 4 10:31:13 2023 +0545

    Fix - add new form and click on scratch and enter any name and cancel the process the form will be created (#578)

commit 8d98d6a
Author: Milan Chaudhary <[email protected]>
Date:   Fri Aug 4 10:30:26 2023 +0545

    Fix - Registration and login page redirection after revisiting these page (#581)

commit afe86fa
Author: Lekhnath Pandey <[email protected]>
Date:   Thu Aug 3 18:14:30 2023 +0545

    Dev - Add Extra parameter in the filter hook user_registration_before_insert_user

commit 076cd60
Author: Lekhnath Pandey <[email protected]>
Date:   Thu Aug 3 18:08:52 2023 +0545

    Fix - Check null for file_exits function

commit 0d753a2
Author: Milan Chaudhary <[email protected]>
Date:   Wed Aug 2 12:28:24 2023 +0545

    Fix - Input box highlighting border color

commit 50d9d06
Author: Milan Chaudhary <[email protected]>
Date:   Wed Aug 2 11:49:27 2023 +0545

    Tweak - Input box highlighting (#582)

commit 20c6d59
Author: Lekhnath Pandey <[email protected]>
Date:   Wed Aug 2 10:52:10 2023 +0545

    Enhance - User Registered Language with Smart Tag (#585)

commit 42b4efc
Merge: cb29f48 45ca49d
Author: Lekhnath Pandey <[email protected]>
Date:   Wed Jul 19 14:17:49 2023 +0545

    Merge master into develop branch

commit cb29f48
Author: Lekhnath Pandey <[email protected]>
Date:   Tue Jul 18 17:41:42 2023 +0545

    Fix - Typecasting issue in myaccount tag state

commit c193a7b
Author: Lekhnath Pandey <[email protected]>
Date:   Wed Jul 12 15:01:22 2023 +0545

    Dev - Add filter to modify smart tag content
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iamprazol iamprazol iamprazol approved these changes

Assignees

@lekhnath005 lekhnath005

Labels
Approved bug Merged Tested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lekhnath005 @iamprazol @lekhnathpandey