Skip to content
Snippets Groups Projects

Resolve "Introduce PSR-4 autoloading"

Merged Stein Magne Bjorklund requested to merge 12-introduce-psr-4-autoloading into master
1 file
+ 2
3
Compare changes
  • Side-by-side
  • Inline
+ 2
3
@@ -17,7 +17,7 @@ if (isset($_GET['q']) && $_GET['q'] === 'import') {
// Check that application is installed.
if (!file_exists('settings.inc.php')) {
echo 'Need to configure lodspeakr first. Please run "install.sh". Alternatively, you can <a href="import">import an existing application</a>';
echo 'Need to configure lodspeakr first. Please run "install.sh". Alternatively, you can <a href="' . $_SERVER['HTTP_HOST'] . '/import">import an existing application</a>';
exit(0);
}
@@ -48,7 +48,7 @@ $endpoints['local'] = new Endpoint($conf['endpoint']['local'], $conf['endpointPa
$acceptContentType = Utils::getBestContentType($_SERVER['HTTP_ACCEPT'], $conf['http_accept']);
$extension = Utils::getExtension($acceptContentType, $conf['http_accept']);
$uri = $conf['basedir'] . $_GET['q'];
// Check that content type is supported by LODSPeaKr.
if ($acceptContentType === null) {
@@ -65,7 +65,6 @@ if ($conf['export'] && $_GET['q'] === 'export') {
}
// Redirect to root URL if necessary.
$uri = $conf['basedir'] . $_GET['q'];
$localUri = $uri;
if ($uri === $conf['basedir']) {
header('Location: ' . $conf['root']);
Loading