diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 |
| commit | 0733dc37fda27a5ba35f9020edf3c66aa41a95a0 (patch) | |
| tree | 6877946232f1b01b1c8709054c689f6658cef34f /modules/comment/controllers/admin_comments.php | |
| parent | 218493c50be9362d4abed6900a816308fee5d978 (diff) | |
| parent | 9379308f91a476f790fb8d444536719535c584e4 (diff) | |
Merge commit 'upstream/master'
Conflicts:
modules/gallery/tests/xss_data.txt
Diffstat (limited to 'modules/comment/controllers/admin_comments.php')
| -rw-r--r-- | modules/comment/controllers/admin_comments.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php index a164f79f..2c278d64 100644 --- a/modules/comment/controllers/admin_comments.php +++ b/modules/comment/controllers/admin_comments.php @@ -33,10 +33,10 @@ class Admin_Comments_Controller extends Admin_Controller { public function menu_labels() { $menu = $this->_menu($this->_counts()); - print json_encode(array($menu->get("unpublished")->label, - $menu->get("published")->label, - $menu->get("spam")->label, - $menu->get("deleted")->label)); + print json_encode(array($menu->get("unpublished")->label->for_js(), + $menu->get("published")->label->for_js(), + $menu->get("spam")->label->for_js(), + $menu->get("deleted")->label->for_js())); } public function queue($state) { |