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

Merge branch 'master' of https://github.com/unaio/una

AntonLV 4 лет назад
Родитель
Сommit
eef6917e9d
3 измененных файлов с 10 добавлено и 3 удалено
  1. 2 2
      docker-compose.yml
  2. 1 1
      scripts/docker-compose/PHP.Dockerfile
  3. 7 0
      template/scripts/BxBaseVoteReactionsMenuDo.php

+ 2 - 2
docker-compose.yml

@@ -52,8 +52,8 @@ services:
             - 8080:80
             - 8080:80
         environment:
         environment:
             - PMA_HOST=mysql
             - PMA_HOST=mysql
-            - PMA_USER=una
-            - PMA_PASSWORD=una
+            - PMA_USER=root
+            - PMA_PASSWORD=root
         volumes:
         volumes:
             - ./scripts/docker-compose/phpmyadmin.inc.php:/etc/phpmyadmin/config.user.inc.php
             - ./scripts/docker-compose/phpmyadmin.inc.php:/etc/phpmyadmin/config.user.inc.php
         depends_on:
         depends_on:

+ 1 - 1
scripts/docker-compose/PHP.Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
         unzip \
         unzip \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) gd \
     && docker-php-ext-install -j$(nproc) gd \
-    && docker-php-ext-install -j$(nproc) pdo pdo_mysql \
+    && docker-php-ext-install -j$(nproc) pdo pdo_mysql mysqli \
     && docker-php-ext-install -j$(nproc) zip exif opcache iconv mbstring \
     && docker-php-ext-install -j$(nproc) zip exif opcache iconv mbstring \
 #    && pecl install xdebug && docker-php-ext-enable xdebug \
 #    && pecl install xdebug && docker-php-ext-enable xdebug \
 #    && pecl install mcrypt-1.0.3 && docker-php-ext-enable mcrypt \
 #    && pecl install mcrypt-1.0.3 && docker-php-ext-enable mcrypt \

+ 7 - 0
template/scripts/BxBaseVoteReactionsMenuDo.php

@@ -71,6 +71,13 @@ class BxBaseVoteReactionsMenuDo extends BxTemplMenu
 
 
         return $aResult;
         return $aResult;
     }
     }
+    
+    protected function _getMenuAttrs ($a)
+    {
+        $sResult = parent::_getMenuAttrs($a);
+        $sResult .= 'title = "' . bx_html_attribute(_t($a['title'])) . '"';
+        return $sResult;
+    }
 }
 }
 
 
 /** @} */
 /** @} */