Commit 9110940d authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch '965-oops-error' into 'development'

Resolve "Oops Error"

Closes #965

See merge request !1593
parents bb5f1cdf 08ffe80a
......@@ -61,6 +61,12 @@ class MetaGerSearch extends Controller
$timings["checkSpecialSearches"] = microtime(true) - $time;
}
# Search query can be empty after parsing the formdata
# we will cancel the search in that case and show an error to the user
if(empty($metager->getQ())){
return $metager->createView();
}
if ($spamEntry !== null && Cache::has('spam.' . $metager->getFokus() . "." . md5($spamEntry))) {
$responseContent = Cache::get('spam.' . $metager->getFokus() . "." . md5($spamEntry));
$responseContent = preg_replace('/(name="eingabe"\s+value=")[^"]+/', "$1$eingabe", $responseContent);
......
......@@ -2,7 +2,6 @@
# This commands will help initialize data for docker-compose setup
# Its supposed to run in a php docker image
docker-php-ext-install pdo pdo_mysql
if [ ! -f "/data/.env" ]; then
cp /data/.env.example /data/.env
......@@ -16,10 +15,14 @@ if [ ! -d "/data/storage/logs/metager" ]; then
mkdir -p /data/storage/logs/metager
fi
touch /data/database/useragents.sqlite
cp /data/database/useragents.sqlite.example /data/database/useragents.sqlite
chmod -R go+w storage bootstrap/cache
docker-php-ext-install pdo pdo_mysql
php artisan wait:db
php artisan migrate
rm /data/database/useragents.sqlite
touch /data/database/useragents.sqlite
php artisan migrate:fresh
php artisan db:seed
\ No newline at end of file
......@@ -405,6 +405,7 @@ a {
#quicktips {
height: 100%;
width: 100%;
min-height: 500px;
iframe{
height: 100%;
width: 100%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment