PHP 8.1 fix, исправлена инициализация редакторов при загрузке фото в …

…альбомы, ScssPhp обновлён до актуальной версии.
manguro-code · Dec 14, 2021 · b0fbaf7 · b0fbaf7
1 parent 2401122
commit b0fbaf7
Show file tree

Hide file tree

Showing 14 changed files with 513 additions and 261 deletions.
diff --git a/system/config/theme_modern.yml b/system/config/theme_modern.yml
@@ -82,4 +82,7 @@ custom_scss:
   danger:
   light:
   dark:
-vars: null
+vars:
+  - 
+    name: dropdown-item-padding-x
+    value: 1rem
diff --git a/system/controllers/content/frontend.php b/system/controllers/content/frontend.php
diff --git a/system/controllers/photos/actions/upload.php b/system/controllers/photos/actions/upload.php
@@ -91,6 +91,7 @@ public function showUploadForm() {
             'editor'  => $this->options['editor'],
             'presets' => $this->options['editor_presets']
         ]);
+        $editor_params['options']['id'] = false;
 
         if ($this->request->has('submit')) {
 

diff --git a/system/controllers/rating/model.php b/system/controllers/rating/model.php
@@ -88,18 +88,25 @@ public function getVotes() {
 
         return $this->get('rating_log', function ($item, $model) {
 
-            $item['ip'] = string_bintoip($item['ip']);
+            $guest_nickname = LANG_GUEST;
 
-            // формируем номер гостя
-            $_okets4 = explode('.', $item['ip']);
-            $_okets6 = explode(':', $item['ip']);
+            if($item['ip']) {
 
-            $item['user'] = array(
+                $item['ip'] = string_bintoip($item['ip']);
+
+                // формируем номер гостя
+                $_okets4 = explode('.', $item['ip']);
+                $_okets6 = explode(':', $item['ip']);
+
+                $guest_nickname .= ' №' . array_sum(array_merge($_okets4, $_okets6));
+            }
+
+            $item['user'] = [
                 'id'       => $item['user_id'],
                 'slug'     => $item['user_slug'],
-                'nickname' => (!empty($item['user_nickname']) ? $item['user_nickname'] : LANG_GUEST . ' №' . array_sum(array_merge($_okets4, $_okets6))),
+                'nickname' => (!empty($item['user_nickname']) ? $item['user_nickname'] : $guest_nickname),
                 'avatar'   => $item['user_avatar']
-            );
+            ];
 
             return $item;
         });