aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-04-22 00:04:51 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-04-22 00:04:51 -0400
commit2a566b08632447ed17659b3134e908d2b4a6d2b0 (patch)
tree69a96e29ff602060ea1940f79e49141beccc890f
parent37b38abec657faeeed1318aad427b94d1123fea1 (diff)
parentff5274181c4ab8eb819a24994c4269549b35ad07 (diff)
downloadforums-2a566b08632447ed17659b3134e908d2b4a6d2b0.tar
forums-2a566b08632447ed17659b3134e908d2b4a6d2b0.tar.gz
forums-2a566b08632447ed17659b3134e908d2b4a6d2b0.tar.bz2
forums-2a566b08632447ed17659b3134e908d2b4a6d2b0.tar.xz
forums-2a566b08632447ed17659b3134e908d2b4a6d2b0.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10105] Update AIM express link. [ticket/10105] Update AIM application download link.
-rw-r--r--phpBB/styles/prosilver/template/memberlist_im.html2
-rw-r--r--phpBB/styles/subsilver2/template/memberlist_im.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index 29c4cf1b91..88c57eb8c5 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -39,7 +39,7 @@
<dt>&nbsp;</dt>
<dd><a href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd>
<dd><a href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a></dd>
- <dd><a href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a></dd>
+ <dd><a href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a href="http://www.aim.com/products/express">{L_IM_AIM_EXPRESS}</a></dd>
</dl>
<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index 7b650dda70..329c323ffa 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -19,7 +19,7 @@
<!-- IF S_SEND_AIM -->
<tr>
- <td class="row1" colspan="2" align="center"><br /><a class="gen" href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a> </td>
+ <td class="row1" colspan="2" align="center"><br /><a class="gen" href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://www.aim.com/products/express">{L_IM_AIM_EXPRESS}</a> </td>
</tr>
<tr>
<td class="cat" colspan="2" align="center">&nbsp;</td>