improved wiki

2 files changed, 5 insertions, 2 deletions

diff --git a/h-source/Application/Controllers/HistoryController.php b/h-source/Application/Controllers/HistoryController.php
index 13d3b3a..ac1ab1a 100644
--- a/h-source/Application/Controllers/HistoryController.php
+++ b/h-source/Application/Controllers/HistoryController.php
@@ -201,7 +201,7 @@ class HistoryController extends BaseController
 			'clean_type'	=>	'page_del',
 			'model_name'	=>	'WikiModel',
 			'id_name'		=>	'id_wiki',
-			'field_name'	=>	'deleted',
+			'field_name'	=>	'-deleted',
 			'actions'		=>	array('pagehide','pageshow'),
 			'group'			=>	'admin',
 
@@ -312,6 +312,9 @@ class HistoryController extends BaseController
 						{
 							if (eg_strlen($message) < 500)
 							{
+								//drop the - char if present
+								$clean['field_name'] = str_replace('-',null,$clean['field_name']);
+								
 								//hide the message
 								$model->values = array($clean['field_name'] => $this->strings[$action]['to_status']);
 								$model->pUpdate($clean['id']);
diff --git a/h-source/Application/Controllers/WikiController.php b/h-source/Application/Controllers/WikiController.php
index cc0c922..b282d24 100644
--- a/h-source/Application/Controllers/WikiController.php
+++ b/h-source/Application/Controllers/WikiController.php
@@ -205,7 +205,7 @@ class WikiController extends BaseController
 			$this->redirect('wiki/page/'.$this->lang.'/Main-Page');
 		}
 
-		$data['md_javascript'] = "moderator_dialog(\"pageblock\",\"page\");moderator_dialog(\"pageunblock\",\"page\");";
+		$data['md_javascript'] = "moderator_dialog(\"pageblock\",\"page\");moderator_dialog(\"pageunblock\",\"page\");moderator_dialog(\"pagehide\",\"page_del\");moderator_dialog(\"pageshow\",\"page_del\");";
 		
 		$this->append($data);