Merge branch 'develop'

xpressengine · Jan 21, 2016 · 45cfb40 · 45cfb40
2 parents 0855c70 + c4ce2e1
commit 45cfb40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/profiler.admin.controller.php b/profiler.admin.controller.php
@@ -138,7 +138,8 @@ function procProfilerAdminDeleteTable()
 
 	function procProfilerAdminDeleteTablePiece()
 	{
-		$table_name = Context::get('table_name');
+		$vars = Context::getRequestVars();
+		$table_name = $vars->table_name;
 		$oDB = DB::getInstance();
 		$oDB->dropTable(substr($table_name, strlen($oDB->prefix)));
 

diff --git a/tpl/table.html b/tpl/table.html
@@ -28,7 +28,7 @@
 					{@$enable_delete = TRUE}
 					{$lang->notuse}
 				</label>
-				<form cond="$table_info->to_be_deleted" class="x_inline" action="{getUrl('')}" mothod="post">
+				<form cond="$table_info->to_be_deleted" class="x_inline" action="{Context::getUrl('')}"  method="post" onsubmit="if(!confirm('{$lang->msg_profiler_delete_table}')) return false">
 					<input type="hidden" name="module" value="profiler" />
 					<input type="hidden" name="act" value="procProfilerAdminDeleteTablePiece" />
 					<input type="hidden" name="table_name" value="{$table_info->name}" />