Merge branch 'release/6.7.x' into develop

fplanque · fplanque · commit bf0588b2fbd2 · 2016-11-17T23:10:32.000+01:00
# Conflicts:
#	bower.json
#	conf/_application.php
#	package.json
#	readme.html
#	readme.md
#	skins/bootstrap_blog_skin/_skin.class.php
#	skins/bootstrap_forums_skin/_skin.class.php
#	skins/bootstrap_gallery_legacy/_skin.class.php
#	skins/bootstrap_gallery_skin/_skin.class.php
#	skins/bootstrap_main_skin/_skin.class.php
#	skins/bootstrap_manual_skin/_skin.class.php
#	skins/bootstrap_photoblog_skin/_skin.class.php
#	skins/pureforums/_skin.class.php
diff --git a/conf/_application.php b/conf/_application.php
@@ -21,7 +21,7 @@
  * Release date (ISO)
  * @global string
  */
-$app_date = '2016-11-16';
+$app_date = '2016-11-17';
 
 /**
  * Long version string for checking differences
diff --git a/plugins/_adjust_headings.plugin.php b/plugins/_adjust_headings.plugin.php
@@ -19,7 +19,7 @@ class adjust_headings_plugin extends Plugin
 	var $code = 'h_levels';
 	var $name = 'Adjust headings';
 	var $priority = 105;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/plugins/_archives.plugin.php b/plugins/_archives.plugin.php
@@ -35,7 +35,7 @@ class archives_plugin extends Plugin
 	var $name;
 	var $code = 'evo_Arch';
 	var $priority = 50;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'The b2evo Group';
 	var $group = 'widget';
 	var $subgroup = 'navigation';
diff --git a/plugins/_auto_p.plugin.php b/plugins/_auto_p.plugin.php
@@ -22,7 +22,7 @@ class auto_p_plugin extends Plugin
 	var $code = 'b2WPAutP';
 	var $name = 'Auto P';
 	var $priority = 80;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/plugins/_autolinks.plugin.php b/plugins/_autolinks.plugin.php
@@ -28,7 +28,7 @@ class autolinks_plugin extends Plugin
 	var $code = 'b2evALnk';
 	var $name = 'Auto Links';
 	var $priority = 63;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/plugins/_bbcode.plugin.php b/plugins/_bbcode.plugin.php
@@ -22,7 +22,7 @@ class bbcode_plugin extends custom_tags_plugin
 	var $code = 'b2evBBco';
 	var $name = 'BB code';
 	var $priority = 50;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/plugins/_bookmarklet.plugin.php b/plugins/_bookmarklet.plugin.php
@@ -23,7 +23,7 @@ class bookmarklet_plugin extends Plugin
 	var $name = 'Bookmarklet';
 	var $code = 'cafeBkmk';
 	var $priority = 94;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'Cafelog team';
 	var $number_of_installs = 1;
 
diff --git a/plugins/_calendar.plugin.php b/plugins/_calendar.plugin.php
@@ -29,7 +29,7 @@ class calendar_plugin extends Plugin
 	var $name;
 	var $code = 'evo_Calr';
 	var $priority = 20;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'The b2evo Group';
 	var $group = 'widget';
 	var $subgroup = 'navigation';
diff --git a/plugins/_captcha_qstn.plugin.php b/plugins/_captcha_qstn.plugin.php
@@ -36,7 +36,7 @@
  */
 class captcha_qstn_plugin extends Plugin
 {
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'antispam';
 	var $code = 'captcha_qstn';
 
diff --git a/plugins/_escapecode.plugin.php b/plugins/_escapecode.plugin.php
@@ -21,7 +21,7 @@ class escapecode_plugin extends Plugin
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $number_of_installs = 1;
 
 
diff --git a/plugins/_facebook.plugin.php b/plugins/_facebook.plugin.php
@@ -32,7 +32,7 @@ class facebook_plugin extends Plugin
 	var $name;
 	var $code = 'evo_facebook';
 	var $priority = 20;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'The b2evo Group';
 	var $group = 'widget';
 	var $subgroup = 'other';
diff --git a/plugins/_generic_ping.plugin.php b/plugins/_generic_ping.plugin.php
@@ -30,7 +30,7 @@ class generic_ping_plugin extends Plugin
 	 */
 	var $code = 'b2evGPing';
 	var $priority = 50;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'The b2evo Group';
 	var $help_url = '';  // empty URL defaults to manual wiki
 
diff --git a/plugins/_gmcode.plugin.php b/plugins/_gmcode.plugin.php
@@ -30,7 +30,7 @@ class gmcode_plugin extends custom_tags_plugin
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $number_of_installs = 1;
 
 	var $toolbar_label = 'GM code:';
diff --git a/plugins/_google_maps.plugin.php b/plugins/_google_maps.plugin.php
@@ -34,7 +34,7 @@ class google_maps_plugin extends Plugin
 	var $name = 'Google Maps';
 	var $code = 'evo_Gmaps';
 	var $priority = 50;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'The b2evo Group';
 	var $help_url = '';  // empty URL defaults to manual wiki
 
diff --git a/plugins/_ping_b2evonet.plugin.php b/plugins/_ping_b2evonet.plugin.php
@@ -33,7 +33,7 @@ class ping_b2evonet_plugin extends Plugin
 	 */
 	var $code = 'ping_b2evonet';
 	var $priority = 50;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'The b2evo Group';
 
 	/*
diff --git a/plugins/_ping_pingomatic.plugin.php b/plugins/_ping_pingomatic.plugin.php
@@ -33,7 +33,7 @@ class ping_pingomatic_plugin extends Plugin
 	 */
 	var $code = 'ping_pingomatic';
 	var $priority = 50;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'http://daniel.hahler.de/';
 
 	/*
diff --git a/plugins/_quicktags.plugin.php b/plugins/_quicktags.plugin.php
@@ -22,7 +22,7 @@ class quicktags_plugin extends Plugin
 	var $code = 'b2evQTag';
 	var $name = 'Quick Tags';
 	var $priority = 30;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'editor';
 	var $number_of_installs = 1;
 
diff --git a/plugins/_shortcodes.plugin.php b/plugins/_shortcodes.plugin.php
@@ -22,7 +22,7 @@ class shortcodes_plugin extends Plugin
 	var $code = 'evo_shortcodes';
 	var $name = 'Short Codes';
 	var $priority = 40;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'editor';
 	var $number_of_installs = 1;
 
diff --git a/plugins/_smilies.plugin.php b/plugins/_smilies.plugin.php
@@ -29,7 +29,7 @@ class smilies_plugin extends Plugin
 	 * fp> There is... I can't remember the exact problem thouh. Probably some interaction with the code highlight or the video plugins.
 	 */
 	var $priority = 25;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $number_of_installs = 3; // QUESTION: dh> why 3?
 
diff --git a/plugins/_texturize.plugin.php b/plugins/_texturize.plugin.php
@@ -17,7 +17,7 @@ class texturize_plugin extends Plugin
 	var $code = 'b2WPTxrz';
 	var $name = 'Texturize';
 	var $priority = 90;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/plugins/_wacko.plugin.php b/plugins/_wacko.plugin.php
@@ -22,7 +22,7 @@ class wacko_plugin extends Plugin
 	var $code = 'b2evWcko';
 	var $name = 'Wacko formatting';
 	var $priority = 30;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/plugins/_whosonline.plugin.php b/plugins/_whosonline.plugin.php
@@ -29,7 +29,7 @@ class whosonline_plugin extends Plugin
 	var $name;
 	var $code = 'evo_WhosOnline';
 	var $priority = 96;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'The b2evo Group';
 	var $group = 'widget';
 	var $subgroup = 'other';
diff --git a/plugins/adsense_plugin/_adsense.plugin.php b/plugins/adsense_plugin/_adsense.plugin.php
@@ -27,7 +27,7 @@ class adsense_plugin extends Plugin
 	var $help_url = 'http://b2evolution.net/blog-ads/adsense-plugin.php';
 	var $short_desc;
 	var $long_desc;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $number_of_installs = 1;
 
 	/**
diff --git a/plugins/basic_antispam_plugin/_basic_antispam.plugin.php b/plugins/basic_antispam_plugin/_basic_antispam.plugin.php
@@ -32,7 +32,7 @@ class basic_antispam_plugin extends Plugin
 	var $name = 'Basic Antispam';
 	var $code = 'b2evBAspm';
 	var $priority = 60;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'The b2evo Group';
 	var $group = 'antispam';
 	var $number_of_installs = 1;
diff --git a/plugins/code_highlight_plugin/_code_highlight.plugin.php b/plugins/code_highlight_plugin/_code_highlight.plugin.php
@@ -66,7 +66,7 @@ class code_highlight_plugin extends Plugin
 	var $name = 'Code highlight';
 	var $code = 'evo_code';
 	var $priority = 27;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'Astonish Me';
 	var $group = 'rendering';
 	var $help_topic = 'code-highlight-plugin';
diff --git a/plugins/cookie_consent_plugin/_cookie_consent.plugin.php b/plugins/cookie_consent_plugin/_cookie_consent.plugin.php
@@ -23,7 +23,7 @@ class cookie_consent_plugin extends Plugin
 	var $priority = 1;
 	var $short_desc;
 	var $long_desc;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $number_of_installs = 1;
 
 
diff --git a/plugins/flowplayer_plugin/_flowplayer.plugin.php b/plugins/flowplayer_plugin/_flowplayer.plugin.php
@@ -23,7 +23,7 @@ class flowplayer_plugin extends Plugin
 	var $code = 'b2evFlwP';
 	var $name = 'Flowplayer';
 	var $priority = 80;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'files';
 	var $number_of_installs = 1;
 	var $allow_ext = array( 'flv', 'swf', 'mp4', 'ogv', 'webm', 'm3u8' );
diff --git a/plugins/geoip_plugin/_geoip.plugin.php b/plugins/geoip_plugin/_geoip.plugin.php
@@ -34,7 +34,7 @@ class geoip_plugin extends Plugin
 	var $name = 'GeoIP';
 	var $code = 'evo_GeoIP';
 	var $priority = 45;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'The b2evo Group';
 	var $group = 'antispam';
 
diff --git a/plugins/html5_mediaelementjs_plugin/_html5_mediaelementjs.plugin.php b/plugins/html5_mediaelementjs_plugin/_html5_mediaelementjs.plugin.php
@@ -22,7 +22,7 @@ class html5_mediaelementjs_plugin extends Plugin
 	var $code = 'b2evH5MP';
 	var $name = 'HTML 5 MediaElement.js Video and Audio Player';
 	var $priority = 80;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'files';
 	var $number_of_installs = 1;
 	var $allow_ext = array( 'flv', 'm4v', 'f4v', 'mp4', 'ogv', 'webm', 'mp3', 'm4a' );
diff --git a/plugins/html5_videojs_plugin/_html5_videojs.plugin.php b/plugins/html5_videojs_plugin/_html5_videojs.plugin.php
@@ -22,7 +22,7 @@ class html5_videojs_plugin extends Plugin
 	var $code = 'b2evH5VJSP';
 	var $name = 'HTML 5 VideoJS Player';
 	var $priority = 80;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'files';
 	var $number_of_installs = 1;
 	var $allow_ext = array( 'flv', 'm4v', 'f4v', 'mp4', 'ogv', 'webm' );
diff --git a/plugins/infodots_plugin/_infodots.plugin.php b/plugins/infodots_plugin/_infodots.plugin.php
@@ -21,7 +21,7 @@ class infodots_plugin extends Plugin
 	var $code = 'b2evoDot';
 	var $name = 'Info dots renderer';
 	var $priority = 95;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/plugins/markdown_plugin/_markdown.plugin.php b/plugins/markdown_plugin/_markdown.plugin.php
@@ -22,7 +22,7 @@ class markdown_plugin extends Plugin
 	var $code = 'b2evMark';
 	var $name = 'Markdown';
 	var $priority = 20;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/plugins/polls_plugin/_polls.plugin.php b/plugins/polls_plugin/_polls.plugin.php
@@ -23,7 +23,7 @@ class polls_plugin extends Plugin
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $number_of_installs = 1;
 
 
diff --git a/plugins/prism_plugin/_prism.plugin.php b/plugins/prism_plugin/_prism.plugin.php
@@ -21,7 +21,7 @@ class prism_plugin extends Plugin
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $number_of_installs = 1;
 
 
diff --git a/plugins/shortlinks_plugin/_shortlinks.plugin.php b/plugins/shortlinks_plugin/_shortlinks.plugin.php
@@ -22,7 +22,7 @@ class shortlinks_plugin extends Plugin
 	var $code = 'b2evWiLi';
 	var $name = 'Short Links';
 	var $priority = 35;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/plugins/star_plugin/_star.plugin.php b/plugins/star_plugin/_star.plugin.php
@@ -23,7 +23,7 @@ class star_plugin extends Plugin
 	var $code = 'b2evStar';
 	var $name = 'Star renderer';
 	var $priority = 55;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/plugins/test_plugin/_test.plugin.php b/plugins/test_plugin/_test.plugin.php
@@ -34,7 +34,7 @@ class test_plugin extends Plugin
 	var $name = 'Test';
 	var $code = 'evo_TEST';
 	var $priority = 50;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'The b2evo Group';
 	var $help_url = '';  // empty URL defaults to manual wiki
 
diff --git a/plugins/tinymce_plugin/_tinymce.plugin.php b/plugins/tinymce_plugin/_tinymce.plugin.php
@@ -36,7 +36,7 @@ class tinymce_plugin extends Plugin
 	var $code = 'evo_TinyMCE';
 	var $name = 'TinyMCE';
 	var $priority = 10;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'editor';
 	var $number_of_installs = 1;
 
diff --git a/plugins/twitter_plugin/_twitter.plugin.php b/plugins/twitter_plugin/_twitter.plugin.php
@@ -47,7 +47,7 @@ class twitter_plugin extends Plugin
 	 */
 	var $code = 'evo_twitter';
 	var $priority = 50;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $author = 'b2evolution Group';
 
 	/*
diff --git a/plugins/videoplug_plugin/_videoplug.plugin.php b/plugins/videoplug_plugin/_videoplug.plugin.php
@@ -25,7 +25,7 @@ class videoplug_plugin extends Plugin
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $number_of_installs = 1;
 
 
diff --git a/plugins/watermark_plugin/_watermark.plugin.php b/plugins/watermark_plugin/_watermark.plugin.php
@@ -25,7 +25,7 @@ class watermark_plugin extends Plugin
 	var $priority = 10;
 	var $short_desc;
 	var $long_desc;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $number_of_installs = 1;
 
 	var $fonts_dir = '';
diff --git a/plugins/widescroll_plugin/_widescroll.plugin.php b/plugins/widescroll_plugin/_widescroll.plugin.php
@@ -22,7 +22,7 @@ class widescroll_plugin extends Plugin
 	var $code = 'evo_widescroll';
 	var $name = 'Wide scroll';
 	var $priority = 100;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $number_of_installs = 1;
 
diff --git a/plugins/wikitables_plugin/_wikitables.plugin.php b/plugins/wikitables_plugin/_wikitables.plugin.php
@@ -22,7 +22,7 @@ class wikitables_plugin extends Plugin
 	var $code = 'b2evWiTa';
 	var $name = 'Wiki Tables';
 	var $priority = 15;
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 	var $group = 'rendering';
 	var $short_desc;
 	var $long_desc;
diff --git a/skins/_atom/_skin.class.php b/skins/_atom/_skin.class.php
@@ -21,7 +21,7 @@ class _atom_Skin extends Skin
 	 * Skin version
 	 * @var string
 	 */
-	var $version = '6.7.8';
+	var $version = '6.7.9';
 
   /**
 	 * Get default name for the skin.
diff --git a/skins/_rdf/_skin.class.php b/skins/_rdf/_skin.class.php
diff --git a/skins/_rss/_skin.class.php b/skins/_rss/_skin.class.php
diff --git a/skins/_rss2/_skin.class.php b/skins/_rss2/_skin.class.php
diff --git a/skins/_sitemap/_skin.class.php b/skins/_sitemap/_skin.class.php
diff --git a/skins/asevo/_skin.class.php b/skins/asevo/_skin.class.php
diff --git a/skins/dating_mood/_skin.class.php b/skins/dating_mood/_skin.class.php
diff --git a/skins/evopress/_skin.class.php b/skins/evopress/_skin.class.php
diff --git a/skins/photoalbums/_skin.class.php b/skins/photoalbums/_skin.class.php
diff --git a/skins/photoblog/_skin.class.php b/skins/photoblog/_skin.class.php
diff --git a/skins/touch/_skin.class.php b/skins/touch/_skin.class.php

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`*/`
`37`	`37`	`class captcha_qstn_plugin extends Plugin`
`38`	`38`	`{`
`39`		`- var $version = '6.7.8';`
	`39`	`+ var $version = '6.7.9';`
`40`	`40`	`var $group = 'antispam';`
`41`	`41`	`var $code = 'captcha_qstn';`
`42`	`42`