Merge branch 'master' into cs/php7

2 files changed, 3 insertions, 3 deletions

diff --git a/it.class b/it.class
index c5c1179..eed0d1f 100644
--- a/it.class
+++ b/it.class
@@ -690,7 +690,7 @@ static function imageconvert($p)
 	$ultratimeout = file_exists("/opt/ultra/bin/ultratimeout") ? "/opt/ultra/bin/ultratimeout 30 " : "";
 
 	if (in_array($type, explode(',', $p['types'])))	# Valid type?
-		$cmdoutput = it::exec($ultratimeout . 'gm convert 2>&1 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?"', $p);
+		$cmdoutput = it::exec('( ' . $ultratimeout . 'gm convert 2>&1 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?" ) | grep -v "iCCP: known incorrect sRGB profile"', $p);
 
 	return $cmdoutput === "";
 }
diff --git a/it_cache.class b/it_cache.class
index 524a15f..27be919 100644
--- a/it_cache.class
+++ b/it_cache.class
@@ -39,7 +39,7 @@ static function _defaults($p)
 }
 
 /**
- * Get value for specific key from cache. Can be mixed value but no objects.
+ * Get value for specific key from cache. Can be mixed value but no objects. WARNING: only distributed works from shell
  * @param $key Key to get value for
  * @param $p['distributed'] Use distributed memcache (scalars may become strings) [false]
  * @return Value for given key or null
@@ -59,7 +59,7 @@ static function get($key, $p = array())
 }
 
 /**
- * Put value for specific key into cache. Can be mixed value but no objects.
+ * Put value for specific key into cache. Can be mixed value but no objects. WARNING: only distributed works from shell
  * @param $key Key to put value with
  * @param $value Value to put (mixed but no objects allowed)
  * @param $p['distributed'] Use distributed memcache (scalars may become strings) [false]