From: Pascal K. <pa...@ku...> - 2012-02-16 20:59:31
|
+1 (fixes r35813) pkdille 2011/8/4 <sy...@us...> > Revision: 35824 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35824&view=rev > Author: sylvieg > Date: 2011-08-04 13:26:03 +0000 (Thu, 04 Aug 2011) > > Log Message: > ----------- > [FIX]bad merge in 35813 > > Modified Paths: > -------------- > branches/proposals/6.x/tiki-download_file.php > > Modified: branches/proposals/6.x/tiki-download_file.php > =================================================================== > --- branches/proposals/6.x/tiki-download_file.php 2011-08-04 > 13:20:24 UTC (rev 35823) > +++ branches/proposals/6.x/tiki-download_file.php 2011-08-04 > 13:26:03 UTC (rev 35824) > @@ -286,7 +286,6 @@ > } > > if ( ! isset($_GET['icon']) || ( > isset($_GET['format']) && $_GET['format'] != $format ) ) { > - if ( ! empty($info['path']) ) { > if ( ! empty($info['path']) ) { > $image = new > Image($prefs['fgal_use_dir'].$info['path'], true); > } else { > > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA > The must-attend event for mobile developers. Connect with experts. > Get tools for creating Super Apps. See the latest technologies. > Sessions, hands-on labs, demos & much more. Register early & save! > http://p.sf.net/sfu/rim-blackberry-1 > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |