Webasyst Framework v.2.8.1

* Fixed photo editing in the user profile after the update to version 2.8.0.
webasyst · Mar 23, 2023 · 2b3b3d3 · 2b3b3d3
1 parent f5616a9
commit 2b3b3d3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/wa-apps/installer/lib/config/app.php b/wa-apps/installer/lib/config/app.php
@@ -4,8 +4,8 @@
     'description' => 'Install new apps from the Webasyst Store',
     'icon'        => 'img/installer.svg',
     'mobile'      => false,
-    'version'     => '2.8.0',
-    'critical'    => '2.8.0',
+    'version'     => '2.8.1',
+    'critical'    => '2.8.1',
     'system'      => true,
     'vendor'      => 'webasyst',
     'csrf'        => true,

diff --git a/wa-system/webasyst/lib/actions/profile/webasystProfilePhoto.action.php b/wa-system/webasyst/lib/actions/profile/webasystProfilePhoto.action.php
@@ -7,7 +7,7 @@ class webasystProfilePhotoAction extends waViewAction
     public function execute()
     {
         $id = waRequest::request('id', wa()->getUser()->getId(), 'int');
-        $ui = waRequest::request('id', '1.3', 'int');
+        $ui = waRequest::request('ui', null, 'string');
         $contact = new waContact($id);
 
         // If there is a photo for this contact, show it to crop
@@ -18,10 +18,8 @@ public function execute()
             $oldImage = $contact->getPhoto('original');
         }
 
-        if($ui === '1.3') {
-            $this->setTemplate('templates/actions-legacy/profile/ProfilePhoto.html');
-        }else{
-            $this->setTemplate('templates/actions/profile/ProfilePhoto.html');
+        if (!empty($ui) && $ui != wa()->whichUI()) {
+            waRequest::SetParam('force_ui_version', $ui);
         }
 
         $this->view->assign(array(

diff --git a/wa-system/webasyst/lib/config/app.php b/wa-system/webasyst/lib/config/app.php
@@ -3,8 +3,8 @@
 return array(
     'name'         => 'Webasyst',
     'prefix'       => 'webasyst',
-    'version'      => '2.8.0',
-    'critical'     => '2.8.0',
+    'version'      => '2.8.1',
+    'critical'     => '2.8.1',
     'vendor'       => 'webasyst',
     'csrf'         => true,
     'header_items' => array(

diff --git a/wa-system/webasyst/templates/actions-legacy/profile/ProfilePage.html b/wa-system/webasyst/templates/actions-legacy/profile/ProfilePage.html
@@ -134,7 +134,7 @@ <h1>
             $('#contact-photo-crop-dialog').remove();
             $('<div id="contact-photo-crop-dialog">').appendTo($wrapper).waDialog({
                 'class': 'large',
-                url: "?module=profile&action=photo",
+                url: "?module=profile&action=photo&ui=1.3",
                 onLoad: function(d) {
                     // move buttons where appropriate
                     var $dialog = $(this);