1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-22 16:33:00 +00:00

Improved default action setting integration

This commit is contained in:
Starbeamrainbowlabs 2015-05-24 16:17:07 +01:00
parent 9277f00c08
commit f512958c05
2 changed files with 10 additions and 12 deletions

View file

@ -125,8 +125,8 @@ if(!isset($_GET["action"]) and !isset($_GET["page"]))
//make sure that the action is set //make sure that the action is set
if(!isset($_GET["action"])) if(!isset($_GET["action"]))
$_GET["action"] = "view"; $_GET["action"] = $settings->defaultaction;
//make sure that the page is set
if(!isset($_GET["page"]) or strlen($_GET["page"]) === 0) if(!isset($_GET["page"]) or strlen($_GET["page"]) === 0)
$_GET["page"] = $settings->defaultpage; $_GET["page"] = $settings->defaultpage;
@ -329,7 +329,6 @@ class Slimdown {
public static function add_rule ($regex, $replacement) { public static function add_rule ($regex, $replacement) {
self::$rules[$regex] = $replacement; self::$rules[$regex] = $replacement;
} }
/** /**
* Render some Markdown into HTML. * Render some Markdown into HTML.
*/ */

View file

@ -253,8 +253,8 @@ if(!isset($_GET["action"]) and !isset($_GET["page"]))
//make sure that the action is set //make sure that the action is set
if(!isset($_GET["action"])) if(!isset($_GET["action"]))
$_GET["action"] = "view"; $_GET["action"] = $settings->defaultaction;
//make sure that the page is set
if(!isset($_GET["page"]) or strlen($_GET["page"]) === 0) if(!isset($_GET["page"]) or strlen($_GET["page"]) === 0)
$_GET["page"] = $settings->defaultpage; $_GET["page"] = $settings->defaultpage;
@ -457,7 +457,6 @@ class Slimdown {
public static function add_rule ($regex, $replacement) { public static function add_rule ($regex, $replacement) {
self::$rules[$regex] = $replacement; self::$rules[$regex] = $replacement;
} }
/** /**
* Render some Markdown into HTML. * Render some Markdown into HTML.
*/ */