Skip to content

Commit 49576c6

Browse files
HackwarHackwar
authored
Merge branch '4.2-dev' into 4.2-finder-optimise
2 parents 2c39ac7 + 9ee1dd3 commit 49576c6

File tree

171 files changed

+2646
-511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+2646
-511
lines changed

‎.drone.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ steps:
2424
- echo $(date)
2525

2626
- name: npm
27-
image: node:14-alpine
27+
image: node:16-alpine
2828
depends_on: [ phpcs ]
2929
commands:
3030
- npm ci --unsafe-perm
@@ -420,6 +420,6 @@ steps:
420420

421421
---
422422
kind: signature
423-
hmac: adfaa112f82d0487b292e9b22400b04abfbf56eb44516bc764abc1804a6f472b
423+
hmac: 24b9cf86c8dcb5efc6b7c0dfc7bd774410f81907d228eb63931224449953d9fe
424424

425425
...

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Build Status
55
---------------------
66
| Drone-CI | AppVeyor | PHP | Node | npm |
77
| ------------- | ------------- | ------------- | ------------- | ------------- |
8-
| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.1-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V7.2.5-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V12.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v6.13.4-green)](https://nodejs.org/en/) |
8+
| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.1-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V7.2.5-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V16.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v8.6.0-green)](https://nodejs.org/en/) |
99

1010
Overview
1111
---------------------

‎administrator/components/com_admin/script.php‎

Lines changed: 89 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6387,6 +6387,73 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
63876387
'/administrator/components/com_users/src/Field/PrimaryauthprovidersField.php',
63886388
// From 4.1.2 to 4.1.3
63896389
'/libraries/vendor/webmozart/assert/.php_cs',
6390+
// From 4.1.3 to 4.1.4
6391+
'/libraries/vendor/maximebf/debugbar/.bowerrc',
6392+
'/libraries/vendor/maximebf/debugbar/bower.json',
6393+
'/libraries/vendor/maximebf/debugbar/build/namespaceFontAwesome.php',
6394+
'/libraries/vendor/maximebf/debugbar/demo/ajax.php',
6395+
'/libraries/vendor/maximebf/debugbar/demo/ajax_exception.php',
6396+
'/libraries/vendor/maximebf/debugbar/demo/bootstrap.php',
6397+
'/libraries/vendor/maximebf/debugbar/demo/bridge/cachecache/index.php',
6398+
'/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/bootstrap.php',
6399+
'/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/build.sh',
6400+
'/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/cli-config.php',
6401+
'/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/index.php',
6402+
'/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/src/Demo/Product.php',
6403+
'/libraries/vendor/maximebf/debugbar/demo/bridge/monolog/index.php',
6404+
'/libraries/vendor/maximebf/debugbar/demo/bridge/propel/build.properties',
6405+
'/libraries/vendor/maximebf/debugbar/demo/bridge/propel/build.sh',
6406+
'/libraries/vendor/maximebf/debugbar/demo/bridge/propel/index.php',
6407+
'/libraries/vendor/maximebf/debugbar/demo/bridge/propel/runtime-conf.xml',
6408+
'/libraries/vendor/maximebf/debugbar/demo/bridge/propel/schema.xml',
6409+
'/libraries/vendor/maximebf/debugbar/demo/bridge/slim/index.php',
6410+
'/libraries/vendor/maximebf/debugbar/demo/bridge/swiftmailer/index.php',
6411+
'/libraries/vendor/maximebf/debugbar/demo/bridge/twig/foobar.html',
6412+
'/libraries/vendor/maximebf/debugbar/demo/bridge/twig/hello.html',
6413+
'/libraries/vendor/maximebf/debugbar/demo/bridge/twig/index.php',
6414+
'/libraries/vendor/maximebf/debugbar/demo/dump_assets.php',
6415+
'/libraries/vendor/maximebf/debugbar/demo/index.php',
6416+
'/libraries/vendor/maximebf/debugbar/demo/open.php',
6417+
'/libraries/vendor/maximebf/debugbar/demo/pdo.php',
6418+
'/libraries/vendor/maximebf/debugbar/demo/stack.php',
6419+
'/libraries/vendor/maximebf/debugbar/docs/ajax_and_stack.md',
6420+
'/libraries/vendor/maximebf/debugbar/docs/base_collectors.md',
6421+
'/libraries/vendor/maximebf/debugbar/docs/bridge_collectors.md',
6422+
'/libraries/vendor/maximebf/debugbar/docs/data_collectors.md',
6423+
'/libraries/vendor/maximebf/debugbar/docs/data_formatter.md',
6424+
'/libraries/vendor/maximebf/debugbar/docs/http_drivers.md',
6425+
'/libraries/vendor/maximebf/debugbar/docs/javascript_bar.md',
6426+
'/libraries/vendor/maximebf/debugbar/docs/manifest.json',
6427+
'/libraries/vendor/maximebf/debugbar/docs/openhandler.md',
6428+
'/libraries/vendor/maximebf/debugbar/docs/rendering.md',
6429+
'/libraries/vendor/maximebf/debugbar/docs/screenshot.png',
6430+
'/libraries/vendor/maximebf/debugbar/docs/storage.md',
6431+
'/libraries/vendor/maximebf/debugbar/docs/style.css',
6432+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/AggregatedCollectorTest.php',
6433+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/ConfigCollectorTest.php',
6434+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/MessagesCollectorTest.php',
6435+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/MockCollector.php',
6436+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/Propel2CollectorTest.php',
6437+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/TimeDataCollectorTest.php',
6438+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataFormatter/DataFormatterTest.php',
6439+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataFormatter/DebugBarVarDumperTest.php',
6440+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DebugBarTest.php',
6441+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DebugBarTestCase.php',
6442+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/JavascriptRendererTest.php',
6443+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/MockHttpDriver.php',
6444+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/OpenHandlerTest.php',
6445+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/Storage/FileStorageTest.php',
6446+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/Storage/MockStorage.php',
6447+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/TracedStatementTest.php',
6448+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/full_init.html',
6449+
'/libraries/vendor/maximebf/debugbar/tests/bootstrap.php',
6450+
// From 4.1 to 4.2.0
6451+
'/libraries/src/Service/Provider/ApiRouter.php',
6452+
'/libraries/vendor/nyholm/psr7/doc/final.md',
6453+
'/modules/mod_articles_news/mod_articles_news.php',
6454+
'/plugins/api-authentication/basic/basic.php',
6455+
'/plugins/api-authentication/token/token.php',
6456+
'/plugins/system/cache/cache.php',
63906457
);
63916458

