Skip to content

Commit

Permalink
Update to 2.7.10
Browse files Browse the repository at this point in the history
  • Loading branch information
denysdesign committed Jul 13, 2018
1 parent 5c46faf commit f4268e1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<project name="julib" default="dist" basedir=".">

<property name="VERSION" value="2.7.9"/>
<property name="VERSION" value="2.7.10"/>

<tstamp>
<format property="DATE" pattern="%d.%m.%Y" />
Expand Down
2 changes: 1 addition & 1 deletion julib/phpthumb/phpthumb.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class JUThumbs {
public $issafemode = null;
public $php_memory_limit = null;

public $phpthumb_version = '1.7.15-201806071234';
public $phpthumb_version = '1.7.15-201807101405';

//////////////////////////////////////////////////////////////////////

Expand Down
4 changes: 2 additions & 2 deletions julib/phpthumb/phpthumb.functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ public static function CleanUpURLencoding($url, $queryseperator='&') {
$cleaned_url = $parsed_url['scheme'].'://';
$cleaned_url .= ($parsed_url['username'] ? $parsed_url['username'].($parsed_url['password'] ? ':'.$parsed_url['password'] : '').'@' : '');
$cleaned_url .= $parsed_url['host'];
$cleaned_url .= (($parsed_url['port'] && ($parsed_url['port'] != URLschemeDefaultPort($parsed_url['scheme']))) ? ':'.$parsed_url['port'] : '');
$cleaned_url .= (($parsed_url['port'] && ($parsed_url['port'] != self::URLschemeDefaultPort($parsed_url['scheme']))) ? ':'.$parsed_url['port'] : '');
$cleaned_url .= '/'.implode('/', $CleanPathElements);
$cleaned_url .= (!empty($CleanQueries) ? '?'.implode($queryseperator, $CleanQueries) : '');
return $cleaned_url;
Expand All @@ -745,7 +745,7 @@ public static function ParseURLbetter($url) {
$parsedURL[$key] = null;
}
}
$parsedURL['port'] = ($parsedURL['port'] ? $parsedURL['port'] : URLschemeDefaultPort($scheme));
$parsedURL['port'] = ($parsedURL['port'] ? $parsedURL['port'] : self::URLschemeDefaultPort($parsedURL['scheme']));
return $parsedURL;
}

Expand Down

0 comments on commit f4268e1

Please sign in to comment.