Skip to content

Commit 7bab005

Browse files
alikonalikon
authored
Merge branch '6.1-dev' into patch-1
2 parents 65fff21 + 24c8081 commit 7bab005

File tree

123 files changed

+348
-300
lines changed

Some content is hidden

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

123 files changed

+348
-300
lines changed

‎administrator/components/com_admin/script.php‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,6 +1063,31 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
10631063
'/libraries/vendor/symfony/translation-contracts/Test/TranslatorTest.php',
10641064
'/libraries/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php',
10651065
'/libraries/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php',
1066+
// From 6.1.0-alpha3 to 6.1.0-beta1
1067+
'/media/vendor/tinymce/langs/cy.js',
1068+
'/media/vendor/tinymce/langs/cy.min.js',
1069+
'/media/vendor/tinymce/langs/cy.min.js.gz',
1070+
'/media/vendor/tinymce/langs/dv.js',
1071+
'/media/vendor/tinymce/langs/dv.min.js',
1072+
'/media/vendor/tinymce/langs/dv.min.js.gz',
1073+
'/media/vendor/tinymce/langs/ga.js',
1074+
'/media/vendor/tinymce/langs/ga.min.js',
1075+
'/media/vendor/tinymce/langs/ga.min.js.gz',
1076+
'/media/vendor/tinymce/langs/ku.js',
1077+
'/media/vendor/tinymce/langs/ku.min.js',
1078+
'/media/vendor/tinymce/langs/ku.min.js.gz',
1079+
'/media/vendor/tinymce/langs/ky.js',
1080+
'/media/vendor/tinymce/langs/ky.min.js',
1081+
'/media/vendor/tinymce/langs/ky.min.js.gz',
1082+
'/media/vendor/tinymce/langs/sq.js',
1083+
'/media/vendor/tinymce/langs/sq.min.js',
1084+
'/media/vendor/tinymce/langs/sq.min.js.gz',
1085+
'/media/vendor/tinymce/langs/uz.js',
1086+
'/media/vendor/tinymce/langs/uz.min.js',
1087+
'/media/vendor/tinymce/langs/uz.min.js.gz',
1088+
'/media/vendor/tinymce/langs/zh-SG.js',
1089+
'/media/vendor/tinymce/langs/zh-SG.min.js',
1090+
'/media/vendor/tinymce/langs/zh-SG.min.js.gz',
10661091
];
10671092

