diff --git a/applications/blog/data/javascript.xml b/applications/blog/data/javascript.xml index 2418d637..1674c016 100644 --- a/applications/blog/data/javascript.xml +++ b/applications/blog/data/javascript.xml @@ -1,6 +1,6 @@ - - {{#lang}}manage_cats_new_row{{/lang}}\ "); @@ -291,9 +291,9 @@ ips.templates.set('blog.view.categoryRow', "\ {{#lang}}save{{/lang}}\ {{#lang}}cancel{{/lang}}\ \ -
\ - \ - \ +
\ + \ + \
\ \ "); diff --git a/applications/blog/data/lang.xml b/applications/blog/data/lang.xml index 8eec5cd6..804132ed 100644 --- a/applications/blog/data/lang.xml +++ b/applications/blog/data/lang.xml @@ -1,6 +1,6 @@ - + Blogs Blogs a comment on a blog entry diff --git a/applications/blog/data/theme.xml b/applications/blog/data/theme.xml index 26c58042..9fe8036c 100644 --- a/applications/blog/data/theme.xml +++ b/applications/blog/data/theme.xml @@ -1108,6 +1108,8 @@ {{endif}} {{endif}} {{$commentCount++;}} + + {$comment->html()|raw} {{endforeach}} {{else}} diff --git a/applications/blog/data/versions.json b/applications/blog/data/versions.json index dd4e2581..9e38f4d6 100644 --- a/applications/blog/data/versions.json +++ b/applications/blog/data/versions.json @@ -278,5 +278,6 @@ "5000026": "5.0.0 Beta 1", "5000027": "5.0.0 Beta 2", "5000028": "5.0.0 Beta 2", - "5000029": "5.0.0 Beta 3" + "5000029": "5.0.0 Beta 3", + "5000030": "5.0.0 Beta 4" } \ No newline at end of file diff --git a/applications/blog/setup/upg_5000030/data.json b/applications/blog/setup/upg_5000030/data.json new file mode 100644 index 00000000..9cbfdd91 --- /dev/null +++ b/applications/blog/setup/upg_5000030/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000030, + "name": "5.0.0 Beta 4", + "steps": { + "queries": false, + "lang": false, + "theme": true, + "themeeditor": true, + "javascript": true, + "emailTemplates": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_5000030/javascript.json b/applications/blog/setup/upg_5000030/javascript.json new file mode 100644 index 00000000..1975bc65 --- /dev/null +++ b/applications/blog/setup/upg_5000030/javascript.json @@ -0,0 +1,14 @@ +{ + "files": { + "added": [], + "edited": [ + "blog\/front\/templates\/ips.templates.view.js" + ], + "removed": [] + }, + "orders": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_5000030/theme.json b/applications/blog/setup/upg_5000030/theme.json new file mode 100644 index 00000000..10f19b57 --- /dev/null +++ b/applications/blog/setup/upg_5000030/theme.json @@ -0,0 +1,19 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/view\/comments" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_5000030/themeeditor.json b/applications/blog/setup/upg_5000030/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000030/themeeditor.json @@ -0,0 +1,14 @@ +{ + "categories": { + "added": [], + "edited": [], + "removed": [] + }, + "settings": { + "added": [], + "edited": [ + "layout_blog_view" + ], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/sources/Entry/Comment.php b/applications/blog/sources/Entry/Comment.php index 2ed7858d..072130aa 100644 --- a/applications/blog/sources/Entry/Comment.php +++ b/applications/blog/sources/Entry/Comment.php @@ -169,12 +169,18 @@ class Comment extends ContentComment implements Embeddable, public static function modPermission( string $type, Member $member = NULL, Model $container = NULL ): bool { $member = $member ?: Member::loggedIn(); + + if( parent::modPermission( $type, $member, $container ) ) + { + return true; + } + if ( in_array( $type, array( 'edit', 'delete', 'lock' ) ) and $container and $container->member_id === $member->member_id ) { return $member->group['g_blog_allowownmod']; } - return parent::modPermission( $type, $member, $container ); + return false; } /** diff --git a/applications/calendar/data/javascript.xml b/applications/calendar/data/javascript.xml index f9dbd13a..3d21bdfe 100644 --- a/applications/calendar/data/javascript.xml +++ b/applications/calendar/data/javascript.xml @@ -1,6 +1,6 @@ - - - - - - - - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -2113,7 +2113,7 @@ var PER_PAGE = 16; }); }(jQuery, _)); -
\ ");]]> -
diff --git a/applications/calendar/data/lang.xml b/applications/calendar/data/lang.xml index a8400b85..960b20a2 100644 --- a/applications/calendar/data/lang.xml +++ b/applications/calendar/data/lang.xml @@ -1,6 +1,6 @@ - + Events Events a comment on an event diff --git a/applications/calendar/data/theme.xml b/applications/calendar/data/theme.xml index 7b64ba08..da83c1f9 100644 --- a/applications/calendar/data/theme.xml +++ b/applications/calendar/data/theme.xml @@ -1311,26 +1311,26 @@ {{endif}}
  • -
    • - {$comment->dateLine()|raw} + {{if ! \IPS\Output::i()->reduceLinks()}}{{endif}}{$comment->dateLine()|raw}{{if ! \IPS\Output::i()->reduceLinks()}}{{endif}} {{if $comment->editLine()}} ({lang="edited_lc"}) {{endif}} @@ -791,7 +791,9 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $comment->getVi {{endif}}
    {{endif}} - {template="sharemenu" group="global" app="core" params="$comment"} + {{if ! \IPS\Output::i()->reduceLinks()}} + {template="sharemenu" group="global" app="core" params="$comment"} + {{endif}} ]]> @@ -897,7 +900,7 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $comment->getVi
    {{foreach $record->badges() as $badge}}{$badge|raw}{{endforeach}}
    {{if $record::database()->options['reviews']}} -
    {template="rating" group="global" location="front" app="core" params="'', $record->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of, $record->memberReviewRating()"} ({lang="num_reviews" pluralize="$record->reviews"})
    +
    {template="rating" group="global" location="front" app="core" params="'', $record->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of, $record->memberReviewRating()"} ({lang="num_reviews" pluralize="$record->record_reviews"})
    {{elseif $record->container()->allow_rating}}
    {$record->rating()|raw}
    {{endif}} @@ -1105,10 +1108,11 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $review->getVie {lang="report"} {{endif}} + {{if ! \IPS\Output::i()->reduceLinks()}}
  • - 'findReview', 'review' => $review->id ) )}' title='{lang="share_this_review"}' data-ipsDialog data-ipsDialog-size='narrow' data-ipsDialog-content='#elShareReview_{$review->id}_menu' data-ipsDialog-title="{lang="share_this_review"}" id='elShareReview_{$review->id}' data-role='shareComment'>{lang="share_this_review"} + {lang="share_this_review"}
    • - + {{endif}} {{if $review->canEdit() || ( $review->hidden() == -2 AND \IPS\Member::loggedIn()->modPermission('can_manage_deleted_content') ) || ( \IPS\IPS::classUsesTrait( $review, 'IPS\Content\Hideable' ) && ( ( !$review->hidden() and $review->canHide() ) || ( $review->hidden() and $review->canUnhide() ) ) ) || $review->canDelete()}}
    • {{endif}} @@ -1249,7 +1253,9 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $review->getVie {{endif}} {{endif}} + {{if ! \IPS\Output::i()->reduceLinks()}} {template="sharemenu" group="global" app="core" params="$review"} + {{endif}} ]]>