Просмотр исходного кода

Merge branch 'master' of https://github.com/unacms/UNA

AntonLV 2 месяцев назад
Родитель
Сommit
6127227b4b
3 измененных файлов с 13 добавлено и 13 удалено
  1. 1 1
      inc/classes/BxDolPage.php
  2. 2 2
      package.json
  3. 10 10
      yarn.lock

+ 1 - 1
inc/classes/BxDolPage.php

@@ -532,7 +532,7 @@ class BxDolPage extends BxDolFactory implements iBxDolFactoryObject, iBxDolRepla
                     } else {
                         $sSeoTitle = $oContentInfo->getContentTitle($sSeoParamValue);
                     }
-                    if (!$sSeoTitle)
+                    if (empty($sSeoTitle))
                         $sSeoTitle = base_convert((string)sprintf('%u', crc32($sSeoParamValue . BX_DOL_SECRET)), 10, 36);
                 }
                 elseif ('profile_id' == $sSeoParamName) {

+ 2 - 2
package.json

@@ -27,14 +27,14 @@
     "flatpickr": "^4.6.13",
     "flickity": "^3.0.0",
     "fullcalendar": "^6.1.21",
-    "grapesjs": "^0.23.4",
+    "grapesjs": "^0.23.5",
     "grapesjs-blocks-basic": "^1.0.2",
     "grapesjs-preset-newsletter": "^1.0.2",
     "grapesjs-preset-webpage": "^1.0.3",
     "grapesjs-style-bg": "^2.0.2",
     "headroom.js": "^0.12.0",
     "highlight.js": "github:highlightjs/highlight.js",
-    "hls.js": "^1.6.17",
+    "hls.js": "^1.7.0",
     "htmx-ext-head-support": "^2.0.5",
     "htmx-ext-preload": "^2.1.2",
     "htmx.org": "^2.0.10",

+ 10 - 10
yarn.lock

@@ -1644,10 +1644,10 @@ grapesjs-style-gradient@^3.0.1:
   dependencies:
     grapick "^0.1.13"
 
-grapesjs@^0.23.4:
-  version "0.23.4"
-  resolved "https://registry.yarnpkg.com/grapesjs/-/grapesjs-0.23.4.tgz#cea8831b3d373001a4aafa13ccdaef41072786f6"
-  integrity sha512-fe3+ZRU1YsR8cFqdjl0TFlNywgBPjlQjDLevyavP8UmT9dfVla5JnfQrFc66gzMBdN1ftNPA23YRdTQJRFTKQA==
+grapesjs@^0.23.5:
+  version "0.23.5"
+  resolved "https://registry.yarnpkg.com/grapesjs/-/grapesjs-0.23.5.tgz#6b5015429af57943e38a603dcca1b5d17d215d61"
+  integrity sha512-66E5x5ZWJUGMQkL/BfFK6oyuFdXAMpsG15+6atiTPbB/Wf4ChZ4I62R+rgUHr1DDAvrM/LxdPwmqOwdDsrplhw==
   dependencies:
     "@types/backbone" "1.4.15"
     backbone "1.4.1"
@@ -1713,13 +1713,13 @@ headroom.js@^0.12.0:
 
 "highlight.js@github:highlightjs/highlight.js":
   version "11.12.0"
-  uid "27fc2be62282fcce3889866abb61f171e53800f0"
-  resolved "https://codeload.github.com/highlightjs/highlight.js/tar.gz/27fc2be62282fcce3889866abb61f171e53800f0"
+  uid "5a811f0714d1385e2f32d061ca803c5057c4901c"
+  resolved "https://codeload.github.com/highlightjs/highlight.js/tar.gz/5a811f0714d1385e2f32d061ca803c5057c4901c"
 
-hls.js@^1.6.17:
-  version "1.6.17"
-  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.6.17.tgz#0c96c04e620a52970b036361af17b81e3e0be1f3"
-  integrity sha512-NUplVGVuc1hSPwdB/9/cbRkUmLrYi75/hqiXKdA+l300pJNxDu96R7jRb2imDzWJqIUF4I5ThmAdp9GvOCXsuQ==
+hls.js@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.7.0.tgz#43506ae3f3ebc3ed3d5c5f92370be3522688af48"
+  integrity sha512-NnQpT6Z//+2IB2qovSUbKbrlXY1MOpi0JynZ9L2NNOuTJiNCyMSQj9k2laEj1v7CxU/Hb8oTWR98eT3mVpPQVQ==
 
 hosted-git-info@^10.1.0, hosted-git-info@^10.1.1:
   version "10.1.1"