Merge branch 'develop'

bjrambo · bjrambo · commit 45cfb4097a3e · 2016-01-21T22:44:49.000+09:00
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}" />

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,8 @@ function procProfilerAdminDeleteTable()`
`138`	`138`
`139`	`139`	`function procProfilerAdminDeleteTablePiece()`
`140`	`140`	`{`
`141`		`- $table_name = Context::get('table_name');`
	`141`	`+ $vars = Context::getRequestVars();`
	`142`	`+ $table_name = $vars->table_name;`
`142`	`143`	`$oDB = DB::getInstance();`
`143`	`144`	`$oDB->dropTable(substr($table_name, strlen($oDB->prefix)));`
`144`	`145`