Merge pull request #162 from iMattPro/fixes

Revert fontawesome 5 link

Author: iMattPro

adm/style/manage_pages.html

@@ -101,7 +101,7 @@ <h3>{{ lang('WARNING') }}</h3>
 				</select></dd>
 			</dl>
 			<dl>
-				<dt><label for="page_icon_font">{{ lang('ACP_PAGES_FORM_ICON_FONT') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_PAGES_FORM_ICON_FONT_EXPLAIN', U_FONTAWESOME_ICONS) }}</span></dt>
+				<dt><label for="page_icon_font">{{ lang('ACP_PAGES_FORM_ICON_FONT') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_PAGES_FORM_ICON_FONT_EXPLAIN', 'https://fontawesome.com/v4.7.0/icons/') }}</span></dt>
 				<dd><input name="page_icon_font" id="page_icon_font" type="text" size="15" maxlength="255" value="{{ PAGES_ICON_FONT }}" placeholder="files-o" /> <i style="font-size:14px" class="icon fa-{{ PAGES_ICON_FONT }}"></i></dd>
 			</dl>
 			<dl>

controller/admin_controller.php

@@ -368,7 +368,6 @@ protected function add_edit_page_data($entity)
 			'S_BBCODE_FLASH'	=> true,
 			'S_LINKS_ALLOWED'	=> true,
 
-			'U_FONTAWESOME_ICONS'	=> 'https://fontawesome.com/' . (phpbb_version_compare(PHPBB_VERSION, '3.3.0', '>') ? 'icons?d=gallery&m=free' : 'v4.7.0/icons/'),
 			'U_BACK'				=> $this->u_action,
 		));