Merge branch 'staging' of https://github.com/mxkmp29/joomla-cms into …

…tags
joomla · Aug 5, 2016 · 5f67d0a · 5f67d0a
2 parents 91e79e6 + a4f27fe
commit 5f67d0a
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 33 deletions.
diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.6" client="administrator">
 	<name>English (en-GB)</name>
-	<version>3.6.2</version>
+	<version>3.6.3</version>
 	<creationDate>August 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension version="3.6" client="administrator" type="language" method="upgrade">
 	<name>English (United Kingdom)</name>
 	<tag>en-GB</tag>
-	<version>3.6.2</version>
+	<version>3.6.3</version>
 	<creationDate>August 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.6.2-dev</version>
+	<version>3.6.3-dev</version>
 	<creationDate>August 2016</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -2,7 +2,7 @@
 <extension type="package" version="3.6" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>3.6.2.1</version>
+	<version>3.6.3.1</version>
 	<creationDate>August 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
@@ -3,7 +3,7 @@
 	version="3.6"
 	client="installation">
 	<name>English (United Kingdom)</name>
-	<version>3.6.2</version>
+	<version>3.6.3</version>
 	<creationDate>August 2016</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>

diff --git a/installation/language/ja-JP/ja-JP.ini b/installation/language/ja-JP/ja-JP.ini
@@ -28,6 +28,7 @@ INSTL_PRECHECK_ACTUAL="現在"
 
 ; Database view
 INSTL_DATABASE="データベース設定"
+INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQLデータベースのクエリが失敗しました。"
 INSTL_DATABASE_HOST_DESC="通常は <b>localhost</b> ですが、専用のホストを指定することもあります。<br />(特に日本国内の一般向けレンタルサーバなど)"
 INSTL_DATABASE_HOST_LABEL="ホスト名"
 INSTL_DATABASE_NAME_DESC="データベース名です。"
@@ -45,6 +46,7 @@ INSTL_DATABASE_TYPE_LABEL="データベース"
 INSTL_DATABASE_USER_DESC="データベースのユーザ名です。"
 INSTL_DATABASE_USER_LABEL="ユーザ名"
 
+
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="FTPパスを自動検出"
 INSTL_FTP="FTP設定"
@@ -329,9 +331,9 @@ INSTL_SAMPLE_BLOG_JP_SET="ブログ 日本語(JP)"
 INSTL_SAMPLE_BROCHURE_JP_SET="サイト 日本語(JP)"
 INSTL_SAMPLE_DATA_JP_SET="デフォルト 日本語(JP)"
 INSTL_SAMPLE_LEARN_JP_SET="Joomlaを学ぶ 日本語(JP)"
-INSTL_SAMPLE_TESTING_JP_SET="テスト 日本語(JP)"
+;INSTL_SAMPLE_TESTING_JP_SET="テスト 日本語(JP)"
 INSTL_SAMPLE_BLOG_JP_SET_DESC="いくつかの記事と過去の記事、ブログロール、最も読まれた記事などを表示したブログのサンプルです。"
 INSTL_SAMPLE_BROCHURE_JP_SET_DESC="いくつかのページ（ホーム・私たちについて・ニュース・お問い合わせで構成されるメニュー）と検索、カスタムHTML、ログインフォームモジュールを表示したサンプルです。"
 INSTL_SAMPLE_DATA_JP_SET_DESC="1ページ（1リンクのみのメニュー）と最新の記事、ログインフォームモジュールを表示したサンプルです。"
 INSTL_SAMPLE_LEARN_JP_SET_DESC="どのようにJoomla!が動作するかの解説記事を表示したサンプルです。"
-INSTL_SAMPLE_TESTING_JP_SET_DESC="Joomla!の動作テストに役立つすべてのメニューアイテムを表示したサンプルです。"
+;INSTL_SAMPLE_TESTING_JP_SET_DESC="Joomla!の動作テストに役立つすべてのメニューアイテムを表示したサンプルです。"
diff --git a/installation/language/ja-JP/ja-JP.xml b/installation/language/ja-JP/ja-JP.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.6" client="installation">
 	<name>Japanese 日本語 (Japan)</name>
-	<version>3.6.0</version>
-	<creationDate>May 2016</creationDate>
+	<version>3.6.2</version>
+	<creationDate>August 2016</creationDate>
 	<author>Joomla.jp</author>
 	<copyright>Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.6" client="site">
 	<name>English (en-GB)</name>
-	<version>3.6.2</version>
+	<version>3.6.3</version>
 	<creationDate>August 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension version="3.6" client="site" type="language" method="upgrade">
 	<name>English (United Kingdom)</name>
 	<tag>en-GB</tag>
-	<version>3.6.2</version>
+	<version>3.6.3</version>
 	<creationDate>August 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/libraries/cms/html/email.php b/libraries/cms/html/email.php
@@ -99,23 +99,8 @@ public static function cloak($mail, $mailto = true, $text = '', $email = true)
 				$tmpScript
 		";
 
-		if (strtolower(JFactory::getApplication()->input->server->get('HTTP_X_REQUESTED_WITH', '')) == 'xmlhttprequest')
-		{
-			// Use inline script for ajax calls
-			$inlineScript = "<script type='text/javascript'>" . $script . "</script>";
-		}
-		else
-		{
-			JFactory::getDocument()->addScriptDeclaration(
-				"
-		document.onreadystatechange = function () {
-			if (document.readyState == 'interactive') {
-			" . $script . "
-			}
-		};
-				"
-			);
-		}
+		// TODO: Use inline script for now
+		$inlineScript = "<script type='text/javascript'>" . $script . "</script>";
 
 		return '<span id="cloak' . $rand . '">' . JText::_('JLIB_HTML_CLOAKING') . '</span>' . $inlineScript;
 	}

diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
@@ -38,7 +38,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_LEVEL = '2-dev';
+	const DEV_LEVEL = '3-dev';
 
 	/**
 	 * Development status.
@@ -70,15 +70,15 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '4-August-2016';
+	const RELDATE = '5-August-2016';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '00:44';
+	const RELTIME = '00:32';
 
 	/**
 	 * Release timezone.

diff --git a/plugins/content/emailcloak/emailcloak.php b/plugins/content/emailcloak/emailcloak.php
@@ -479,8 +479,12 @@ protected function _cloak(&$text, &$params)
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
 
-		// Search for plain text email@example.org
-		$pattern = '~' . $searchEmail . '([^a-z0-9]|$)~i';
+		/*
+		 * Search for plain text email addresses, such as email@example.org but not within HTML tags:
+		 * <img src="..." title="email@example.org"> or <input type="text" placeholder="email@example.org">
+		 * The negative lookahead '(?![^<]*>)' is used to exclude this kind of occurrences
+		 */
+		$pattern = '~(?![^<>]*>)' . $searchEmail . '~i';
 
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{