Merge branch 'master' into navigate-after-delete

This commit is contained in:
El RIDO 2024-10-18 22:39:04 +02:00 committed by GitHub
commit 97edbcc167
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 1 deletions

View File

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

View File

@ -43,6 +43,14 @@ Example for Debian and Ubuntu:
$ sudo apt install phpunit php-gd php-sqlite3 php-xdebug $ 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: To run the tests, change into the `tst` directory and run phpunit:
```console ```console

View File

@ -3988,7 +3988,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
} }
emailBody += I18n._('Link:'); emailBody += I18n._('Link:');
emailBody += EOL; 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; return emailBody;
} }