mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-29 23:25:59 +00:00
Merge
This commit is contained in:
commit
c3fc3abb81
3 changed files with 7 additions and 5 deletions
|
@ -179,7 +179,7 @@ function domain_management_hook_get_db()
|
||||||
|
|
||||||
if (isset($_GET['edit_domain'])){
|
if (isset($_GET['edit_domain'])){
|
||||||
//get permissions
|
//get permissions
|
||||||
$statement = $db->executeWithoutParams("SELECT * FROM `permission` WHERE `ClientApplication` = '".$rows[$_GET['edit_domain']-1]['domain_name']."'");
|
$statement = $db->executeWithoutParams("SELECT * FROM `permission` WHERE `DomainId` = '".$rows[$_GET['edit_domain']-1]['domain_name']."'");
|
||||||
$rows = $statement->fetchAll();
|
$rows = $statement->fetchAll();
|
||||||
$domain_management_return_set['permissions'] = $rows;
|
$domain_management_return_set['permissions'] = $rows;
|
||||||
|
|
||||||
|
|
|
@ -196,11 +196,11 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
{foreach from=$hook_info['Domain_Management']['domains'] item=array}
|
{foreach from=$hook_info['Domain_Management']['domains'] item=array}
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['domain_id']}</a></td>
|
<td>{$array['domain_id']}</td>
|
||||||
<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['domain_name']}</a></td>
|
<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['domain_name']}</a></td>
|
||||||
<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['status']}</a></td>
|
<td>{$array['status']}</td>
|
||||||
<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['patch_version']}</a></td>
|
<td>{$array['patch_version']}</td>
|
||||||
<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['description']|truncate}</a></td>
|
<td>{$array['description']|truncate}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{/foreach}
|
{/foreach}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -283,7 +283,9 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
|
||||||
if (isset($_template->_capture_stack[0][0])) {
|
if (isset($_template->_capture_stack[0][0])) {
|
||||||
$_template->capture_error();
|
$_template->capture_error();
|
||||||
}
|
}
|
||||||
|
error_log("test1");
|
||||||
array_shift($_template->_capture_stack);
|
array_shift($_template->_capture_stack);
|
||||||
|
error_log("test2");
|
||||||
$_output = ob_get_clean();
|
$_output = ob_get_clean();
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
ob_get_clean();
|
ob_get_clean();
|
||||||
|
|
Loading…
Reference in a new issue