-
Bug
-
Resolution: Won't Fix
-
Major
-
3.0.8
-
None
This weekend I ran the updater to update three separate forums to 3.0.8. It worked well (thanks!) and correctly reported a number of conflicts in a number of files. I then did the following:
- I noted the exact conflicts
- in each case I picked the option to use the new code block
- I used the download method for the update and downloaded the updated files as a zip
- I unzipped the downloaded files
- I re-installed the old code I needed into those files
- I uploaded the updated files to the site
- I clicked to continue with the update
The update continued and it rescanned the files. I assumed it would tell me that all files had been correctly changed but it surprised me by reporting that one file (adm/sytle/acp_users_overview.html) still needed to be modified. That was NOT a file that had shown any conflict first time around, and it did not get reported as having any conflicts this time around (it just reported that it still needed to be changed).
So I downloaded that updated file, reuploaded it to my site and clicked to continue with the update, and this time it reported that all was well and that I was done.
I tested out the site and everything appeared to be working fine except for when I tried to go to the acp and look at the overview page for a user. I got an error.
On investigating, I found that there were three lines at the end of adm/sytle/acp_users_overview.html that read as follows:
<!-- ENDIF -->
|
<!-- ENDIF -->
|
<!-- ENDIF -->
|
rather than only two lines the way there was supposed to be in a clean install. I fixed that and all was well. But I note that this happened in each of my three forums and did not seem to have anything to do with conflicts in the upgrade.
On further investigation, I discovered that the actual updated adm/style/acp_users_overview.html file that I had downloaded in step one (before I clicked continue and ran the file comparer a second time) already had all of the changes that were supposed to have been made to that file when going from phpbb3.0.7-PL1 to 3.0.8. So the odd thing is that the second sweep singled out that file and tried to make additional changes to it (which is when it added that extra <!-- ENDIF -->). :o
In case it's helpful, here's an example of the 3.0.7-PL1 version of that file on one of my forums:
<form id="user_overview" method="post" action="{U_ACTION}">
|
|
|
<fieldset>
|
<legend>{L_ACP_USER_OVERVIEW}</legend>
|
<dl>
|
<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
|
<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
|
<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
|
</dl>
|
<!-- ajs mod to add user_sig to overview module in acp - added next block -->
|
<dl>
|
<dt><label for="signature">{L_SIGNATURE}:</label><span><br />{L_SIGNATURE_EXPLAIN}</span></dt>
|
<dd><textarea name="signature" id="signature" class="inputbox" rows="3" cols="30">{SIGNATURE}</textarea></dd>
|
</dl>
|
<!-- IF S_USER_INACTIVE -->
|
<dl>
|
<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
|
<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
|
</dl>
|
<!-- ENDIF -->
|
<dl>
|
<dt><label>{L_REGISTERED}:</label></dt>
|
<dd><strong>{USER_REGISTERED}</strong></dd>
|
</dl>
|
<!-- IF S_USER_IP -->
|
<dl>
|
<dt><label>{L_REGISTERED_IP}:</label></dt>
|
<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
|
<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>
|
</dl>
|
<!-- ENDIF -->
|
<dl>
|
<dt><label>{L_LAST_ACTIVE}:</label></dt>
|
<dd><strong>{USER_LASTACTIVE}</strong></dd>
|
</dl>
|
<dl>
|
<dt><label>{L_POSTS}:</label></dt>
|
<dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>
|
</dl>
|
<dl>
|
<dt><label>{L_WARNINGS}:</label></dt>
|
<dd><strong>{USER_WARNINGS}</strong></dd>
|
</dl>
|
<dl>
|
<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
|
<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_YES}</label>
|
<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_NO}</label></dd>
|
</dl>
|
<dl>
|
<dt><label for="user_email">{L_EMAIL}:</label></dt>
|
<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" /></dd>
|
</dl>
|
<dl>
|
<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
|
<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" /></dd>
|
</dl>
|
<dl>
|
<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
|
<dd><input type="password" id="new_password" name="new_password" value="" /></dd>
|
</dl>
|
<dl>
|
<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
|
<dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd>
|
</dl>
|
<!-- ajs mod to add activation and deletion to top part of overview - added next two blocks -->
|
<dl>
|
<dt><label for="active">{ACTIVE}:</label></dt>
|
<dd><input type="checkbox" class="radio" name="action" value="active" id="active" /></dd>
|
</dl>
|
<!-- IF not S_OWN_ACCOUNT -->
|
<hr />
|
<dl>
|
<dt><label for="delete_user">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
|
<dd><input type="checkbox" class="radio" name="delete" value="1" /></dd>
|
<dd><select id="delete_user" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
|
</dl>
|
<!-- ENDIF -->
|
|
|
<p class="quick">
|
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
|
<!-- ajs mod to add activation to top of overview - commented out the next line
|
<input type="hidden" name="action" value="" /> -->
|
{S_FORM_TOKEN}
|
</p>
|
|
|
</fieldset>
|
</form>
|
|
|
<!-- IF not S_USER_FOUNDER or S_FOUNDER -->
|
|
|
<script type="text/javascript">
|
// <![CDATA[
|
|
|
function display_reason(option)
|
{
|
if (option != 'banuser' && option != 'banemail' && option != 'banip')
|
{
|
dE('reasons', -1);
|
return;
|
}
|
|
|
dE('reasons', 1);
|
|
|
element = document.getElementById('user_quick_tools').ban_reason;
|
|
|
if (element.value && element.value != '{LA_USER_ADMIN_BAN_NAME_REASON}' && element.value != '{LA_USER_ADMIN_BAN_EMAIL_REASON}' && element.value != '{LA_USER_ADMIN_BAN_IP_REASON}')
|
{
|
return;
|
}
|
|
|
if (option == 'banuser')
|
{
|
element.value = '{LA_USER_ADMIN_BAN_NAME_REASON}';
|
}
|
else if (option == 'banemail')
|
{
|
element.value = '{LA_USER_ADMIN_BAN_EMAIL_REASON}';
|
}
|
else if (option == 'banip')
|
{
|
element.value = '{LA_USER_ADMIN_BAN_IP_REASON}';
|
}
|
}
|
|
|
// ]]>
|
</script>
|
<!-- ajs mod - commented out the quick tools since the ones we care about we already added to the top of the form
|
<form id="user_quick_tools" method="post" action="{U_ACTION}">
|
|
|
<fieldset>
|
<legend>{L_USER_TOOLS}</legend>
|
<dl>
|
<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt>
|
<dd><select id="quicktools" name="action" onchange="display_reason(this.options[this.selectedIndex].value);">{S_ACTION_OPTIONS}</select></dd>
|
</dl>
|
<div style="display: none;" id="reasons">
|
<dl>
|
<dt><label for="ban_reason">{L_BAN_REASON}:</label></dt>
|
<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason" /></dd>
|
</dl>
|
<dl>
|
<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}:</label></dt>
|
<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>
|
</dl>
|
</div>
|
|
|
<p class="quick">
|
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
|
{S_FORM_TOKEN}
|
</p>
|
|
|
</fieldset>
|
|
|
</form>
|
-->
|
|
|
<!-- IF not S_OWN_ACCOUNT -->
|
<form id="user_delete" method="post" action="{U_ACTION}">
|
<fieldset>
|
<legend>{L_DELETE_USER}</legend>
|
<dl>
|
<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
|
<dd><select id="delete_type" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
|
</dl>
|
<p class="quick">
|
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
|
<input type="hidden" name="delete" value="1" />
|
{S_FORM_TOKEN}
|
</p>
|
</fieldset>
|
<!-- ENDIF -->
|
</form>
|
<!-- ENDIF -->
|