Merge branch 'master' into copilot/replace-short-tags-to-php

includes/config.example.php

@@ -48,5 +48,3 @@ $config['SQL_db'] = "postgres";
 
 $config['admin_mail'] = "leo@lstronic.com";
 $config['bot_mail'] = "robot@kabano.com";
-
-?>

includes/images.php

@@ -38,5 +38,3 @@ function generate_image_thumbnail($source_image_path, $thumbnail_image_path, $wi
 	imagedestroy($thumbnail_gd_image);
 	return true;
 }
-
-?>

includes/poi_types.struct.php

@@ -89,5 +89,3 @@ $poi_types = array(
     )
 
 );
-
-?>

includes/routes.php

@@ -70,5 +70,3 @@ if($notfound) {
     $head['title'] = $wikiPage->name;
     include ($config['views_folder']."d.wiki.view.html");
 }
-
-?>

includes/session.php

@@ -33,6 +33,3 @@ if (PHP_VERSION_ID < 80000) {
 }
 $user->datetime_format = new IntlDateFormatter($config['locale'], IntlDateFormatter::LONG, IntlDateFormatter::SHORT, $config['timezone']);
 $user->datetimeshort_format = new IntlDateFormatter($config['locale'], IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, $config['timezone']);
-
-
-?>