63926459
$folders = array(
@@ -7720,10 +7787,28 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
77207787
'/libraries/vendor/tobscure/json-api/.git/hooks',
77217788
'/libraries/vendor/tobscure/json-api/.git/branches',
77227789
'/libraries/vendor/tobscure/json-api/.git',
7723-
// From 4.1.1 to 4.1.2
7724-
'/administrator/components/com_users/src/Field/PrimaryauthprovidersField.php',
7725-
// From 4.1.1 to 4.2.0
7726-
'/libraries/src/Service/Provider/ApiRouter.php'
7790+
// From 4.1.3 to 4.1.4
7791+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/Storage',
7792+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataFormatter',
7793+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector',
7794+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests',
7795+
'/libraries/vendor/maximebf/debugbar/tests/DebugBar',
7796+
'/libraries/vendor/maximebf/debugbar/tests',
7797+
'/libraries/vendor/maximebf/debugbar/docs',
7798+
'/libraries/vendor/maximebf/debugbar/demo/bridge/twig',
7799+
'/libraries/vendor/maximebf/debugbar/demo/bridge/swiftmailer',
7800+
'/libraries/vendor/maximebf/debugbar/demo/bridge/slim',
7801+
'/libraries/vendor/maximebf/debugbar/demo/bridge/propel',
7802+
'/libraries/vendor/maximebf/debugbar/demo/bridge/monolog',
7803+
'/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/src/Demo',
7804+
'/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/src',
7805+
'/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine',
7806+
'/libraries/vendor/maximebf/debugbar/demo/bridge/cachecache',
7807+
'/libraries/vendor/maximebf/debugbar/demo/bridge',
7808+
'/libraries/vendor/maximebf/debugbar/demo',
7809+
'/libraries/vendor/maximebf/debugbar/build',
7810+
// From 4.1 to 4.2.0
7811+
'/libraries/vendor/nyholm/psr7/doc',
77277812
);
77287813

77297814
$status['files_checked'] = $files;

‎administrator/components/com_config/forms/application.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<form>
3+
<config>
4+
<inlinehelp button="show"/>
5+
</config>
36
<fieldset
47
name="cache"
58
label="COM_CONFIG_CACHE_SETTINGS_LABEL">

