ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-26 03:30:48 +03:00
Code Issues Releases Wiki Activity

Merge pull request #865 from Xmk/chiffa

Browse source 
мелкие правки
This commit is contained in:
Maxim Mzhelskiy 2017-03-23 11:20:52 +07:00 committed by GitHub
parent 930cffcbc5 9e423cede5
commit b20d65354d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/classes/modules/user/entity/User.entity.class.php
View file

@ -484,7 +484,7 @@ class ModuleUser_EntityUser extends Entity
} }
if ($this->getProfileAvatar()) { if ($this->getProfileAvatar()) {
return $this->Media_GetImageWebPath($this->getProfileAvatar(), $iSize); return $this->Media_GetImageWebPath($this->getProfileAvatar(), $iSize) . '?' . date('His', strtotime($this->getProfileDate()));
} else { } else {
return $this->Media_GetImagePathBySize(Router::GetFixPathWeb(Config::Get('path.skin.assets.web')) . '/images/avatars/avatar_' . ($this->getProfileSex() == 'woman' ? 'female' : 'male') . '.png', return $this->Media_GetImagePathBySize(Router::GetFixPathWeb(Config::Get('path.skin.assets.web')) . '/images/avatars/avatar_' . ($this->getProfileSex() == 'woman' ? 'female' : 'male') . '.png',
$iSize); $iSize);

4
application/frontend/components/topic/topic-add.tpl
View file

@ -10,7 +10,7 @@
{component_define_params params=[ 'topic', 'type', 'skipBlogs', 'blogs', 'classes' ]} {component_define_params params=[ 'topic', 'type', 'skipBlogs', 'blogs', 'classes' ]}
<form action="" method="POST" enctype="multipart/form-data" id="topic-add-form" class="{$classes} js-form-validate" data-content-action="{( $topic ) ? 'edit' : 'add'}"> <form action="" method="POST" enctype="multipart/form-data" id="topic-add-form" class="{$classes} js-form-validate" data-content-action="{( $topic ) ? 'edit' : 'add'}">
{hook run="form_add_topic_begin"} {hook run="form_add_topic_begin" topic=$topic}
{block 'add_topic_form_begin'}{/block} {block 'add_topic_form_begin'}{/block}
{* Выбор блога *} {* Выбор блога *}
@ -158,7 +158,7 @@
{block 'add_topic_form_end'}{/block} {block 'add_topic_form_end'}{/block}
{hook run="form_add_topic_end"} {hook run="form_add_topic_end" topic=$topic}
{* Скрытые поля *} {* Скрытые поля *}

2
application/frontend/skin/developer/assets/js/init.js
View file

@ -392,7 +392,7 @@ jQuery(document).ready(function($){
}, },
changeavatar: function ( event, _this, avatars ) { 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() ); $( '.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() );
} }
}); });