summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rothstein2016-04-08 03:26:40 (GMT)
committerDavid Rothstein2016-04-08 03:26:40 (GMT)
commitd33ac7eb6d1e8a0da7fb07454c1b6b32ba00ca7e (patch)
treec417450491cbb3c6c49ae9a9b5b8c83a7b736365
parent1c30c4186b121c542eadecdeed227bd12c320682 (diff)
Revert "Issue #2563403 by sashi.kiran, jenlampton, albertski, Daniel_Rose: Changed help text on image fields to clarify that uploaded images which are too large will be resized rather than rejected"7.x
This reverts commit 1c30c4186b121c542eadecdeed227bd12c320682.
-rw-r--r--CHANGELOG.txt2
-rw-r--r--modules/file/file.field.inc2
2 files changed, 1 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6b27de5..e6e6e19 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,8 +1,6 @@
Drupal 7.44, xxxx-xx-xx (development version)
-----------------------
-- Changed help text on image fields to clarify that uploaded images which are
- too large will be resized rather than rejected (translatable string change).
- Changed wording on the Update Manager settings page to clarify that the
option to check for disabled module updates also applies to uninstalled
modules (administrative-facing translatable string change).
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc
index ceb18b6..d592381 100644
--- a/modules/file/file.field.inc
+++ b/modules/file/file.field.inc
@@ -965,7 +965,7 @@ function theme_file_upload_help($variables) {
$descriptions[] = t('Images must be larger than !min pixels.', array('!min' => '<strong>' . $min . '</strong>'));
}
elseif ($max) {
- $descriptions[] = t('Images larger than !max pixels will be resized.', array('!max' => '<strong>' . $max . '</strong>'));
+ $descriptions[] = t('Images must be smaller than !max pixels.', array('!max' => '<strong>' . $max . '</strong>'));
}
}