From 64f7bf3008080985d2e211e3c8428522ef5a68b4 Mon Sep 17 00:00:00 2001 From: Chiffa Date: Wed, 22 Mar 2017 02:12:46 +0500 Subject: [PATCH 1/3] topic add hook params --- application/frontend/components/topic/topic-add.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/frontend/components/topic/topic-add.tpl b/application/frontend/components/topic/topic-add.tpl index a59dfede..3e3f0993 100644 --- a/application/frontend/components/topic/topic-add.tpl +++ b/application/frontend/components/topic/topic-add.tpl @@ -10,7 +10,7 @@ {component_define_params params=[ 'topic', 'type', 'skipBlogs', 'blogs', 'classes' ]}
- {hook run="form_add_topic_begin"} + {hook run="form_add_topic_begin" topic=$topic} {block 'add_topic_form_begin'}{/block} {* Выбор блога *} @@ -158,7 +158,7 @@ {block 'add_topic_form_end'}{/block} - {hook run="form_add_topic_end"} + {hook run="form_add_topic_end" topic=$topic} {* Скрытые поля *} From 537cb3fc859ee77c14ab27d7f04c74082873a32c Mon Sep 17 00:00:00 2001 From: Chiffa Date: Wed, 22 Mar 2017 02:13:23 +0500 Subject: [PATCH 2/3] fix userbar update avatar --- application/frontend/skin/developer/assets/js/init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/frontend/skin/developer/assets/js/init.js b/application/frontend/skin/developer/assets/js/init.js index e364f48b..bf250daa 100644 --- a/application/frontend/skin/developer/assets/js/init.js +++ b/application/frontend/skin/developer/assets/js/init.js @@ -392,7 +392,7 @@ jQuery(document).ready(function($){ }, changeavatar: function ( event, _this, avatars ) { $( '.js-user-profile-avatar, .js-wall-entry[data-user-id=' + _this.option( 'params.target_id' ) + '] .ls-comment-avatar img' ).attr( 'src', avatars[ '64crop' ] + '?' + Math.random() ); - $( '.nav-item--userbar-username img' ).attr( 'src', avatars[ '24crop' ] + '?' + Math.random() ); + $( '.ls-nav-item--userbar-username img' ).attr( 'src', avatars[ '24crop' ] + '?' + Math.random() ); } }); From 9e423cede501eb8a8c772ea216eb68157473621c Mon Sep 17 00:00:00 2001 From: Chiffa Date: Wed, 22 Mar 2017 02:14:10 +0500 Subject: [PATCH 3/3] fix cached user avatar --- application/classes/modules/user/entity/User.entity.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/classes/modules/user/entity/User.entity.class.php b/application/classes/modules/user/entity/User.entity.class.php index 3304f7cc..95365975 100644 --- a/application/classes/modules/user/entity/User.entity.class.php +++ b/application/classes/modules/user/entity/User.entity.class.php @@ -484,7 +484,7 @@ class ModuleUser_EntityUser extends Entity } if ($this->getProfileAvatar()) { - return $this->Media_GetImageWebPath($this->getProfileAvatar(), $iSize); + return $this->Media_GetImageWebPath($this->getProfileAvatar(), $iSize) . '?' . date('His', strtotime($this->getProfileDate())); } else { return $this->Media_GetImagePathBySize(Router::GetFixPathWeb(Config::Get('path.skin.assets.web')) . '/images/avatars/avatar_' . ($this->getProfileSex() == 'woman' ? 'female' : 'male') . '.png', $iSize);