diff --git a/README.md b/README.md index e1075348130d5..8528a8f26475e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Is Joomla! for you? --------------------- * Joomla is [the right solution for most content web projects](https://docs.joomla.org/Joomla_Is_it_for_me%3F). * View Joomla's core [features here](http://www.joomla.org/core-features.html). -* Try it out for yourself in our [online demo](http://demo.joomla.org). +* Try it out for yourself in our [online demo](https://demo.joomla.org). How to find a Joomla! translation? --------------------- diff --git a/README.txt b/README.txt index fe24add8e3815..527ea986ac87e 100644 --- a/README.txt +++ b/README.txt @@ -13,7 +13,7 @@ 3- Is Joomla for you? * Joomla is the right solution for any content web project: https://docs.joomla.org/Joomla_Is_it_for_me%3F * See Features - http://www.joomla.org/core-features.html - * Try out our online demo: http://demo.joomla.org/ + * Try out our online demo: https://demo.joomla.org/ 4- How to find a Joomla! translation? * Repository of accredited language packs: http://community.joomla.org/translations.html diff --git a/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-12-03.sql b/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-12-03.sql new file mode 100644 index 0000000000000..1b272c13a6678 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-12-03.sql @@ -0,0 +1 @@ +UPDATE `#__extensions` SET `protected` = '0' WHERE `name` = 'plg_editors-xtd_article' AND `type` = "plugin" AND `element` = "article" AND `folder` = "editors-xtd"; diff --git a/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-01-21.sql b/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-01-21.sql new file mode 100644 index 0000000000000..96adfe3d927fa --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-01-21.sql @@ -0,0 +1,2 @@ +INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES +(700, 'COM_CPANEL_MSG_ROBOTS_TITLE', 'COM_CPANEL_MSG_ROBOTS_BODY', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.3.0', 1); \ No newline at end of file diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-12-02.sql b/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-12-02.sql deleted file mode 100644 index 0cc3bd1fd3c5d..0000000000000 --- a/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-12-02.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE "#__content" ALTER COLUMN "images" SET DEFAULT '{}'; -ALTER TABLE "#__content" ALTER COLUMN "urls" SET DEFAULT '{}'; -ALTER TABLE "#__content" ALTER COLUMN "attribs" SET DEFAULT '{}'; -ALTER TABLE "#__content" ALTER COLUMN "metadata" SET DEFAULT '{}'; diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-12-03.sql b/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-12-03.sql new file mode 100644 index 0000000000000..dca06cc1242be --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-12-03.sql @@ -0,0 +1 @@ +UPDATE "#__extensions" SET "protected" = '0' WHERE "name" = 'plg_editors-xtd_article' AND "type" = 'plugin' AND "element" = 'article' AND "folder" = 'editors-xtd'; diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-01-21.sql b/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-01-21.sql new file mode 100644 index 0000000000000..1e855e0c7b364 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-01-21.sql @@ -0,0 +1,2 @@ +INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES +(700, 'COM_CPANEL_MSG_ROBOTS_TITLE', 'COM_CPANEL_MSG_ROBOTS_BODY', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.3.0', 1); \ No newline at end of file diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-12-03.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-12-03.sql new file mode 100644 index 0000000000000..b22321e76ce64 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-12-03.sql @@ -0,0 +1 @@ +UPDATE [#__extensions] SET [protected] = '0' WHERE [name] = 'plg_editors-xtd_article' AND [type] = "plugin" AND [element] = "article" AND [folder] = "editors-xtd"; diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-01-21.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-01-21.sql new file mode 100644 index 0000000000000..345442d98bc64 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-01-21.sql @@ -0,0 +1,2 @@ +INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled]) +SELECT 700, 'COM_CPANEL_MSG_ROBOTS_TITLE', 'COM_CPANEL_MSG_ROBOTS_BODY', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.3.0', 1; \ No newline at end of file diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php index 5d946ed8e59fe..7e0096c1c59d7 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php @@ -137,7 +137,7 @@ - + php_settings['disable_functions']); ?> diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php index 557fac6cc0dc1..55f61e4fc701b 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default.php +++ b/administrator/components/com_banners/views/banners/tmpl/default.php @@ -71,7 +71,7 @@ - + @@ -137,7 +137,7 @@ value="ordering; ?>" class="width-20 text-area-order " /> - + id); ?> diff --git a/administrator/components/com_banners/views/clients/tmpl/default.php b/administrator/components/com_banners/views/clients/tmpl/default.php index 6b0e465b9bb6b..997a80a6f4197 100644 --- a/administrator/components/com_banners/views/clients/tmpl/default.php +++ b/administrator/components/com_banners/views/clients/tmpl/default.php @@ -60,7 +60,7 @@ - - - - - - -
+ @@ -99,7 +99,7 @@ $canChange = $user->authorise('core.edit.state', 'com_banners') && $canCheckin; ?>
+ id); ?> diff --git a/administrator/components/com_banners/views/download/tmpl/default.php b/administrator/components/com_banners/views/download/tmpl/default.php index 1318ea9471478..31d061cc43c03 100644 --- a/administrator/components/com_banners/views/download/tmpl/default.php +++ b/administrator/components/com_banners/views/download/tmpl/default.php @@ -25,8 +25,8 @@ class="form-validate"> input; ?>
- - + + diff --git a/administrator/components/com_banners/views/tracks/tmpl/default.php b/administrator/components/com_banners/views/tracks/tmpl/default.php index 0c6c8d9b377ba..0305edfa0dce5 100644 --- a/administrator/components/com_banners/views/tracks/tmpl/default.php +++ b/administrator/components/com_banners/views/tracks/tmpl/default.php @@ -72,7 +72,7 @@ -
+
+ @@ -160,7 +160,7 @@ - + id); ?> diff --git a/administrator/components/com_config/view/application/tmpl/default.php b/administrator/components/com_config/view/application/tmpl/default.php index 237bdec6ae16a..3ffef1d492810 100644 --- a/administrator/components/com_config/view/application/tmpl/default.php +++ b/administrator/components/com_config/view/application/tmpl/default.php @@ -19,7 +19,7 @@ JFactory::getDocument()->addScriptDeclaration(' Joomla.submitbutton = function(task) { - if (task == "application.cancel" || document.formvalidator.isValid(document.getElementById("application-form"))) + if (task === "config.cancel.application" || document.formvalidator.isValid(document.getElementById("application-form"))) { Joomla.submitform(task, document.getElementById("application-form")); } diff --git a/administrator/components/com_config/view/component/tmpl/default.php b/administrator/components/com_config/view/component/tmpl/default.php index a498ecc1b22a9..73d91780d3667 100644 --- a/administrator/components/com_config/view/component/tmpl/default.php +++ b/administrator/components/com_config/view/component/tmpl/default.php @@ -20,7 +20,7 @@ JFactory::getDocument()->addScriptDeclaration(' Joomla.submitbutton = function(task) { - if (task == "config.cancel.component" || document.formvalidator.isValid(document.getElementById("component-form"))) + if (task === "config.cancel.component" || document.formvalidator.isValid(document.getElementById("component-form"))) { Joomla.submitform(task, document.getElementById("component-form")); } diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml index 1c452e7e42448..4221b0e580074 100644 --- a/administrator/components/com_contact/config.xml +++ b/administrator/components/com_contact/config.xml @@ -532,13 +532,14 @@ > - + array('disabled.png', 'contacts.featured', 'COM_CONTACT_UNFEATURED', 'COM_CONTACT_TOGGLE_TO_FEATURE'), - 1 => array('featured.png', 'contacts.unfeatured', 'JFEATURED', 'COM_CONTACT_TOGGLE_TO_UNFEATURE'), + 0 => array('disabled.png', 'contacts.featured', 'COM_CONTACT_UNFEATURED', 'JGLOBAL_TOGGLE_FEATURED'), + 1 => array('featured.png', 'contacts.unfeatured', 'JFEATURED', 'JGLOBAL_TOGGLE_FEATURED'), ); $state = JArrayHelper::getValue($states, (int) $value, $states[1]); $html = JHtml::_('image', 'admin/' . $state[0], JText::_($state[2]), null, true); if ($canChange) { - $html = '' + $html = '' . $html . ''; } diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php index bac88e84a0df7..32f5b59c8f28c 100644 --- a/administrator/components/com_contact/models/fields/modal/contact.php +++ b/administrator/components/com_contact/models/fields/modal/contact.php @@ -62,7 +62,7 @@ protected function getInput() $script[] = ' jQuery("#' . $this->id . '_clear").removeClass("hidden");'; } - $script[] = ' SqueezeBox.close();'; + $script[] = ' jModalClose();'; $script[] = ' }'; // Clear button script diff --git a/administrator/components/com_contact/views/contacts/tmpl/default.php b/administrator/components/com_contact/views/contacts/tmpl/default.php index a5e34911f94fc..27f25c1c360f4 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default.php @@ -103,7 +103,7 @@ ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + @@ -168,7 +168,7 @@ value="ordering; ?>" class="width-20 text-area-order " /> - + id); ?> diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml index 15c8fabf2e085..a2ed3950473ae 100644 --- a/administrator/components/com_content/config.xml +++ b/administrator/components/com_content/config.xml @@ -403,7 +403,7 @@ - + - JHIDE + + + + + +
array('unfeatured', 'articles.featured', 'COM_CONTENT_UNFEATURED', 'COM_CONTENT_TOGGLE_TO_FEATURE'), - 1 => array('featured', 'articles.unfeatured', 'COM_CONTENT_FEATURED', 'COM_CONTENT_TOGGLE_TO_UNFEATURE'), + 0 => array('unfeatured', 'articles.featured', 'COM_CONTENT_UNFEATURED', 'JGLOBAL_TOGGLE_FEATURED'), + 1 => array('featured', 'articles.unfeatured', 'COM_CONTENT_FEATURED', 'JGLOBAL_TOGGLE_FEATURED'), ); $state = JArrayHelper::getValue($states, (int) $value, $states[1]); $icon = $state[0]; diff --git a/administrator/components/com_content/models/fields/modal/article.php b/administrator/components/com_content/models/fields/modal/article.php index 587e195d92246..9d02df9c18382 100644 --- a/administrator/components/com_content/models/fields/modal/article.php +++ b/administrator/components/com_content/models/fields/modal/article.php @@ -60,7 +60,7 @@ protected function getInput() $script[] = ' jQuery("#' . $this->id . '_clear").removeClass("hidden");'; } - $script[] = ' SqueezeBox.close();'; + $script[] = ' jModalClose();'; $script[] = ' }'; // Clear button script diff --git a/administrator/components/com_content/views/article/tmpl/pagebreak.php b/administrator/components/com_content/views/article/tmpl/pagebreak.php index 795179e9df0f3..1a868afc5f80a 100644 --- a/administrator/components/com_content/views/article/tmpl/pagebreak.php +++ b/administrator/components/com_content/views/article/tmpl/pagebreak.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; $script = 'function insertPagebreak() {' . "\n\t"; + // Get the pagebreak title $script .= 'var title = document.getElementById("title").value;' . "\n\t"; $script .= 'if (title != \'\') {' . "\n\t\t"; @@ -23,25 +24,25 @@ $script .= 'alt = "alt=\""+alt+"\" ";' . "\n\t"; $script .= '}' . "\n\t"; $script .= 'var tag = "
";' . "\n\t"; -$script .= 'window.parent.jInsertEditorText(tag, \'' . $this->eName . '\');' . "\n\t"; -$script .= 'window.parent.SqueezeBox.close();' . "\n\t"; +$script .= 'window.parent.jInsertEditorText(tag, ' . json_encode($this->eName) . ');' . "\n\t"; +$script .= 'window.parent.jModalClose();' . "\n\t"; $script .= 'return false;' . "\n"; $script .= '}' . "\n"; JFactory::getDocument()->addScriptDeclaration($script); ?>
- +
- +
-
+
- + - +
diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php index 1c588f72f39fc..7237ed8063122 100644 --- a/administrator/components/com_content/views/articles/tmpl/default.php +++ b/administrator/components/com_content/views/articles/tmpl/default.php @@ -77,7 +77,7 @@
+ @@ -103,7 +103,7 @@ + @@ -141,7 +141,7 @@ - + id); ?> @@ -162,7 +162,7 @@ -
+
checked_out) : ?> editor, $item->checked_out_time, 'articles.', $canCheckin); ?> @@ -177,7 +177,7 @@ escape($item->title); ?> - + escape($item->alias)); ?>
@@ -215,7 +215,7 @@
created, JText::_('DATE_FORMAT_LC4')); ?> + hits; ?> diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php index 74df0b88adf6a..aa283ebb68440 100644 --- a/administrator/components/com_content/views/featured/tmpl/default.php +++ b/administrator/components/com_content/views/featured/tmpl/default.php @@ -46,7 +46,7 @@ - -
+ @@ -97,7 +97,7 @@ $canChange = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin; ?>
+ id); ?> diff --git a/administrator/components/com_contenthistory/views/history/tmpl/modal.php b/administrator/components/com_contenthistory/views/history/tmpl/modal.php index e5ce8e3f2d46d..056ef8238099d 100644 --- a/administrator/components/com_contenthistory/views/history/tmpl/modal.php +++ b/administrator/components/com_contenthistory/views/history/tmpl/modal.php @@ -148,7 +148,7 @@ - save_date; ?> + save_date, 'Y-m-d H:i:s'); ?> sha1_hash == $hash) :?>   @@ -163,11 +163,13 @@ onclick="return listItemTask('cb','history.keep')" data-original-title="">   + + @@ -188,5 +190,3 @@ - - diff --git a/administrator/components/com_finder/helpers/indexer/parser/html.php b/administrator/components/com_finder/helpers/indexer/parser/html.php index f9f08ca2a0f82..8237bbab3d1e0 100644 --- a/administrator/components/com_finder/helpers/indexer/parser/html.php +++ b/administrator/components/com_finder/helpers/indexer/parser/html.php @@ -35,8 +35,19 @@ public function parse($input) // Strip invalid UTF-8 characters. $input = iconv("utf-8", "utf-8//IGNORE", $input); - // Convert + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Header 1Header 2Header 3
Footer 1Footer 2Footer 3
Cell data 1Cell data 2Cell data 3
Cell data 4Cell data 5Cell data 6
Cell data 7Cell data 8Cell data 9
+ + + + + + + + + + + + + + + +
limelemonorangeblood orange
87125
+ +
+
House number:
+
Street:
+
+
+ + + + + + + +

