Verified Commit c511fe47 authored by Felix Eckhofer's avatar Felix Eckhofer 🤹🏼
Browse files

Merge branch 'master' into deploy

* master:
  Fix compatibility with php8
  Remove flattr button
  Update check for focal
  Update instructions for focal
  Fix plymouth theme modification for Ubuntu 19.10
  Fix update-alternatives check
  Silence output from update-alternatives and fix syntax error
  Only notify about gdm if using the default ubuntu-css
  Mark commands consistently
  Add note about gdm theme
parents 01adbec6 4e6031f7
...@@ -245,7 +245,9 @@ for ($i = 0; $i < $width; $i++) { ...@@ -245,7 +245,9 @@ for ($i = 0; $i < $width; $i++) {
$values[$i][$j] = mb_strtoupper($_REQUEST[$formfield], 'UTF-8'); $values[$i][$j] = mb_strtoupper($_REQUEST[$formfield], 'UTF-8');
} }
} }
@$values[$i] = array_unique($values[$i]); if (isset($values) && isset($values[$i])) {
$values[$i] = array_unique($values[$i]);
}
} }
$query = ''; $query = '';
...@@ -321,9 +323,5 @@ echo '</tt></div>'; ...@@ -321,9 +323,5 @@ echo '</tt></div>';
</p> </p>
</div> </div>
<p style="text-align: right; margin: 1em;">
<a href="https://flattr.com/submit/auto?user_id=dxbi&url=https://extern.tribut.de/platzhalter&title=Platzhalter&description=L%C3%B6sungshilfe%20f%C3%BCr%20Wortr%C3%A4tsel&language=de&tags=php&category=software"><img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" /></a>
</p>
</body> </body>
</html> </html>
...@@ -34,9 +34,14 @@ sedfilter \ ...@@ -34,9 +34,14 @@ sedfilter \
's/background_color [0-9]+,[0-9]+,[0-9]+/background_color 0,0,0/' 's/background_color [0-9]+,[0-9]+,[0-9]+/background_color 0,0,0/'
sedfilter \ sedfilter \
"$THEMEDIR/ubuntu-logo/ubuntu-logo.script" \ "$THEMEDIR/ubuntu-logo/ubuntu-logo.script" \
's/^(Window.SetBackground(Top|Bottom)Color ?)\(0\.[0-9]{1,2}, 0\.[0-9]{1,2}, 0\.[0-9]{1,2}\)/\1(0.00, 0.00, 0.00)/' 's/^(Window.SetBackground(Top|Bottom)Color ?)\(0\.[0-9]{1,5}, 0\.[0-9]{1,5}, 0\.[0-9]{1,5}\)/\1(0.00, 0.00, 0.00)/'
sedfilter \ sedfilter \
"$THEMEDIR/ubuntu-text/ubuntu-text.plymouth" \ "$THEMEDIR/ubuntu-text/ubuntu-text.plymouth" \
's/^black=0x[a-fA-F0-9]{6}/black=0x000000/' 's/^black=0x[a-fA-F0-9]{6}/black=0x000000/'
notice "You may want to run 'update-initramfs -u -k all && update-grub' now :)" notice "You may want to run 'update-initramfs -u -k all && update-grub' now :)"
if update-alternatives --query gdm3-theme.gresource 2>/dev/null | grep '^Value: ' | grep -q '/Yaru/'
then
notice "To modify the background of gdm, check 'update-alternatives --config gdm3-theme.gresource'"
fi
Supports Markdown
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