Merge lp:~edb/quam-plures/another_image_branch into lp:quam-plures

[EdB]

http://forums.quamplures.net/viewtopic.php?f=16&t=854

[EdB (edb)]

i ran out of punctuation marks to follow a bump with. to be honest even the ellipsis was a reach but it can and does end a sentence so i guess it is okay. this is a bug fix. anybody actually playing anymore?

[Tilman Blumenbach (tblue)]

Well, I agree things have slowed down a bit again, but I'll try to look at most of the R2Ms today.

[Tilman Blumenbach (tblue)]

Tested and found to be working.

review: Approve

[Kimberly (kimberly-netweb360)]

Has this branch anything to do with the comments I made in the forum? I will grab the branch and test as soon as possible. Gardening takes all my time these days.

[EdB (edb)]

Only if you noticed you can not insert an image that does not have a caption, which is what this branch fixes http://forums.quamplures.net/viewtopic.php?f=16&t=854

[Tilman Blumenbach (tblue)]

Same here: It would be good if somebody else could test and approve this branch as well.

[lp:~edb/quam-plures/another_image_branch]

7606. By EdB on 2011-07-12

adding core updates

[Tilman Blumenbach (tblue)]

You're right, EdB, nobody plays here anyway, so I'm just going to merge this.

review: Approve (merge)

=== modified file 'qp_inc/files/views/_file_list.inc.php'
--- qp_inc/files/views/_file_list.inc.php	2011-02-23 14:42:27 +0000
+++ qp_inc/files/views/_file_list.inc.php	2011-07-12 19:04:32 +0000
@@ -677,6 +677,7 @@
 		var caption_class = '<?php echo $file_tags['caption_class']; ?>';
 		var caption_style = '<?php echo $file_tags['caption_style']; ?>';
 		var caption_post = '<?php echo $file_tags['caption_post']; ?>';
+		var caption_none = '<?php echo $file_tags['caption_none']; ?>';
 		var caption_separator = '<?php echo $file_tags['caption_separator']; ?>';
 
 		var snippet = ''; // this is what we will eventually insert into the item