Contact Form 7 - Version 2.4.1

Version Description

Fixed a bug causing fatal error on WordPress 2.9.
Translations for Norwegian (Peter Holme) and Italian (Gianni Diurno) have been updated.

Files changed (5) hide show

includes/functions.php CHANGED Viewed

	@@ -95,13 +95,27 @@ function wpcf7_default_messages_template() {
95	return $messages;
96	}
97














98	function wpcf7_upload_dir( $type = false ) {
99	global $switched;
100
101	$siteurl = get_option( 'siteurl' );
102	$upload_path = trim( get_option( 'upload_path' ) );
103
104	- $main_override = ~~is_multisite~~() && defined( 'MULTISITE' ) && ~~is_main_site~~();
105
106	if ( empty( $upload_path ) ) {
107	$dir = WP_CONTENT_DIR . '/uploads';
	@@ -131,7 +145,7 @@ function wpcf7_upload_dir( $type = false ) {
131	$url = trailingslashit( $siteurl ) . UPLOADS;
132	}
133
134	- if ( ~~is_multisite~~() && ! $main_override
135	&& ( ! isset( $switched ) \|\| $switched === false ) ) {
136
137	if ( defined( 'BLOGUPLOADDIR' ) )


95	return $messages;
96	}
97
98	+ function wpcf7_is_multisite() { // will be removed when WordPress 2.9 is not supported
99	+ if ( function_exists( 'is_multisite' ) )
100	+ return is_multisite();
101	+
102	+ return false;
103	+ }
104	+
105	+ function wpcf7_is_main_site() { // will be removed when WordPress 2.9 is not supported
106	+ if ( function_exists( 'is_main_site' ) )
107	+ return is_main_site();
108	+
109	+ return false;
110	+ }
111	+
112	function wpcf7_upload_dir( $type = false ) {
113	global $switched;
114
115	$siteurl = get_option( 'siteurl' );
116	$upload_path = trim( get_option( 'upload_path' ) );
117
118	+ $main_override = wpcf7_is_multisite() && defined( 'MULTISITE' ) && wpcf7_is_main_site();
119
120	if ( empty( $upload_path ) ) {
121	$dir = WP_CONTENT_DIR . '/uploads';

145	$url = trailingslashit( $siteurl ) . UPLOADS;
146	}
147
148	+ if ( wpcf7_is_multisite() && ! $main_override
149	&& ( ! isset( $switched ) \|\| $switched === false ) ) {
150
151	if ( defined( 'BLOGUPLOADDIR' ) )

languages/wpcf7-it_IT.mo CHANGED Viewed

Binary file

languages/wpcf7-nb_NO.mo CHANGED Viewed

Binary file

readme.txt CHANGED Viewed

	@@ -4,7 +4,7 @@ Donate link: http://contactform7.com/donate/
4	Tags: contact, form, contact form, feedback, email, ajax, captcha, akismet, multilingual
5	Requires at least: 2.9
6	Tested up to: 3.0.1
7	- Stable tag: 2.4
8
9	Just another contact form plugin. Simple but flexible.
10
	@@ -55,7 +55,7 @@ It is hard to continue development and support for this plugin without contribut
55	* Latvian (lv) - [Sandis Veinbergs](http://www.kleofass.lv/)
56	* Lithuanian (lt_LT) - [Ernestas Kardzys](http://www.ernestas.info/)
57	* Malayalam (ml_IN) - [RAHUL.S.A](http://www.infution.co.cc/)
58	- * Norwegian (nb_NO) - Kjetil M. Bergem, [aanvik.net](http://www.aanvik.net)
59	* Persian (Farsi; fa_IR) - [Mohammad Musavi](http://www.musavis.com/)
60	* Polish (pl_PL) - [Zbigniew Czernik](http://zibik.jogger.pl/), [Daniel Fruzynski](http://www.poradnik-webmastera.com)
61	* Portuguese (pt_PT) - [Hugo Baeta](http://hugobaeta.com)
	@@ -99,6 +99,11 @@ Do you have questions or issues with Contact Form 7? Use these support channels
99
100	== Changelog ==
101





102	= 2.4 =
103
104	* Moved PO files to the external branch. They were space-consuming and enlarging the plugin package.


4	Tags: contact, form, contact form, feedback, email, ajax, captcha, akismet, multilingual
5	Requires at least: 2.9
6	Tested up to: 3.0.1
7	+ Stable tag: 2.4.1
8
9	Just another contact form plugin. Simple but flexible.
10

55	* Latvian (lv) - [Sandis Veinbergs](http://www.kleofass.lv/)
56	* Lithuanian (lt_LT) - [Ernestas Kardzys](http://www.ernestas.info/)
57	* Malayalam (ml_IN) - [RAHUL.S.A](http://www.infution.co.cc/)
58	+ * Norwegian (nb_NO) - Kjetil M. Bergem, [aanvik.net](http://www.aanvik.net), [Peter Holme](http://holme.se/nettsteder/)
59	* Persian (Farsi; fa_IR) - [Mohammad Musavi](http://www.musavis.com/)
60	* Polish (pl_PL) - [Zbigniew Czernik](http://zibik.jogger.pl/), [Daniel Fruzynski](http://www.poradnik-webmastera.com)
61	* Portuguese (pt_PT) - [Hugo Baeta](http://hugobaeta.com)

99
100	== Changelog ==
101
102	+ = 2.4.1 =
103	+
104	+ * Fixed a bug causing fatal error on WordPress 2.9.
105	+ * Translations for Norwegian (Peter Holme) and Italian (Gianni Diurno) have been updated.
106	+
107	= 2.4 =
108
109	* Moved PO files to the external branch. They were space-consuming and enlarging the plugin package.

wp-contact-form-7.php CHANGED Viewed

	@@ -5,7 +5,7 @@ Plugin URI: http://contactform7.com/
5	Description: Just another contact form plugin. Simple but flexible.
6	Author: Takayuki Miyoshi
7	Author URI: http://ideasilo.wordpress.com/
8	- Version: 2.4
9	*/
10
11	/* Copyright 2007-2010 Takayuki Miyoshi (email: takayukister at gmail.com)
	@@ -25,7 +25,7 @@ Version: 2.4
25	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
26	*/
27
28	- define( 'WPCF7_VERSION', '2.4' );
29
30	if ( ! defined( 'WPCF7_PLUGIN_BASENAME' ) )
31	define( 'WPCF7_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );


5	Description: Just another contact form plugin. Simple but flexible.
6	Author: Takayuki Miyoshi
7	Author URI: http://ideasilo.wordpress.com/
8	+ Version: 2.4.1
9	*/
10
11	/* Copyright 2007-2010 Takayuki Miyoshi (email: takayukister at gmail.com)

25	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
26	*/
27
28	+ define( 'WPCF7_VERSION', '2.4.1' );
29
30	if ( ! defined( 'WPCF7_PLUGIN_BASENAME' ) )
31	define( 'WPCF7_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );