Skip to content

Commit 2b3b3d3

Browse files
author
Leonix
committed
Webasyst Framework v.2.8.1
* Fixed photo editing in the user profile after the update to version 2.8.0.
1 parent f5616a9 commit 2b3b3d3

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

wa-apps/installer/lib/config/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
'description' => 'Install new apps from the Webasyst Store',
55
'icon' => 'img/installer.svg',
66
'mobile' => false,
7-
'version' => '2.8.0',
8-
'critical' => '2.8.0',
7+
'version' => '2.8.1',
8+
'critical' => '2.8.1',
99
'system' => true,
1010
'vendor' => 'webasyst',
1111
'csrf' => true,

wa-system/webasyst/lib/actions/profile/webasystProfilePhoto.action.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class webasystProfilePhotoAction extends waViewAction
77
public function execute()
88
{
99
$id = waRequest::request('id', wa()->getUser()->getId(), 'int');
10-
$ui = waRequest::request('id', '1.3', 'int');
10+
$ui = waRequest::request('ui', null, 'string');
1111
$contact = new waContact($id);
1212

1313
// If there is a photo for this contact, show it to crop
@@ -18,10 +18,8 @@ public function execute()
1818
$oldImage = $contact->getPhoto('original');
1919
}
2020

21-
if($ui === '1.3') {
22-
$this->setTemplate('templates/actions-legacy/profile/ProfilePhoto.html');
23-
}else{
24-
$this->setTemplate('templates/actions/profile/ProfilePhoto.html');
21+
if (!empty($ui) && $ui != wa()->whichUI()) {
22+
waRequest::SetParam('force_ui_version', $ui);
2523
}
2624

2725
$this->view->assign(array(

wa-system/webasyst/lib/config/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
return array(
44
'name' => 'Webasyst',
55
'prefix' => 'webasyst',
6-
'version' => '2.8.0',
7-
'critical' => '2.8.0',
6+
'version' => '2.8.1',
7+
'critical' => '2.8.1',
88
'vendor' => 'webasyst',
99
'csrf' => true,
1010
'header_items' => array(

wa-system/webasyst/templates/actions-legacy/profile/ProfilePage.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ <h1>
134134
$('#contact-photo-crop-dialog').remove();
135135
$('<div id="contact-photo-crop-dialog">').appendTo($wrapper).waDialog({
136136
'class': 'large',
137-
url: "?module=profile&action=photo",
137+
url: "?module=profile&action=photo&ui=1.3",
138138
onLoad: function(d) {
139139
// move buttons where appropriate
140140
var $dialog = $(this);

0 commit comments

Comments
 (0)