Merge pull request #13 from rgarmsen2295/master

Remerge

2 files changed, 11 insertions, 9 deletions

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 55fc32c33..3079917ec 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -85,20 +85,22 @@ module.exports = React.createClass({
         var postFiles = [];
         var images = [];
         if (filenames) {
-            for (var i = 0; i < filenames.length && i < Constants.MAX_DISPLAY_FILES; i++) {
+            for (var i = 0; i < filenames.length; i++) {
                 var fileInfo = utils.splitFileLocation(filenames[i]);
                 if (Object.keys(fileInfo).length === 0) continue;
 
                 var type = utils.getFileType(fileInfo.ext);
 
                 if (type === "image") {
-                    postFiles.push(
-                        <div className="post-image__column" key={filenames[i]}>
-                            <a href="#" onClick={this.handleImageClick} data-img-id={images.length.toString()} data-toggle="modal" data-target={"#" + postImageModalId }><div ref={filenames[i]} className="post__load" style={{backgroundImage: 'url(/static/images/load.gif)'}}></div></a>
-                        </div>
-                    );
+                    if (i < Constants.MAX_DISPLAY_FILES) {
+                        postFiles.push(
+                            <div className="post-image__column" key={filenames[i]}>
+                                <a href="#" onClick={this.handleImageClick} data-img-id={images.length.toString()} data-toggle="modal" data-target={"#" + postImageModalId }><div ref={filenames[i]} className="post__load" style={{backgroundImage: 'url(/static/images/load.gif)'}}></div></a>
+                            </div>
+                        );
+                    }
                     images.push(filenames[i]);
-                } else {
+                } else if (i < Constants.MAX_DISPLAY_FILES) {
                     postFiles.push(
                         <div className="post-image__column custom-file" key={fileInfo.name}>
                             <a href={fileInfo.path+"."+fileInfo.ext} download={fileInfo.name+"."+fileInfo.ext}>
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index a9c2433f2..110634b50 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -1056,7 +1056,7 @@ var AppearanceTab = React.createClass({
 
                 themeSection = (
                     <SettingItemMax
-                        title="Theme"
+                        title="Theme Color"
                         inputs={inputs}
                         submit={this.submitTheme}
                         server_error={server_error}
@@ -1066,7 +1066,7 @@ var AppearanceTab = React.createClass({
             } else {
                 themeSection = (
                     <SettingItemMin
-                        title="Theme"
+                        title="Theme Color"
                         describe={this.state.theme}
                         updateSection={function(){self.props.updateSection("theme");}}
                     />