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

Merge branch 'master' into navigate-after-delete

El RIDO 1 год назад
Родитель
Сommit
97edbcc167
3 измененных файлов с 12 добавлено и 1 удалено
  1. 3 0
      .devcontainer/postCreateCommand.sh
  2. 8 0
      doc/Running Unit Tests.md
  3. 1 1
      js/privatebin.js

+ 3 - 0
.devcontainer/postCreateCommand.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+export PATH="$PATH:$HOME/.composer/vendor/bin"
 composer install --no-dev --optimize-autoloader
+
 sudo chmod a+x "$(pwd)" && sudo rm -rf /var/www/html && sudo ln -s "$(pwd)" /var/www/html
+
 npm install --global nyc

+ 8 - 0
doc/Running Unit Tests.md

@@ -43,6 +43,14 @@ Example for Debian and Ubuntu:
 $ sudo apt install phpunit php-gd php-sqlite3 php-xdebug
 ```
 
+Because the unit tests depend on this, you also need to install the optional. Otherwise they won't run:
+```console
+composer require google/cloud-storage
+```
+
+If you do this and want to develop further, please go into `.gitignore` and adjust it to ignore the whole
+vendor directory. Otherwise your `git status` will be filled with lot's of unrelated PHP files.
+
 To run the tests, change into the `tst` directory and run phpunit:
 
 ```console

+ 1 - 1
js/privatebin.js

@@ -3988,7 +3988,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             }
             emailBody += I18n._('Link:');
             emailBody += EOL;
-            emailBody += $('#pasteurl').attr('href'); // might have been shortened
+            emailBody += $('#pasteurl').attr('href') || window.location.href; // href is tried first as it might have been shortened
             return emailBody;
         }