diff --git a/index.php b/index.php
index 7cb6ba67..1b655195 100644
--- a/index.php
+++ b/index.php
@@ -74,15 +74,24 @@ if((!isset($config['installed']) || !$config['installed']) && file_exists(BASE .
throw new RuntimeException('Setup detected that install/ directory exists. Please visit this url to start MyAAC Installation.
Delete install/ directory if you already installed MyAAC.
Remember to REFRESH this page when you\'re done!');
}
+$isEmptyGet = false;
+if (!empty($_GET)) {
+ foreach ($_GET as $value) {
+ if (empty($value)) {
+ $isEmptyGet = true;
+ }
+ }
+}
+
$found = false;
-if(empty($uri) || isset($_REQUEST['template'])) {
- $_REQUEST['p'] = 'news';
+if(empty($uri) || isset($_REQUEST['template']) || (!$isEmptyGet && !isset($_REQUEST['subtopic']) && !isset($_REQUEST['p']))) {
+ $_REQUEST['p'] = $_REQUEST['subtopic'] = 'news';
$found = true;
}
else {
$tmp = strtolower($uri);
if(!preg_match('/[^A-z0-9_\-]/', $uri) && file_exists(SYSTEM . 'pages/' . $tmp . '.php')) {
- $_REQUEST['p'] = $uri;
+ $_REQUEST['p'] = $_REQUEST['subtopic'] = $uri;
$found = true;
}
else {
diff --git a/templates/kathrine/template.php b/templates/kathrine/template.php
index 063b0648..49abc110 100644
--- a/templates/kathrine/template.php
+++ b/templates/kathrine/template.php
@@ -33,7 +33,7 @@ defined('MYAAC') or die('Direct access not allowed!');
}
else {
$tmp = URI;
- if(empty($tmp)) {
+ if(empty($tmp) || !$isEmptyGet) {
$tmp = array('news');
}
else {