git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
page: retain thumb subhandlers over invalid resize
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index 71bc74afaa0a964fe91f9c0124b4ad1b9b65b5e1..f493c7fb04f8cca4619dedd1ba66b2985da9f334 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-7,11
+7,6
@@
set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
include_once 'error.inc.php';
include_once 'error.inc.php';
-# user login and control
-
-include_once 'auth.inc.php'; // sets global $User
-$Edit = isset($_GET['edit']);
-
# setup requested page
$request = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']);
# setup requested page
$request = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']);
@@
-33,6
+28,10
@@
elseif (file_exists("$request/index.html")) {
require_once('article.inc.php');
$Page = new ArchiveArticle($staticpage);
require_once('article.inc.php');
$Page = new ArchiveArticle($staticpage);
+# user login and control
+
+include_once 'auth.inc.php'; // sets global $User
+
if ($Page->restricted) {
# access restriction
if (!$User->login) {
if ($Page->restricted) {
# access restriction
if (!$User->login) {
@@
-84,6
+83,8
@@
if (isset($Page->raw)) {
# output dynamic and/or static html
# output dynamic and/or static html
+include_once 'format.inc.php';
+
ob_start();
if ($Page->handler and !require("./{$Page->handler}/index.php")) {
# replace contents by code output on false return
ob_start();
if ($Page->handler and !require("./{$Page->handler}/index.php")) {
# replace contents by code output on false return