mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/14306] Automatically enable a safe mode when container building fails

Browse Source 
PHPBB3-14306
This commit is contained in:
Tristan Darricau
2015-12-11 21:31:27 +01:00
parent f6524f4902
commit 78349ed80f
3 changed files with 85 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/adm/style/overall_header.html
View File

@@ -49,7 +49,7 @@ function marklist(id, name, state)
}
var rb = parent.getElementsByTagName('input');
for (var r = 0; r < rb.length; r++)
{
if (rb[r].name.substr(0, name.length) == name)
@@ -103,7 +103,7 @@ function popup(url, width, height, name)
<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
<p id="skip"><a href="#acp">{L_SKIP}</a></p>
</div>
<div id="page-body">
<div id="tabs">
<ul>
@@ -120,7 +120,7 @@ function popup(url, width, height, name)
<!-- DEFINE $LI_USED = 0 -->
<!-- BEGIN l_block1 -->
<!-- IF l_block1.S_SELECTED -->
<!-- BEGIN l_block2 -->
<!-- IF .l_block1.l_block2.l_block3 -->
<!-- IF $LI_USED --></ul></div><!-- ENDIF -->
@@ -129,13 +129,13 @@ function popup(url, width, height, name)
<ul>
<!-- DEFINE $LI_USED = 1 -->
<!-- ENDIF -->
<!-- BEGIN l_block3 -->
<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
<!-- DEFINE $LI_USED = 1 -->
<!-- END l_block3 -->
<!-- END l_block2 -->
<!-- ENDIF -->
<!-- END l_block1 -->
<!-- IF $LI_USED -->
@@ -143,6 +143,14 @@ function popup(url, width, height, name)
</div>
<!-- ENDIF -->
</div>
<div id="main">
<div class="main">
<!-- IF CONTAINER_EXCEPTION !== false -->
<div class="errorbox">
<p>{L_CONTAINER_EXCEPTION}</p>
<p>{L_CONTAINER_EXCEPTION_DETAIL}</p>
<p>Exception message: {{ CONTAINER_EXCEPTION.getMessage() }}</p>
<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
</div>
<!-- ENDIF -->