diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-15 16:00:57 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-15 16:00:57 +0100 |
| commit | 71fcf515f5f7f780b053b920f342bdac9bf1b7c4 (patch) | |
| tree | 6bcbc10e70f69782cee1deda19bd0e6f7a8f30c7 | |
| parent | 2643fc174cfce2c89b096e1aa28b8433c1bd9088 (diff) | |
| parent | 900984773e07ba34cbb6f6f7ed394210213153ec (diff) | |
| download | rpg-71fcf515f5f7f780b053b920f342bdac9bf1b7c4.tar.gz rpg-71fcf515f5f7f780b053b920f342bdac9bf1b7c4.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into diff_navigation
| -rw-r--r-- | inc/html.php | 2 | ||||
| -rw-r--r-- | inc/media.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/inc/html.php b/inc/html.php index 3e239cac3..9951e4b57 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1213,7 +1213,7 @@ function html_diff($text='',$intro=true,$type=null){ $diffurl = wl($ID, array( 'do' => 'diff', 'rev2[0]' => $l_rev, - 'rev2[1]' => $r_rev, + 'rev2[1]' => $r_rev ? $r_rev : $INFO['lastmod'], // link to exactly this view FS#2835 'difftype' => $type, )); ptln('<p><a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a><br />'); diff --git a/inc/media.php b/inc/media.php index 8fb67c31d..1d6d9f4fc 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1821,7 +1821,7 @@ function media_resize_image($file, $ext, $w, $h=0){ if( $mtime > filemtime($file) || media_resize_imageIM($ext,$file,$info[0],$info[1],$local,$w,$h) || media_resize_imageGD($ext,$file,$info[0],$info[1],$local,$w,$h) ){ - if($conf['fperm']) chmod($local, $conf['fperm']); + if($conf['fperm']) @chmod($local, $conf['fperm']); return $local; } //still here? resizing failed @@ -1882,7 +1882,7 @@ function media_crop_image($file, $ext, $w, $h=0){ if( $mtime > @filemtime($file) || media_crop_imageIM($ext,$file,$info[0],$info[1],$local,$cw,$ch,$cx,$cy) || media_resize_imageGD($ext,$file,$cw,$ch,$local,$cw,$ch,$cx,$cy) ){ - if($conf['fperm']) chmod($local, $conf['fperm']); + if($conf['fperm']) @chmod($local, $conf['fperm']); return media_resize_image($local,$ext, $w, $h); } |