10681093
$folders = [

‎administrator/components/com_categories/src/Model/CategoryModel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ public function save($data)
571571
*
572572
* @return void
573573
*
574-
* @since __DEPLOYMENT_VERSION__
574+
* @since 6.1.0
575575
*/
576576
protected function prepareTable($table)
577577
{

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -173,23 +173,26 @@
173173
$canEditOwnParCat = $user->authorise('core.edit.own', 'com_content.category.' . $item->parent_category_id) && $item->parent_category_uid == $userId;
174174

175175
// Transition button options
176-
$options = [
177-
'title' => Text::_($item->stage_title),
178-
'tip_content' => Text::sprintf('JWORKFLOW', Text::_($item->workflow_title)),
179-
'id' => 'workflow-' . $item->id,
180-
'task' => 'articles.runTransition',
181-
'disabled' => !$canExecuteTransition,
182-
];
176+
if ($workflow_enabled) {
177+
$options = [
178+
'title' => Text::_($item->stage_title),
179+
'tip_content' => Text::sprintf('JWORKFLOW', Text::_($item->workflow_title)),
180+
'id' => 'workflow-' . $item->id,
181+
'task' => 'articles.runTransition',
182+
'disabled' => !$canExecuteTransition,
183+
];
184+
$dataTransitionsAttribute = '';
183185

184-
if ($canExecuteTransition) {
185-
$transitions = ContentHelper::filterTransitions($this->transitions, (int) $item->stage_id, (int) $item->workflow_id);
186+
if ($canExecuteTransition) {
187+
$transitions = ContentHelper::filterTransitions($this->transitions, (int) $item->stage_id, (int) $item->workflow_id);
186188

187-
$transition_ids = ArrayHelper::getColumn($transitions, 'value');
188-
$transition_ids = ArrayHelper::toInteger($transition_ids);
189+
$transition_ids = ArrayHelper::getColumn($transitions, 'value');
190+
$transition_ids = ArrayHelper::toInteger($transition_ids);
189191

190-
$dataTransitionsAttribute = 'data-transitions="' . implode(',', $transition_ids) . '"';
192+
$dataTransitionsAttribute = $transition_ids ? 'data-transitions="' . implode(',', $transition_ids) . '"' : '';
191193

192-
$options = array_merge($options, ['transitions' => $transitions]);
194+
$options = array_merge($options, ['transitions' => $transitions]);
195+
}
193196
}
194197

195198
?>

‎administrator/components/com_languages/src/Controller/OverrideController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public function cancel($key = null)
204204
*
205205
* @return string The arguments to append to the redirect URL.
206206
*
207-
* @since __DEPLOY_VERSION__
207+
* @since 6.1.0
208208
*/
209209
protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
210210
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function getOverrides($all = false)
120120
*
121121
* @return array
122122
*
123-
* @since __DEPLOY_VERSION__
123+
* @since 6.1.0
124124
*/
125125
public function getLanguageOverrides()
126126
{
@@ -150,7 +150,7 @@ public function getLanguageOverrides()
150150
*
151151
* @return array
152152
*
153-
* @since __DEPLOY_VERSION__
153+
* @since 6.1.0
154154
*/
155155
public function getLanguages()
156156
{

‎administrator/components/com_languages/src/View/Overrides/HtmlView.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ class HtmlView extends BaseHtmlView
6464
* Holds overrides indexed by language tag.
6565
*
6666
* @var array
67-
* @since __DEPLOY_VERSION__
67+
* @since 6.1.0
6868
*/
6969
protected $languageOverrides;
7070

7171
/**
7272
* Holds content languages data keyed by language tag.
7373
*
7474
* @var array
75-
* @since __DEPLOY_VERSION__
75+
* @since 6.1.0
7676
*/
7777
protected $contentLanguages;
7878

‎administrator/components/com_modules/src/Field/Modal/ModuleField.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
/**
2828
* Supports a modal menu item picker.
2929
*
30-
* @since __DEPLOY_VERSION__
30+
* @since 6.1.0
3131
*/
3232
class ModuleField extends ModalSelectField
3333
{
3434
/**
3535
* The form field type.
3636
*
3737
* @var string
38-
* @since __DEPLOY_VERSION__
38+
* @since 6.1.0
3939
*/
4040
protected $type = 'Modal_Module';
4141

@@ -52,7 +52,7 @@ class ModuleField extends ModalSelectField
5252
* @return boolean True on success.
5353
*
5454
* @see FormField::setup()
55-
* @since __DEPLOY_VERSION__
55+
* @since 6.1.0
5656
*/
5757
public function setup(\SimpleXMLElement $element, $value, $group = null)
5858
{
@@ -144,7 +144,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
144144
*
145145
* @return string
146146
*
147-
* @since __DEPLOY_VERSION__
147+
* @since 6.1.0
148148
*/
149149
protected function getExtensionId()
150150
{
@@ -178,7 +178,7 @@ protected function getExtensionId()
178178
*
179179
* @return string
180180
*
181-
* @since __DEPLOY_VERSION__
181+
* @since 6.1.0
182182
*/
183183
protected function getValueTitle()
184184
{
@@ -209,7 +209,7 @@ protected function getValueTitle()
209209
*
210210
* @return array
211211
*
212-
* @since __DEPLOY_VERSION__
212+
* @since 6.1.0
213213
*/
214214
protected function getLayoutData()
215215
{
@@ -226,7 +226,7 @@ protected function getLayoutData()
226226
*
227227
* @return FileLayout
228228
*
229-
* @since __DEPLOY_VERSION__
229+
* @since 6.1.0
230230
*/
231231
protected function getRenderer($layoutId = 'default')
232232
{

‎administrator/components/com_modules/src/Helper/AssociationsHelper.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* Module associations helper.
2626
*
27-
* @since __DEPLOY_VERSION__
27+
* @since 6.1.0
2828
*/
2929
class AssociationsHelper extends AssociationExtensionHelper
3030
{
@@ -33,7 +33,7 @@ class AssociationsHelper extends AssociationExtensionHelper
3333
*
3434
* @var array $extension
3535
*
36-
* @since __DEPLOY_VERSION__
36+
* @since 6.1.0
3737
*/
3838
protected $extension = 'com_modules';
3939

@@ -42,7 +42,7 @@ class AssociationsHelper extends AssociationExtensionHelper
4242
*
4343
* @var array $itemTypes
4444
*
45-
* @since __DEPLOY_VERSION__
45+
* @since 6.1.0
4646
*/
4747
protected $itemTypes = ['module'];
4848

@@ -51,7 +51,7 @@ class AssociationsHelper extends AssociationExtensionHelper
5151
*
5252
* @var boolean $associationsSupport
5353
*
54-
* @since __DEPLOY_VERSION__
54+
* @since 6.1.0
5555
*/
5656
protected $associationsSupport = true;
5757

@@ -63,7 +63,7 @@ class AssociationsHelper extends AssociationExtensionHelper
6363
*
6464
* @return array Array of associations for the item
6565
*
66-
* @since __DEPLOY_VERSION__
66+
* @since 6.1.0
6767
*/
6868
public function getAssociationsForItem($id = 0, $view = null)
6969
{
@@ -78,7 +78,7 @@ public function getAssociationsForItem($id = 0, $view = null)
7878
*
7979
* @return array
8080
*
81-
* @since __DEPLOY_VERSION__
81+
* @since 6.1.0
8282
*/
8383
public function getAssociations($typeName, $id)
8484
{
@@ -107,7 +107,7 @@ public function getAssociations($typeName, $id)
107107
*
108108
* @return Table|null
109109
*
110-
* @since __DEPLOY_VERSION__
110+
* @since 6.1.0
111111
*/
112112
public function getItem($typeName, $id)
113113
{
@@ -133,7 +133,7 @@ public function getItem($typeName, $id)
133133
*
134134
* @return array Array of item types
135135
*
136-
* @since __DEPLOY_VERSION__
136+
* @since 6.1.0
137137
*/
138138
public function getType($typeName = '')
139139
{
@@ -176,7 +176,7 @@ public function getType($typeName = '')
176176
*
177177
* @return array
178178
*
179-
* @since __DEPLOY_VERSION__
179+
* @since 6.1.0
180180
*/
181181
public function getUrlOptions($type = '')
182182
{
@@ -195,7 +195,7 @@ public function getUrlOptions($type = '')
195195
*
196196
* @return string
197197
*
198-
* @since __DEPLOY_VERSION__
198+
* @since 6.1.0
199199
*/
200200
public function getExtensionId($id)
201201
{

‎administrator/components/com_modules/src/Helper/ModulesHelper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ abstract class ModulesHelper
3535
*
3636
* @return array
3737
*
38-
* @since __DEPLOY_VERSION__
38+
* @since 6.1.0
3939
*/
4040
public static function getAssociations($pk)
4141
{

‎administrator/components/com_modules/src/Model/ModuleModel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ModuleModel extends AdminModel implements VersionableModelInterface
5858
* The context used for the associations table
5959
*
6060
* @var string
61-
* @since __DEPLOY_VERSION__
61+
* @since 6.1.0
6262
*/
6363
protected $associationsContext = 'com_modules.item';
6464

0 commit comments

Comments
 (0)