sbrl-github/Pepperminty-Wiki
sbrl-github
/
Pepperminty-Wiki
mirror of https://github.com/sbrl/Pepperminty-Wiki.git
1
0
Fork 0
Code

Bugfix: Page protection: undefined property defaultaction

This commit is contained in:
Starbeamrainbowlabs 2015-11-12 09:29:16 +00:00
parent 6eea1700d6
commit 41d18dc539
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/index.php
View File

@ -1225,7 +1225,7 @@ register_module([
"id" => "action-protect", "id" => "action-protect",
"code" => function() { "code" => function() {
add_action("protect", function() { add_action("protect", function() {
global $env, $pageindex, $paths; global $env, $pageindex, $paths, $settings;
// Make sure that the user is logged in as an admin / mod. // Make sure that the user is logged in as an admin / mod.
if($env->is_admin) if($env->is_admin)
@ -1257,7 +1257,7 @@ register_module([
$state = ($pageindex->$page->protect ? "enabled" : "disabled"); $state = ($pageindex->$page->protect ? "enabled" : "disabled");
$title = "Page protection $state."; $title = "Page protection $state.";
exit(page_renderer::render_main($title, "<p>Page protection for $env->page has been $state.</p><p><a href='?action=$env->defaultaction&page=$env->page'>Go back</a>.")); exit(page_renderer::render_main($title, "<p>Page protection for $env->page has been $state.</p><p><a href='?action=$settings->defaultaction&page=$env->page'>Go back</a>."));
} }
else else
{ {
@ -2352,6 +2352,7 @@ register_module([
} }
// Delete the page from the page index // Delete the page from the page index
unset($pageindex->$page); unset($pageindex->$page);
// Save the new page index // Save the new page index
file_put_contents($paths->pageindex, json_encode($pageindex, JSON_PRETTY_PRINT)); file_put_contents($paths->pageindex, json_encode($pageindex, JSON_PRETTY_PRINT));

4
module_index.json
View File

@ -14,7 +14,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Exposes Pepperminty Wiki's new page protection mechanism and makes the protect button in the 'More...' menu on the top bar work.", "description": "Exposes Pepperminty Wiki's new page protection mechanism and makes the protect button in the 'More...' menu on the top bar work.",
"id": "action-protect", "id": "action-protect",
"lastupdate": 1447053764, "lastupdate": 1447320482,
"optional": false "optional": false
}, },
{ {
@ -77,7 +77,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds an action to allow administrators to delete pages.", "description": "Adds an action to allow administrators to delete pages.",
"id": "page-delete", "id": "page-delete",
"lastupdate": 1447269808, "lastupdate": 1447269891,
"optional": false "optional": false
}, },
{ {

4
modules/action-protect.php
View File

@ -7,7 +7,7 @@ register_module([
"id" => "action-protect", "id" => "action-protect",
"code" => function() { "code" => function() {
add_action("protect", function() { add_action("protect", function() {
global $env, $pageindex, $paths; global $env, $pageindex, $paths, $settings;
// Make sure that the user is logged in as an admin / mod. // Make sure that the user is logged in as an admin / mod.
if($env->is_admin) if($env->is_admin)
@ -39,7 +39,7 @@ register_module([
$state = ($pageindex->$page->protect ? "enabled" : "disabled"); $state = ($pageindex->$page->protect ? "enabled" : "disabled");
$title = "Page protection $state."; $title = "Page protection $state.";
exit(page_renderer::render_main($title, "<p>Page protection for $env->page has been $state.</p><p><a href='?action=$env->defaultaction&page=$env->page'>Go back</a>.")); exit(page_renderer::render_main($title, "<p>Page protection for $env->page has been $state.</p><p><a href='?action=$settings->defaultaction&page=$env->page'>Go back</a>."));
} }
else else
{ {

1
modules/page-delete.php
View File

@ -34,6 +34,7 @@ register_module([
} }
// Delete the page from the page index // Delete the page from the page index
unset($pageindex->$page); unset($pageindex->$page);
// Save the new page index // Save the new page index
file_put_contents($paths->pageindex, json_encode($pageindex, JSON_PRETTY_PRINT)); file_put_contents($paths->pageindex, json_encode($pageindex, JSON_PRETTY_PRINT));