‎administrator/components/com_content/tmpl/articles/default.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,9 @@
228228
echo (new TransitionButton($options))
229229
->render(0, $i);
230230
?>
231+
<div class="small">
232+
<?php echo Text::_($item->stage_title); ?>
233+
</div>
231234
</td>
232235
<?php endif; ?>
233236
<td class="text-center d-none d-md-table-cell">

‎administrator/components/com_content/tmpl/featured/default.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,9 @@
232232
echo (new TransitionButton($options))
233233
->render(0, $i);
234234
?>
235+
<div class="small">
236+
<?php echo Text::_($item->stage_title); ?>
237+
</div>
235238
</td>
236239
<?php endif; ?>
237240
<td class="text-center d-none d-md-table-cell">

‎administrator/components/com_fields/forms/field.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,20 @@
328328
<option value="0">JNO</option>
329329
</field>
330330
</fieldset>
331+
<fieldset name="smartsearchoptions" label="COM_FIELDS_FIELD_SMARTSEARCHOPTIONS_HEADING">
332+
<field
333+
name="searchindex"
334+
type="list"
335+
label="COM_FIELDS_FIELD_SEARCHINDEX_LABEL"
336+
default="0"
337+
validate="options"
338+
>
339+
<option value="0">COM_FIELDS_FIELD_SEARCHINDEX_DONT</option>
340+
<option value="1">COM_FIELDS_FIELD_SEARCHINDEX_SEARCHABLE</option>
341+
<option value="2">COM_FIELDS_FIELD_SEARCHINDEX_TAXONOMY</option>
342+
<option value="3">COM_FIELDS_FIELD_SEARCHINDEX_BOTH</option>
343+
</field>
344+
</fieldset>
331345
</fieldset>
332346
</fields>
333347
</form>

‎administrator/components/com_fields/tmpl/field/edit.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
7878
<div>
7979
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
80+
<?php echo $this->form->renderField('searchindexing'); ?>
8081
</div>
8182
</fieldset>
8283
<?php echo HTMLHelper::_('uitab.endTab'); ?>

‎administrator/components/com_finder/src/Indexer/Helper.php‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Joomla\CMS\Language\Multilanguage;
1818
use Joomla\CMS\Plugin\PluginHelper;
1919
use Joomla\CMS\Table\Table;
20+
use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
2021
use Joomla\Registry\Registry;
2122
use Joomla\String\StringHelper;
2223

@@ -432,6 +433,43 @@ public static function getContentExtras(Result $item)
432433
return true;
433434
}
434435

436+
/**
437+
* Add custom fields for the item to the Result object
438+
*
439+
* @param Result $item Result object to add the custom fields to
440+
* @param string $context Context of the item in the custom fields
441+
*
442+
* @return void
443+
*
444+
* @since __DEPLOY_VERSION__
445+
*/
446+
public static function addCustomFields(Result $item, $context)
447+
{
448+
$obj = new \stdClass;
449+
$obj->id = $item->id;
450+
451+
$fields = FieldsHelper::getFields($context, $obj, true);
452+
453+
foreach ($fields as $field)
454+
{
455+
$searchindex = $field->params->get('searchindex', 0);
456+
457+
// We want to add this field to the search index
458+
if ($searchindex == 1 || $searchindex == 3)
459+
{
460+
$name = 'jsfield_' . $field->name;
461+
$item->$name = $field->value;
462+
$item->addInstruction(Indexer::META_CONTEXT, $name);
463+
}
464+
465+
// We want to add this field as a taxonomy
466+
if (($searchindex == 2 || $searchindex == 3) && $field->value)
467+
{
468+
$item->addTaxonomy($field->title, $field->value, $field->state, $field->access, $field->language);
469+
}
470+
}
471+
}
472+
435473
/**
436474
* Method to process content text using the onContentPrepare event trigger.
437475
*

‎administrator/components/com_languages/src/Model/StringsModel.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ public function refresh()
9191
// Parse all found ini files and add the strings to the database cache.
9292
foreach ($files as $file)
9393
{
94+
// Only process if language file is for selected language
95+
if (strpos($file, $language, strlen($base)) === false)
96+
{
97+
continue;
98+
}
99+
94100
$strings = LanguageHelper::parseIniFile($file);
95101

96102
if ($strings)

0 commit comments

Comments
 (0)