Skip to content

Commit

Permalink
Merge branch 'dev' into fix/i18n-dashboard-language-and-slugs
Browse files Browse the repository at this point in the history
  • Loading branch information
ideadude committed Apr 16, 2024
2 parents 647716d + 9e9852e commit e023c83
Show file tree
Hide file tree
Showing 23 changed files with 2,222 additions and 376 deletions.
6 changes: 6 additions & 0 deletions .changelogs/fix_2610-allow-style-tag-iframe.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
significance: patch
type: fixed
links:
- "#2610"
entry: Allows the style tag when embedding content (iframe), in order to support
more services.
5 changes: 5 additions & 0 deletions .changelogs/fix_course-builder-auto-draft-title-edit-1.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
significance: patch
type: fixed
links:
- "#2607"
entry: Removes non-working editing of course title in the Course Builder.
6 changes: 6 additions & 0 deletions .changelogs/fix_course-builder-auto-draft-title-edit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
significance: patch
type: fixed
links:
- "#2606"
entry: Avoid issue with lost content when the course builder is launched
immediately after creating a new course.
307 changes: 118 additions & 189 deletions .wordpress-org/readme/05-description.md

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
LifterLMS Changelog
===================

v7.5.3 - 2024-02-22
-------------------

##### Bug Fixes

