Updates

kernel/admin/views/edit-user.php

@@ -97,7 +97,12 @@ HTML::formClose();
 
 echo '</div>';
 echo '<div class="uk-width-3-10" style="margin-top: 50px; text-align: center;">';
-echo '<img id="jsprofilePicture" class="uk-border-rounded" src="'.HTML_PATH_UPLOADS_PROFILES.$_user['username'].'.jpg" alt="'.$L->g('Profile picture').'">';
+if(file_exists(PATH_UPLOADS_PROFILES.$_user['username'].'.jpg')) {
+	echo '<img id="jsprofilePicture" class="uk-border-rounded" src="'.HTML_PATH_UPLOADS_PROFILES.$_user['username'].'.jpg" alt="'.$L->g('Profile picture').'">';
+}
+else {
+	echo '<div class="uk-block uk-border-rounded uk-block-muted uk-block-large">'.$L->g('Profile picture').'</div>';
+}
 HTML::profileUploader($_user['username']);
 echo '</div>';
 echo '</div>';
@@ -122,4 +127,4 @@ $(document).ready(function() {
 
 });
 
-</script>
+</script>

plugins/tinymce/plugin.php

@@ -65,9 +65,13 @@ class pluginTinymce extends Plugin {
 		// Load CSS and JS only on Controllers in array.
 		if(in_array($layout['controller'], $this->loadWhenController))
 		{
-			$language = $Site->shortLanguage();
 			$pluginPath = $this->htmlPath();
 
+			$language = '';
+			if($Site->shortLanguage()!=='en') {
+				$language = 'language_url:"'.$pluginPath.'tinymce/langs/'.$Site->shortLanguage().'.js",';
+			}
+
 			$html  = '<script>$(document).ready(function() { ';
 			$html .= 'tinymce.init({
 				selector: "#jscontent",
@@ -79,7 +83,7 @@ class pluginTinymce extends Plugin {
 				width:"100%",
 				statusbar: false,
 				menubar:false,
-				language_url:"'.$pluginPath.'tinymce/langs/'.$language.'.js",
+				'.$language.'
 				browser_spellcheck: true,
 				autoresize_bottom_margin: "50",
 				pagebreak_separator: "'.PAGE_BREAK.'",