Merge pull request #23 from iMattPro/updates

Just some updates
phpbb-extensions · May 22, 2023 · 5d0b3e0 · 5d0b3e0
2 parents b91dd49 + 399d9d2
commit 5d0b3e0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/config/routing.yml b/config/routing.yml
@@ -1,4 +1,4 @@
-cannedmessage_selected:
+phpbb_cannedmessages_selected:
     path: /cannedmessageselected/{data}
     defaults: { _controller: phpbb.cannedmessages.selected.controller:handle, mode: retrieve }
     requirements:

diff --git a/controller/mcp_controller.php b/controller/mcp_controller.php
@@ -82,16 +82,6 @@ public function set_page_url($u_action)
 		$this->u_action = $u_action;
 	}
 
-	/**
-	 * Get MCP page title for Canned Messages module
-	 *
-	 * @return	string	Language string for Canned Messages MCP module
-	 */
-	public function get_page_title()
-	{
-		return $this->language->lang('MCP_CANNEDMESSAGES_TITLE');
-	}
-
 	/**
 	 * Process user request for manage mode
 	 *

diff --git a/event/main_listener.php b/event/main_listener.php
@@ -88,7 +88,7 @@ public function posting_modify_template_vars()
 			$this->language->add_lang('posting', 'phpbb/cannedmessages');
 			$this->template->assign_vars(array(
 				'S_CANNEDMESSAGES_LIST'		=> $this->manager->get_messages(),
-				'U_CANNEDMESSAGE_SELECTED'	=> $this->controller_helper->route('cannedmessage_selected', array('data' => 0)),
+				'U_CANNEDMESSAGE_SELECTED'	=> $this->controller_helper->route('phpbb_cannedmessages_selected', array('data' => 0)),
 			));
 		}
 	}

diff --git a/mcp/main_module.php b/mcp/main_module.php
@@ -38,7 +38,7 @@ public function main($id, $mode)
 		$this->tpl_name = 'mcp_cannedmessages_' . $mode;
 
 		// Set the page title for our MCP page
-		$this->page_title = $mcp_controller->get_page_title();
+		$this->page_title = 'MCP_CANNEDMESSAGES_TITLE';
 
 		$mcp_controller->{'mode_' . $mode}();
 	}