a few fixes, found by php-analyzer
a few fixes, found by php-analyzer
fixed a bug where remains of a merge conflict still where there
fixed several issues reported by php-analyzer - might have broken stuff, needs testing