Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Joomla 3.9.3 Part 1 #24929

Merged
merged 18 commits into from
May 16, 2019
Merged

Joomla 3.9.3 Part 1 #24929

merged 18 commits into from
May 16, 2019

Conversation

wilsonge
Copy link
Contributor

First part of Merging Joomla 3.9.3 - all of January's commits

Merge with a merge commit. don't squash or rebase

pe7er and others added 18 commits January 15, 2019 19:40
All language constants should be in uppercase - some where lowercase in error
Update string to be more accurate and consistent with similar strings in template styles
### Expected
The module  form should be wrapped in a div that a class suffix can be applied to

### Actual
The module div is wrapped in the form tag

### Changes
This simple PR switches the form and the div - making it the same structure as other modules - see mod_search
* [com_ajax] - need to be protected

postgresql update

* log checkin

* udpate

* old one

* update fixes
The stats plugin is retained as this integrates with the .org architecture, which I remain engaged with
Continuation of joomla#23711 for the remaining affectecd components
com_contact
com_newsfeeds
com_tags
com_users
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-4.0-dev labels May 16, 2019
@wilsonge wilsonge merged commit 3a0a82a into joomla:4.0-dev May 16, 2019
@wilsonge wilsonge deleted the merge-393-part1 branch May 16, 2019 21:26
@infograf768
Copy link
Member

@wilsonge
Class 'JEventDispatcher' not found when Checkin items

@infograf768
Copy link
Member

The code is present in CheckinModel.php and Table.php

@infograf768
Copy link
Member

for the Checkin Model, looks straightforward

diff --git a/administrator/components/com_checkin/Model/CheckinModel.php b/administrator/components/com_checkin/Model/CheckinModel.php
index 44b819b..4688537 100644
--- a/administrator/components/com_checkin/Model/CheckinModel.php
+++ b/administrator/components/com_checkin/Model/CheckinModel.php
@@ -92,6 +92,4 @@
 		$results = 0;
 
-		$dispatcher = \JEventDispatcher::getInstance();
-
 		foreach ($ids as $tn)
 		{
@@ -120,5 +118,5 @@
 			{
 				$results = $results + $db->getAffectedRows();
-				$dispatcher->trigger('onAfterCheckin', array($tn));
+				Factory::getApplication()->triggerEvent('onAfterCheckin', array($tn));
 			}
 		}

Not sure for Table.php as we also have a $this->getDispatcher()->dispatch('onTableAfterCheckin', $event);

		$this->getDispatcher()->dispatch('onTableAfterCheckin', $event);

		//$dispatcher = \JEventDispatcher::getInstance();
		Factory::getApplication()->triggerEvent('onAfterCheckin', array($this->_tbl));

@wilsonge
Copy link
Contributor Author

Thanks! Patched the checking as suggested with 0fcf184 - I need to investigate the other one. onTableAfterCheckin would have been new in j4. so we'll need to rename it to the new j3 one. But that involves a little bit more work because of the event class used

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet