Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Packages Projects Releases 1 Wiki Activity

Merge

Browse source
This commit is contained in:
botanic 2014-09-07 22:27:32 -07:00
parent 4798c0168e 8c3dc770ec
commit c3fc3abb81
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/web/private_php/ams/plugins/Domain_Management/Domain_Management.php
View file

@ -179,7 +179,7 @@ function domain_management_hook_get_db()
if (isset($_GET['edit_domain'])){
//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();
$domain_management_return_set['permissions'] = $rows;

8
code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl
View file

@ -196,11 +196,11 @@
<tbody>
{foreach from=$hook_info['Domain_Management']['domains'] item=array}
<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['status']}</a></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><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['status']}</td>
<td>{$array['patch_version']}</td>
<td>{$array['description']|truncate}</td>
</tr>
{/foreach}
</tbody>

2
code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php
View file

@ -283,7 +283,9 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
if (isset($_template->_capture_stack[0][0])) {
$_template->capture_error();
}
error_log("test1");
array_shift($_template->_capture_stack);
error_log("test2");
$_output = ob_get_clean();
} catch (Exception $e) {
ob_get_clean();