aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'h-source/Application/Controllers')
-rw-r--r--h-source/Application/Controllers/HistoryController.php11
-rw-r--r--h-source/Application/Controllers/UsersController.php10
-rw-r--r--h-source/Application/Controllers/WikiController.php5
3 files changed, 15 insertions, 11 deletions
diff --git a/h-source/Application/Controllers/HistoryController.php b/h-source/Application/Controllers/HistoryController.php
index f5ae1a2..cc4b3d0 100644
--- a/h-source/Application/Controllers/HistoryController.php
+++ b/h-source/Application/Controllers/HistoryController.php
@@ -132,6 +132,17 @@ class HistoryController extends BaseController
'group' => 'moderator',
),
+
+ 'wiki_talk' => array(
+
+ 'clean_type' => 'wiki_talk',
+ 'model_name' => 'WikitalkModel',
+ 'id_name' => 'id_talk',
+ 'field_name' => 'deleted',
+ 'actions' => array('hide','show'),
+ 'group' => 'moderator',
+
+ ),
);
diff --git a/h-source/Application/Controllers/UsersController.php b/h-source/Application/Controllers/UsersController.php
index 7f42a2a..4fa078b 100644
--- a/h-source/Application/Controllers/UsersController.php
+++ b/h-source/Application/Controllers/UsersController.php
@@ -107,15 +107,7 @@ class UsersController extends BaseController
}
else if ($res === 'was-logged')
{
- $redirect = $this->request->get('redirect','','sanitizeAll');
- if (strcmp($redirect,'') !== 0)
- {
- $this->redirect($redirect,0);
- }
- else
- {
- $this->redirect('home/index/'.Lang::$current,0);
- }
+ $this->redirect('home/index/'.Lang::$current,0);
}
else if ($res === 'error')
{
diff --git a/h-source/Application/Controllers/WikiController.php b/h-source/Application/Controllers/WikiController.php
index 33647ef..2ddc54d 100644
--- a/h-source/Application/Controllers/WikiController.php
+++ b/h-source/Application/Controllers/WikiController.php
@@ -448,11 +448,12 @@ class WikiController extends BaseController
$data['notice'] = $this->m['WikitalkModel']->notice;
// javascript for moderator
-// $data['md_javascript'] = "moderator_dialog(\"hide\",\"talk\");moderator_dialog(\"show\",\"talk\");";
-// $data['go_to'] = $this->currPage."/".$this->lang."/".$clean['id_wiki'];
+ $data['md_javascript'] = "moderator_dialog(\"hide\",\"wiki_talk\");moderator_dialog(\"show\",\"wiki_talk\");";
+ $data['go_to'] = $this->currPage."/".$this->lang."/".$clean['id_wiki'];
$this->append($data);
$this->load('talk');
+ $this->load('moderator_dialog');
$this->right();
// $this->loadViewAll('talk,moderator_dialog');
}