This is bold, this is italic, this is teletype.

+
+

This is subscript, this is superscript, this is big, this is small.

+ + some + diff --git a/tests/unit/suites/finderIndexer/parser/FinderIndexerParserHtmlTest.php b/tests/unit/suites/finderIndexer/parser/FinderIndexerParserHtmlTest.php index a746c6fd90773..aed7042691f35 100644 --- a/tests/unit/suites/finderIndexer/parser/FinderIndexerParserHtmlTest.php +++ b/tests/unit/suites/finderIndexer/parser/FinderIndexerParserHtmlTest.php @@ -43,4 +43,108 @@ public function testParse() $this->object->parse($input) ); } + + /** + * Test with parsing more complex HTML. + */ + public function testParseComplex() + { + $testResult1 = 'to this text or tis thext using'; + $testResult2 = 'Microsoft web browser'; + $testResult3 = 'title'; + $testResult4 = 'title immediately'; + + $input = file_get_contents(dirname(__DIR__) . '/data/parseHtml2.txt'); + $output = $this->object->parse($input); + + // String $testResult1 will only be present if tags are removed. + $this->assertContains( + $testResult1, + $output + ); + + // String $testResult2 is contained in an HTML attribute that should be removed. + $this->assertNotContains( + $testResult2, + $output + ); + + // String $testResult3 will only be present if

tag is removed + // and replaced by a space. + $this->assertContains( + $testResult3, + $output + ); + + // String $testResult4 will only be present if

tag is removed + // and replaced by exactly one space. + $this->assertContains( + $testResult4, + $output + ); + } + + /** + * Tests the removal of unwanted HTML blocks. + */ + public function testRemoveBlocks() + { + $testResult1 = 'koala'; + $testResult2 = 'No JavaScript'; + $testResult3 = 'background'; + $testResult4 = 'This is a title'; + $testResult5 = 'an invalid block'; + + $input = file_get_contents(dirname(__DIR__) . '/data/parseHtml2.txt'); + $output = $this->object->parse($input); + + // String $testResult1 is contained in a