Skip to content

Commit 9a0522d

Browse files
Adam HopkinsAdam Hopkins
Adam Hopkins
authored and
Adam Hopkins
committed
fixed error in generate_output where url was not set
1 parent 6018081 commit 9a0522d

File tree

8 files changed

+21
-10
lines changed

8 files changed

+21
-10
lines changed

Changes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,6 @@ Revision history for jQuery-File-Upload
102102

103103
0.25
104104
added size function for file size
105+
106+
0.26
107+
fixed issue in generate_output where url was not set

MYMETA.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
}
4747
},
4848
"release_status" : "stable",
49-
"version" : "0.25"
49+
"version" : "0.26"
5050
}

MYMETA.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ requires:
2828
Net::SSH2::SFTP: '0'
2929
URI: '0'
3030
perl: '5.006'
31-
version: '0.25'
31+
version: '0.26'

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ DIRFILESEP = /
6262
DFSEP = $(DIRFILESEP)
6363
NAME = jQuery::File::Upload
6464
NAME_SYM = jQuery_File_Upload
65-
VERSION = 0.25
65+
VERSION = 0.26
6666
VERSION_MACRO = VERSION
67-
VERSION_SYM = 0_25
67+
VERSION_SYM = 0_26
6868
DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
69-
XS_VERSION = 0.25
69+
XS_VERSION = 0.26
7070
XS_VERSION_MACRO = XS_VERSION
7171
XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
7272
INST_ARCHLIB = blib/arch
@@ -262,7 +262,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
262262
DIST_CP = best
263263
DIST_DEFAULT = tardist
264264
DISTNAME = jQuery-File-Upload
265-
DISTVNAME = jQuery-File-Upload-0.25
265+
DISTVNAME = jQuery-File-Upload-0.26
266266

267267

268268
# --- MakeMaker macro section:
@@ -514,7 +514,7 @@ metafile : create_distdir
514514
$(NOECHO) $(ECHO) ' Net::SSH2::SFTP: '\''0'\''' >> META_new.yml
515515
$(NOECHO) $(ECHO) ' URI: '\''0'\''' >> META_new.yml
516516
$(NOECHO) $(ECHO) ' perl: '\''5.006'\''' >> META_new.yml
517-
$(NOECHO) $(ECHO) 'version: '\''0.25'\''' >> META_new.yml
517+
$(NOECHO) $(ECHO) 'version: '\''0.26'\''' >> META_new.yml
518518
-$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml
519519
$(NOECHO) $(ECHO) Generating META.json
520520
$(NOECHO) $(ECHO) '{' > META_new.json
@@ -565,7 +565,7 @@ metafile : create_distdir
565565
$(NOECHO) $(ECHO) ' }' >> META_new.json
566566
$(NOECHO) $(ECHO) ' },' >> META_new.json
567567
$(NOECHO) $(ECHO) ' "release_status" : "stable",' >> META_new.json
568-
$(NOECHO) $(ECHO) ' "version" : "0.25"' >> META_new.json
568+
$(NOECHO) $(ECHO) ' "version" : "0.26"' >> META_new.json
569569
$(NOECHO) $(ECHO) '}' >> META_new.json
570570
-$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json
571571

blib/lib/jQuery/File/Upload.pm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use URI;
1717
#use LWP::UserAgent;
1818
#use LWP::Protocol::https;
1919

20-
our $VERSION = '0.25';
20+
our $VERSION = '0.26';
2121

2222
my %errors = (
2323
'_validate_max_file_size' => 'File is too big',
@@ -729,6 +729,10 @@ sub generate_output {
729729
$h{name} = $_->{filename};
730730
}
731731

732+
if($_->{filename}) {
733+
$self->filename($_->{filename});
734+
}
735+
732736
if(exists $_->{thumbnail_filename}) {
733737
$self->thumbnail_filename($_->{thumbnail_filename});
734738
}

jQuery-File-Upload-0.25.tar.gz

-20.1 KB
Binary file not shown.

jQuery-File-Upload-0.26.tar.gz

20.2 KB
Binary file not shown.

lib/jQuery/File/Upload.pm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use URI;
1717
#use LWP::UserAgent;
1818
#use LWP::Protocol::https;
1919

20-
our $VERSION = '0.25';
20+
our $VERSION = '0.26';
2121

2222
my %errors = (
2323
'_validate_max_file_size' => 'File is too big',
@@ -729,6 +729,10 @@ sub generate_output {
729729
$h{name} = $_->{filename};
730730
}
731731

732+
if($_->{filename}) {
733+
$self->filename($_->{filename});
734+
}
735+
732736
if(exists $_->{thumbnail_filename}) {
733737
$self->thumbnail_filename($_->{thumbnail_filename});
734738
}

0 commit comments

Comments
 (0)