xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-10 06:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Shadow
2014-03-10 08:42:13 +02:00
parent 15c6bb2fea
commit d9e9a82200
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Admin/Templates/config.tpl
-4
View File
@@ -155,18 +155,14 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
</tr>
<tr>
<td>Error Reporting</td>
<<<<<<< HEAD
<td><b>
<?php
echo (ERROR_REPORT=="error_reporting (0);")? "No": (ERROR_REPORT=="error_reporting (E_ALL);")? "Yes (E_ALL)":"Yes (E_ALL ^ E_NOTICE)";
?>
</b></td>
</tr>
=======
<td><b><?php echo (ERROR_REPORT=="error_reporting (0);")? "No": "Yes";?></b></td>
</tr>
>>>>>>> 743a19326cddff179e325da92167a5362a94a6a2
</table>
<table id="member">
Admin/Templates/editServerSet.tpl
-4
View File
@@ -289,14 +289,10 @@ function refresh(tz) {
<tr>
<td>Error Reporting</td>
<td><select name="error">
<<<<<<< HEAD
<option value="error_reporting (E_ALL ^ E_NOTICE);" <?php if(ERROR_REPORTING=="error_reporting (E_ALL ^ E_NOTICE);") echo "selected";?>>Yes</option>
<option value="error_reporting (0);" <?php if(ERROR_REPORTING=="error_reporting (0);") echo "selected";?>>No</option>
=======
<option value="error_reporting (E_ALL ^ E_NOTICE);" <?php if(ERROR_REPORT=="error_reporting (E_ALL ^ E_NOTICE);") echo "selected";?>>Yes</option>
<option value="error_reporting (0);" <?php if(ERROR_REPORT=="error_reporting (0);") echo "selected";?>>No</option>
>>>>>>> 743a19326cddff179e325da92167a5362a94a6a2
</select>
</td>
</tr>