Merge with 68448c0e84d13e053b855a82a27dc5d8c1ec8dc2

main/forum/viewthread_threaded.inc.php

@@ -140,10 +140,10 @@ $next_message=get_lang('NextMessage');
 $prev_message=get_lang('PrevMessage');
 
 // images
-$first_img 	= Display::return_icon('first.png',get_lang(''),array('style'=>'vertical-align: middle;'));
+$first_img 	= Display::return_icon('first.png',get_lang('FirstMessage'),array('style'=>'vertical-align: middle;'));
-$last_img 	= Display::return_icon('last.png',get_lang(''),array('style'=>'vertical-align: middle;'));
+$last_img 	= Display::return_icon('last.png',get_lang('LastMessage'),array('style'=>'vertical-align: middle;'));
-$prev_img 	= Display::return_icon('prev.png',get_lang(''),array('style'=>'vertical-align: middle;'));
+$prev_img 	= Display::return_icon('prev.png',get_lang('PrevMessage'),array('style'=>'vertical-align: middle;'));
-$next_img 	= Display::return_icon('next.png',get_lang(''),array('style'=>'vertical-align: middle;'));
+$next_img 	= Display::return_icon('next.png',get_lang('NextMessage'),array('style'=>'vertical-align: middle;'));
 
 // links
 $first_href = 'viewthread.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&thread='.Security::remove_XSS($_GET['thread']).'&gradebook='.$gradebook.'&origin='.$origin.'&id=1&post='.$prev_next_array[0];

main/inc/lib/fckeditor/editor/plugins/customizations/fckplugin.js

@@ -669,7 +669,16 @@ FCKSaveCommand.prototype.Execute = function()
 			// Let us check whether the button is styled, i.e. whether it is "nice".
 			if ( oForm.elements[i].getAttribute( 'class' )
 				// A workaround for the introduction sections.
-				|| oForm.elements[i].getAttribute( 'name' ) == 'intro_cmdUpdate' )
+				|| oForm.elements[i].getAttribute( 'name' ) == 'intro_cmdUpdate'
+				// and for Forums
+				|| oForm.elements[i].getAttribute( 'name' ) == 'SubmitForumCategory'
+				|| oForm.elements[i].getAttribute( 'name' ) == 'SubmitForum'
+				|| oForm.elements[i].getAttribute( 'name' ) == 'SubmitPost'
+				// and for Wikis
+				|| oForm.elements[i].getAttribute( 'name' ) == 'SaveWikiChange'
+				|| oForm.elements[i].getAttribute( 'name' ) == 'SaveWikiNew'
+				)
+				
 			{
 				try
 				{

main/wiki/index.php

@@ -1666,8 +1666,7 @@ if ($_GET['action']=='edit')
 				</select> %';
 				echo '<br/><br/>';
 				echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">';//prevent double post
-				echo '<input type="hidden" name="SaveWikiChange" value="'.get_lang('langSave').'">'; //for save icon
+				echo '<button class="save" type="submit" name="SaveWikiChange">'.get_lang('langSave').'</button>';//for save button Don't change name (see fckeditor/editor/plugins/customizations/fckplugin_compressed.js and fckplugin.js
-				echo '<button class="save" type="submit" name="SaveWikiChange">'.get_lang('langSave').'</button>';//for save button
 				echo '</div>';
 				echo '</form>';
 			}

main/wiki/wiki.inc.php

@@ -748,8 +748,7 @@ return true;
 	   </select> %';
 	echo '<br/><br/>';
 	echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">';//prevent double post
-	echo '<input type="hidden" name="SaveWikiNew" value="'.get_lang('langSave').'">'; //for save icon	
+	echo '<button class="save" type="submit" name="SaveWikiNew">'.get_lang('langSave').'</button>';//for button icon. Don't change name (see fckeditor/editor/plugins/customizations/fckplugin_compressed.js and fckplugin.js
-	echo '<button class="save" type="submit" name="SaveWikiNew">'.get_lang('langSave').'</button>';//for button icon
 	echo '</div>';
 	echo '</form>';
 }