+ Fix fatal error when rendering single course page with reviews enabled. [#2604](https://github.com/gocodebox/lifterlms/issues/2604)


v7.5.2 - 2024-02-16
-------------------

Expand Down
37 changes: 19 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,14 @@ Endless thanks to all our incredible contributors!
<a href="https://github.com/pondermatic"><img src="https://avatars.githubusercontent.com/u/5377968?v=4" title="pondermatic" width="80" height="80"></a>
<a href="https://github.com/therealmarknelson"><img src="https://avatars.githubusercontent.com/u/5050601?v=4" title="therealmarknelson" width="80" height="80"></a>
<a href="https://github.com/PSmolic"><img src="https://avatars.githubusercontent.com/u/4542049?v=4" title="PSmolic" width="80" height="80"></a>
<a href="https://github.com/ideadude"><img src="https://avatars.githubusercontent.com/u/33220397?v=4" title="ideadude" width="80" height="80"></a>
<a href="https://github.com/actuallyakash"><img src="https://avatars.githubusercontent.com/u/18614782?v=4" title="actuallyakash" width="80" height="80"></a>
<a href="https://github.com/actual-saurabh"><img src="https://avatars.githubusercontent.com/u/1739834?v=4" title="actual-saurabh" width="80" height="80"></a>
<a href="https://github.com/ideadude"><img src="https://avatars.githubusercontent.com/u/33220397?v=4" title="ideadude" width="80" height="80"></a>
<a href="https://github.com/seothemes"><img src="https://avatars.githubusercontent.com/u/24793388?v=4" title="seothemes" width="80" height="80"></a>
<a href="https://github.com/bmatt468"><img src="https://avatars.githubusercontent.com/u/8673706?v=4" title="bmatt468" width="80" height="80"></a>
<a href="https://github.com/kimcoleman"><img src="https://avatars.githubusercontent.com/u/5312875?v=4" title="kimcoleman" width="80" height="80"></a>
<a href="https://github.com/chrisbadgett"><img src="https://avatars.githubusercontent.com/u/12163552?v=4" title="chrisbadgett" width="80" height="80"></a>
<a href="https://github.com/brianhogg"><img src="https://avatars.githubusercontent.com/u/627497?v=4" title="brianhogg" width="80" height="80"></a>
<a href="https://github.com/MaximilianoRicoTabo"><img src="https://avatars.githubusercontent.com/u/1678457?v=4" title="MaximilianoRicoTabo" width="80" height="80"></a>
<a href="https://github.com/alimathis"><img src="https://avatars.githubusercontent.com/u/16086976?v=4" title="alimathis" width="80" height="80"></a>
<a href="https://github.com/nrherron92"><img src="https://avatars.githubusercontent.com/u/47434271?v=4" title="nrherron92" width="80" height="80"></a>
Expand All @@ -120,26 +121,26 @@ Endless thanks to all our incredible contributors!
<a href="https://github.com/AndreaBarghigiani"><img src="https://avatars.githubusercontent.com/u/190159?v=4" title="AndreaBarghigiani" width="80" height="80"></a>
<a href="https://github.com/yojance"><img src="https://avatars.githubusercontent.com/u/1916064?v=4" title="yojance" width="80" height="80"></a>
<a href="https://github.com/tpkemme"><img src="https://avatars.githubusercontent.com/u/3424234?v=4" title="tpkemme" width="80" height="80"></a>
<a href="https://github.com/paulgoodchild"><img src="https://avatars.githubusercontent.com/u/10562196?v=4" title="paulgoodchild" width="80" height="80"></a>
<a href="https://github.com/wenchen"><img src="https://avatars.githubusercontent.com/u/959457?v=4" title="wenchen" width="80" height="80"></a>
<a href="https://github.com/mcguffin"><img src="https://avatars.githubusercontent.com/u/402988?v=4" title="mcguffin" width="80" height="80"></a>
<a href="https://github.com/dineshchouhan"><img src="https://avatars.githubusercontent.com/u/15683967?v=4" title="dineshchouhan" width="80" height="80"></a>
<a href="https://github.com/yumashev"><img src="https://avatars.githubusercontent.com/u/37841388?v=4" title="yumashev" width="80" height="80"></a>
<a href="https://github.com/jasonyingling"><img src="https://avatars.githubusercontent.com/u/4986487?v=4" title="jasonyingling" width="80" height="80"></a>
<a href="https://github.com/mrosati84"><img src="https://avatars.githubusercontent.com/u/855068?v=4" title="mrosati84" width="80" height="80"></a>
<a href="https://github.com/nicolas-jaussaud"><img src="https://avatars.githubusercontent.com/u/33153717?v=4" title="nicolas-jaussaud" width="80" height="80"></a>
<a href="https://github.com/ThePikJoker"><img src="https://avatars.githubusercontent.com/u/16877156?v=4" title="ThePikJoker" width="80" height="80"></a>
<a href="https://github.com/tnorthcutt"><img src="https://avatars.githubusercontent.com/u/796639?v=4" title="tnorthcutt" width="80" height="80"></a>
<a href="https://github.com/mcguffin"><img src="https://avatars.githubusercontent.com/u/402988?v=4" title="mcguffin" width="80" height="80"></a>
<a href="https://github.com/wenchen"><img src="https://avatars.githubusercontent.com/u/959457?v=4" title="wenchen" width="80" height="80"></a>
<a href="https://github.com/paulgoodchild"><img src="https://avatars.githubusercontent.com/u/10562196?v=4" title="paulgoodchild" width="80" height="80"></a>
<a href="https://github.com/hovpoghosyan"><img src="https://avatars.githubusercontent.com/u/9405480?v=4" title="hovpoghosyan" width="80" height="80"></a>
<a href="https://github.com/matthalliday"><img src="https://avatars.githubusercontent.com/u/249506?v=4" title="matthalliday" width="80" height="80"></a>
<a href="https://github.com/nhandl3"><img src="https://avatars.githubusercontent.com/u/1247539?v=4" title="nhandl3" width="80" height="80"></a>
<a href="https://github.com/Nikschavan"><img src="https://avatars.githubusercontent.com/u/2931091?v=4" title="Nikschavan" width="80" height="80"></a>
<a href="https://github.com/reedhewitt"><img src="https://avatars.githubusercontent.com/u/957141?v=4" title="reedhewitt" width="80" height="80"></a>
<a href="https://github.com/sapayth"><img src="https://avatars.githubusercontent.com/u/15567340?v=4" title="sapayth" width="80" height="80"></a>
<a href="https://github.com/sekanderb"><img src="https://avatars.githubusercontent.com/u/3262638?v=4" title="sekanderb" width="80" height="80"></a>
<a href="https://github.com/edent"><img src="https://avatars.githubusercontent.com/u/837136?v=4" title="edent" width="80" height="80"></a>
<a href="https://github.com/AlexVCS"><img src="https://avatars.githubusercontent.com/u/49458917?v=4" title="AlexVCS" width="80" height="80"></a>
<a href="https://github.com/tnorthcutt"><img src="https://avatars.githubusercontent.com/u/796639?v=4" title="tnorthcutt" width="80" height="80"></a>
<a href="https://github.com/ThePikJoker"><img src="https://avatars.githubusercontent.com/u/16877156?v=4" title="ThePikJoker" width="80" height="80"></a>
<a href="https://github.com/nicolas-jaussaud"><img src="https://avatars.githubusercontent.com/u/33153717?v=4" title="nicolas-jaussaud" width="80" height="80"></a>
<a href="https://github.com/mrosati84"><img src="https://avatars.githubusercontent.com/u/855068?v=4" title="mrosati84" width="80" height="80"></a>
<a href="https://github.com/jasonyingling"><img src="https://avatars.githubusercontent.com/u/4986487?v=4" title="jasonyingling" width="80" height="80"></a>
<a href="https://github.com/yumashev"><img src="https://avatars.githubusercontent.com/u/37841388?v=4" title="yumashev" width="80" height="80"></a>
<a href="https://github.com/sujaypawar"><img src="https://avatars.githubusercontent.com/u/2222249?v=4" title="sujaypawar" width="80" height="80"></a>
<a href="https://github.com/AlexVCS"><img src="https://avatars.githubusercontent.com/u/49458917?v=4" title="AlexVCS" width="80" height="80"></a>
<a href="https://github.com/edent"><img src="https://avatars.githubusercontent.com/u/837136?v=4" title="edent" width="80" height="80"></a>
<a href="https://github.com/sekanderb"><img src="https://avatars.githubusercontent.com/u/3262638?v=4" title="sekanderb" width="80" height="80"></a>
<a href="https://github.com/sapayth"><img src="https://avatars.githubusercontent.com/u/15567340?v=4" title="sapayth" width="80" height="80"></a>
<a href="https://github.com/reedhewitt"><img src="https://avatars.githubusercontent.com/u/957141?v=4" title="reedhewitt" width="80" height="80"></a>
<a href="https://github.com/Nikschavan"><img src="https://avatars.githubusercontent.com/u/2931091?v=4" title="Nikschavan" width="80" height="80"></a>
<a href="https://github.com/nhandl3"><img src="https://avatars.githubusercontent.com/u/1247539?v=4" title="nhandl3" width="80" height="80"></a>
<a href="https://github.com/matthalliday"><img src="https://avatars.githubusercontent.com/u/249506?v=4" title="matthalliday" width="80" height="80"></a>
<a href="https://github.com/kamalahmed"><img src="https://avatars.githubusercontent.com/u/6803549?v=4" title="kamalahmed" width="80" height="80"></a>
<a href="https://github.com/moorscode"><img src="https://avatars.githubusercontent.com/u/2005352?v=4" title="moorscode" width="80" height="80"></a>
<a href="https://github.com/iTechsTR"><img src="https://avatars.githubusercontent.com/u/33372714?v=4" title="iTechsTR" width="80" height="80"></a>
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/addons/LifterLMS-Notes-add-on.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion class-lifterlms.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ final class LifterLMS {
*
* @var string
*/
public $version = '7.5.2';
public $version = '7.5.3';

/**
* LLMS_Assets instance
Expand Down
1 change: 1 addition & 0 deletions includes/abstracts/abstract.llms.post.model.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ protected function allowed_post_tags_set() {
'height' => true,
'src' => true,
'width' => true,
'style' => true,
);
}

Expand Down
15 changes: 12 additions & 3 deletions includes/admin/class.llms.admin.builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@ private static function get_template( $template, $vars = array() ) {
*/
public static function handle_ajax( $request ) {

// @todo Do some real error handling here.
if ( ! $request['course_id'] || ! current_user_can( 'edit_course', $request['course_id'] ) ) {
return array();
}
Expand Down Expand Up @@ -561,13 +560,23 @@ public static function output() {

$post = get_post( $course_id );

$course = llms_get_post( $post );

if ( ! current_user_can( 'edit_course', $course_id ) ) {
_e( 'You cannot edit this course!', 'lifterlms' );
return;
}

if ( 'auto-draft' === $post->post_status ) {
wp_update_post(
array(
'ID' => $course_id,
'post_status' => 'draft',
'post_title' => __( 'New Course', 'lifterlms' ),
)
);
}

$course = llms_get_post( $post );

remove_all_actions( 'the_title' );
remove_all_actions( 'the_content' );

Expand Down
1 change: 0 additions & 1 deletion includes/admin/views/builder/assignment.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php
/**
* Assignment template
* Please give us your money <3
*
* @since 3.17.0
* @version 3.17.0
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/views/builder/course.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<header class="llms-builder-header llms-course-header">

<h1 class="llms-headline">
<span class="llms-input llms-editable-title" contenteditable="true" data-original-content="{{{ data.get( 'title' ) }}}" data-required="required" type="text">{{{ data.get( 'title' ) }}}</span>
<span data-original-content="{{{ data.get( 'title' ) }}}" data-required="required" type="text">{{{ data.get( 'title' ) }}}</span>
</h1>

<div class="llms-action-icons static">
Expand Down
2 changes: 1 addition & 1 deletion includes/class.llms.review.php
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public function process_review() {
* @param int $parent_id The ID of the parent post.
* @return bool True if the user can write a review, false if not.
*/
public function current_user_can_write_review( $parent_id ) {
public static function current_user_can_write_review( $parent_id ) {
// Make sure the user is logged in.
if ( ! is_user_logged_in() ) {
return false;
Expand Down
10 changes: 5 additions & 5 deletions languages/lifterlms.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# This file is distributed under the GPLv3.
msgid ""
msgstr ""
"Project-Id-Version: LifterLMS 7.5.2\n"
"Project-Id-Version: LifterLMS 7.5.3\n"
"Report-Msgid-Bugs-To: https://lifterlms.com/my-account/my-tickets\n"
"Last-Translator: Team LifterLMS <team@lifterlms.com>\n"
"Language-Team: Team LifterLMS <team@lifterlms.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2024-02-16T09:51:55+00:00\n"
"POT-Creation-Date: 2024-02-22T15:09:08+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: llms/dev 0.2.1\n"
"X-Domain: lifterlms\n"
Expand Down Expand Up @@ -34025,17 +34025,17 @@ msgstr ""
msgid "\"%s\" is required."
msgstr ""

#: libraries/lifterlms-rest/includes/models/class-llms-rest-webhook.php:136
#: libraries/lifterlms-rest/includes/models/class-llms-rest-webhook.php:128
msgid "M j, Y @ H:i"
msgstr ""

#. Translators: %s = Error message.
#: libraries/lifterlms-rest/includes/models/class-llms-rest-webhook.php:409
#: libraries/lifterlms-rest/includes/models/class-llms-rest-webhook.php:386
msgid "Could not reach the delivery url: \"%s\"."
msgstr ""

#. Translators: %d = Response code.
#: libraries/lifterlms-rest/includes/models/class-llms-rest-webhook.php:414
#: libraries/lifterlms-rest/includes/models/class-llms-rest-webhook.php:391
msgid "The delivery url returned the response code \"%d\"."
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion lifterlms.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Plugin Name: LifterLMS
* Plugin URI: https://lifterlms.com/
* Description: Complete e-learning platform to sell online courses, protect lessons, offer memberships, and quiz students.
* Version: 7.5.2
* Version: 7.5.3
* Author: LifterLMS
* Author URI: https://lifterlms.com/
* Text Domain: lifterlms
Expand Down

0 comments on commit e023c83

Please sign in to comment.