From 99030913feab25cebe97ee384b215f61668cb0be Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Fri, 25 Nov 2016 19:34:20 +0000 Subject: [PATCH] Correct error messag when moving a page - fixes #121. --- Changelog.md | 1 + build/index.php | 2 +- module_index.json | 2 +- modules/page-move.php | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index fb8f80c..13b30a8 100755 --- a/Changelog.md +++ b/Changelog.md @@ -24,6 +24,7 @@ - Fxed huge issue with `contentonly` display mode. - Improved the search engine indexing algorithm. It now shouldn't choke on certain special characters (`[]{}|`) and will treat them as word boundaries. - Fixed tag links at the bottom of pages for tags with a single quote (`'`) in them. + - Correct error message when attempting to move a page ## v0.12.1 diff --git a/build/index.php b/build/index.php index 4196f38..81ca4ef 100755 --- a/build/index.php +++ b/build/index.php @@ -4912,7 +4912,7 @@ register_module([ if($env->page == $new_name) exit(page_renderer::render_main("Moving $env->page - Error", "

You tried to move $page, but the new name you gave is the same as it's current name.

It is possible that you tried to use some characters in the new name that are not allowed and were removed.

-

Page names may only contain alphanumeric characters, dashes, and underscores.

")); +

Page names may not contain any of these characters: ?%*:|\"><()[]

")); if(isset($pageindex->$page->uploadedfile) and file_exists($new_name)) diff --git a/module_index.json b/module_index.json index 78872ae..b42b28c 100755 --- a/module_index.json +++ b/module_index.json @@ -176,7 +176,7 @@ "author": "Starbeamrainbowlabs", "description": "Adds an action to allow administrators to move pages.", "id": "page-move", - "lastupdate": 1476906745, + "lastupdate": 1480101990, "optional": false }, { diff --git a/modules/page-move.php b/modules/page-move.php index 8015faa..04abbef 100644 --- a/modules/page-move.php +++ b/modules/page-move.php @@ -68,7 +68,7 @@ register_module([ if($env->page == $new_name) exit(page_renderer::render_main("Moving $env->page - Error", "

You tried to move $page, but the new name you gave is the same as it's current name.

It is possible that you tried to use some characters in the new name that are not allowed and were removed.

-

Page names may only contain alphanumeric characters, dashes, and underscores.

")); +

Page names may not contain any of these characters: ?%*:|\"><()[]

")); if(isset($pageindex->$page->uploadedfile) and file_exists($new_name))