Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/joomla/3.8-dev' into Sched…
Browse files Browse the repository at this point in the history 
…ule-featured-articles-#13596
  • Loading branch information
@eshiol
eshiol committed Aug 17, 2017
2 parents 92a92a4 + 09f5cd5 commit 956a9cd
Show file tree
Hide file tree
Showing 535 changed files with 20,517 additions and 10,359 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
# Test Related Files #
/phpunit.xml

# Stubs file holding mapped classes
/stubs.php

# Node modules #
node_modules/

Expand Down
357 changes: 357 additions & 0 deletions administrator/components/com_admin/script.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1595,6 +1595,283 @@ public function deleteUnexistingFiles()
// Joomla 3.7.3
'/administrator/components/com_admin/postinstall/phpversion.php',
'/components/com_content/layouts/field/prepare/modal_article.php',
// Joomla 3.8.0
'/libraries/cms/application/administrator.php',
'/libraries/cms/application/cms.php',
'/libraries/cms/application/helper.php',
'/libraries/cms/application/site.php',
'/libraries/cms/authentication/helper.php',
'/libraries/cms/captcha/captcha.php',
'/libraries/cms/component/helper.php',
'/libraries/cms/component/record.php',
'/libraries/cms/component/exception/missing.php',
'/libraries/cms/component/router/rules/interface.php',
'/libraries/cms/component/router/rules/menu.php',
'/libraries/cms/component/router/rules/nomenu.php',
'/libraries/cms/component/router/rules/standard.php',
'/libraries/cms/component/router/base.php',
'/libraries/cms/component/router/interface.php',
'/libraries/cms/component/router/legacy.php',
'/libraries/cms/component/router/view.php',
'/libraries/cms/component/router/viewconfiguration.php',
'/libraries/cms/editor/editor.php',
'/libraries/cms/error/page.php',
'/libraries/cms/filter/input.php',
'/libraries/cms/filter/output.php',
'/libraries/cms/filter/wrapper/output.php',
'/libraries/cms/form/field/author.php',
'/libraries/cms/form/field/captcha.php',
'/libraries/cms/form/field/chromestyle.php',
'/libraries/cms/form/field/contenthistory.php',
'/libraries/cms/form/field/contentlanguage.php',
'/libraries/cms/form/field/contenttype.php',
'/libraries/cms/form/field/editor.php',
'/libraries/cms/form/field/frontend_language.php',
'/libraries/cms/form/field/headertab.php',
'/libraries/cms/form/field/helpsite.php',
'/libraries/cms/form/field/lastvisitdaterange.php',
'/libraries/cms/form/field/limitbox.php',
'/libraries/cms/form/field/media.php',
'/libraries/cms/form/field/menu.php',
'/libraries/cms/form/field/menuitem.php',
'/libraries/cms/form/field/moduleorder.php',
'/libraries/cms/form/field/moduleposition.php',
'/libraries/cms/form/field/moduletag.php',
'/libraries/cms/form/field/ordering.php',
'/libraries/cms/form/field/plugin_status.php',
'/libraries/cms/form/field/registrationdaterange.php',
'/libraries/cms/form/field/status.php',
'/libraries/cms/form/field/tag.php',
'/libraries/cms/form/field/templatestyle.php',
'/libraries/cms/form/field/useractive.php',
'/libraries/cms/form/field/user.php',
'/libraries/cms/form/field/usergrouplist.php',
'/libraries/cms/form/field/userstate.php',
'/libraries/cms/form/rule/captcha.php',
'/libraries/cms/form/rule/notequals.php',
'/libraries/cms/form/rule/password.php',
'/libraries/cms/help/help.php',
'/libraries/cms/helper/content.php',
'/libraries/cms/helper/contenthistory.php',
'/libraries/cms/helper/helper.php',
'/libraries/cms/helper/media.php',
'/libraries/cms/helper/route.php',
'/libraries/cms/helper/tags.php',
'/libraries/cms/helper/usergroups.php',
'/libraries/cms/installer/adapter.php',
'/libraries/cms/installer/extension.php',
'/libraries/cms/installer/helper.php',
'/libraries/cms/installer/installer.php',
'/libraries/cms/installer/manifest.php',
'/libraries/cms/installer/script.php',
'/libraries/cms/installer/adapter/component.php',
'/libraries/cms/installer/adapter/file.php',
'/libraries/cms/installer/adapter/language.php',
'/libraries/cms/installer/adapter/library.php',
'/libraries/cms/installer/adapter/module.php',
'/libraries/cms/installer/adapter/package.php',
'/libraries/cms/installer/adapter/plugin.php',
'/libraries/cms/installer/adapter/template.php',
'/libraries/cms/installer/manifest/library.php',
'/libraries/cms/installer/manifest/package.php',
'/libraries/cms/language/multilang.php',
'/libraries/cms/layout/base.php',
'/libraries/cms/layout/file.php',
'/libraries/cms/layout/helper.php',
'/libraries/cms/layout/layout.php',
'/libraries/cms/library/helper.php',
'/libraries/cms/menu/administrator.php',
'/libraries/cms/menu/item.php',
'/libraries/cms/menu/menu.php',
'/libraries/cms/menu/site.php',
'/libraries/cms/module/helper.php',
'/libraries/cms/pagination/object.php',
'/libraries/cms/pagination/pagination.php',
'/libraries/cms/pathway/pathway.php',
'/libraries/cms/pathway/site.php',
'/libraries/cms/plugin/helper.php',
'/libraries/cms/plugin/plugin.php',
'/libraries/cms/response/json.php',
'/libraries/cms/router/administrator.php',
'/libraries/cms/router/router.php',
'/libraries/cms/router/site.php',
'/libraries/cms/schema/changeitem.php',
'/libraries/cms/schema/changeitem/mysql.php',
'/libraries/cms/schema/changeitem/postgresql.php',
'/libraries/cms/schema/changeitem/sqlsrv.php',
'/libraries/cms/schema/changeset.php',
'/libraries/cms/search/helper.php',
'/libraries/cms/table/contenthistory.php',
'/libraries/cms/table/contenttype.php',
'/libraries/cms/table/corecontent.php',
'/libraries/cms/table/ucm.php',
'/libraries/cms/toolbar/button.php',
'/libraries/cms/toolbar/button/confirm.php',
'/libraries/cms/toolbar/button/custom.php',
'/libraries/cms/toolbar/button/help.php',
'/libraries/cms/toolbar/button/link.php',
'/libraries/cms/toolbar/button/popup.php',
'/libraries/cms/toolbar/button/separator.php',
'/libraries/cms/toolbar/button/slider.php',
'/libraries/cms/toolbar/button/standard.php',
'/libraries/cms/toolbar/toolbar.php',
'/libraries/cms/ucm/base.php',
'/libraries/cms/ucm/content.php',
'/libraries/cms/ucm/type.php',
'/libraries/cms/version/version.php',
'/libraries/joomla/access/access.php',
'/libraries/joomla/access/exception/notallowed.php',
'/libraries/joomla/access/rule.php',
'/libraries/joomla/access/rules.php',
'/libraries/joomla/access/wrapper/access.php',
'/libraries/joomla/application/base.php',
'/libraries/joomla/application/cli.php',
'/libraries/joomla/application/daemon.php',
'/libraries/joomla/application/web.php',
'/libraries/joomla/association/extension/helper.php',
'/libraries/joomla/association/extension/interface.php',
'/libraries/joomla/authentication/authentication.php',
'/libraries/joomla/authentication/response.php',
'/libraries/joomla/cache/cache.php',
'/libraries/joomla/cache/controller.php',
'/libraries/joomla/cache/controller/callback.php',
'/libraries/joomla/cache/controller/output.php',
'/libraries/joomla/cache/controller/page.php',
'/libraries/joomla/cache/controller/view.php',
'/libraries/joomla/cache/exception.php',
'/libraries/joomla/cache/exception/connecting.php',
'/libraries/joomla/cache/exception/unsupported.php',
'/libraries/joomla/cache/storage.php',
'/libraries/joomla/cache/storage/apc.php',
'/libraries/joomla/cache/storage/apcu.php',
'/libraries/joomla/cache/storage/cachelite.php',
'/libraries/joomla/cache/storage/file.php',
'/libraries/joomla/cache/storage/helper.php',
'/libraries/joomla/cache/storage/memcache.php',
'/libraries/joomla/cache/storage/memcached.php',
'/libraries/joomla/cache/storage/redis.php',
'/libraries/joomla/cache/storage/wincache.php',
'/libraries/joomla/cache/storage/xcache.php',
'/libraries/joomla/client/ftp.php',
'/libraries/joomla/client/helper.php',
'/libraries/joomla/client/ldap.php',
'/libraries/joomla/client/wrapper/helper.php',
'/libraries/joomla/crypt/README.md',
'/libraries/joomla/crypt/cipher.php',
'/libraries/joomla/crypt/cipher/3des.php',
'/libraries/joomla/crypt/cipher/blowfish.php',
'/libraries/joomla/crypt/cipher/crypto.php',
'/libraries/joomla/crypt/cipher/mcrypt.php',
'/libraries/joomla/crypt/cipher/rijndael256.php',
'/libraries/joomla/crypt/cipher/simple.php',
'/libraries/joomla/crypt/crypt.php',
'/libraries/joomla/crypt/key.php',
'/libraries/joomla/crypt/password.php',
'/libraries/joomla/crypt/password/simple.php',
'/libraries/joomla/date/date.php',
'/libraries/joomla/environment/browser.php',
'/libraries/joomla/factory.php',
'/libraries/joomla/filter/input.php',
'/libraries/joomla/filter/output.php',
'/libraries/joomla/filter/wrapper/output.php',
'/libraries/joomla/form/field.php',
'/libraries/joomla/form/form.php',
'/libraries/joomla/form/helper.php',
'/libraries/joomla/form/rule.php',
'/libraries/joomla/form/rule/boolean.php',
'/libraries/joomla/form/rule/calendar.php',
'/libraries/joomla/form/rule/color.php',
'/libraries/joomla/form/rule/email.php',
'/libraries/joomla/form/rule/equals.php',
'/libraries/joomla/form/rule/number.php',
'/libraries/joomla/form/rule/options.php',
'/libraries/joomla/form/rule/rules.php',
'/libraries/joomla/form/rule/tel.php',
'/libraries/joomla/form/rule/url.php',
'/libraries/joomla/form/rule/username.php',
'/libraries/joomla/form/wrapper/helper.php',
'/libraries/joomla/input/cli.php',
'/libraries/joomla/input/cookie.php',
'/libraries/joomla/input/files.php',
'/libraries/joomla/input/input.php',
'/libraries/joomla/input/json.php',
'/libraries/joomla/language/helper.php',
'/libraries/joomla/language/language.php',
'/libraries/joomla/language/stemmer.php',
'/libraries/joomla/language/stemmer/porteren.php',
'/libraries/joomla/language/transliterate.php',
'/libraries/joomla/language/wrapper/helper.php',
'/libraries/joomla/language/wrapper/text.php',
'/libraries/joomla/language/wrapper/transliterate.php',
'/libraries/joomla/log/entry.php',
'/libraries/joomla/log/log.php',
'/libraries/joomla/log/logger.php',
'/libraries/joomla/log/logger/callback.php',
'/libraries/joomla/log/logger/database.php',
'/libraries/joomla/log/logger/echo.php',
'/libraries/joomla/log/logger/formattedtext.php',
'/libraries/joomla/log/logger/messagequeue.php',
'/libraries/joomla/log/logger/syslog.php',
'/libraries/joomla/log/logger/w3c.php',
'/libraries/joomla/mail/helper.php',
'/libraries/joomla/mail/language/phpmailer.lang-joomla.php',
'/libraries/joomla/mail/mail.php',
'/libraries/joomla/mail/wrapper/helper.php',
'/libraries/joomla/microdata/microdata.php',
'/libraries/joomla/microdata/types.json',
'/libraries/joomla/profiler/profiler.php',
'/libraries/joomla/session/exception/unsupported.php',
'/libraries/joomla/session/session.php',
'/libraries/joomla/string/punycode.php',
'/libraries/joomla/table/asset.php',
'/libraries/joomla/table/extension.php',
'/libraries/joomla/table/interface.php',
'/libraries/joomla/table/language.php',
'/libraries/joomla/table/nested.php',
'/libraries/joomla/table/observer.php',
'/libraries/joomla/table/observer/contenthistory.php',
'/libraries/joomla/table/observer/tags.php',
'/libraries/joomla/table/table.php',
'/libraries/joomla/table/update.php',
'/libraries/joomla/table/updatesite.php',
'/libraries/joomla/table/user.php',
'/libraries/joomla/table/usergroup.php',
'/libraries/joomla/table/viewlevel.php',
'/libraries/joomla/updater/adapters/collection.php',
'/libraries/joomla/updater/adapters/extension.php',
'/libraries/joomla/updater/update.php',
'/libraries/joomla/updater/updateadapter.php',
'/libraries/joomla/updater/updater.php',
'/libraries/joomla/uri/uri.php',
'/libraries/joomla/user/helper.php',
'/libraries/joomla/user/user.php',
'/libraries/joomla/user/wrapper/helper.php',
'/libraries/joomla/utilities/buffer.php',
'/libraries/joomla/utilities/utility.php',
'/libraries/legacy/access/rule.php',
'/libraries/legacy/access/rules.php',
'/libraries/legacy/application/cli.php',
'/libraries/legacy/application/daemon.php',
'/libraries/legacy/categories/categories.php',
'/libraries/legacy/controller/admin.php',
'/libraries/legacy/controller/form.php',
'/libraries/legacy/controller/legacy.php',
'/libraries/legacy/model/admin.php',
'/libraries/legacy/model/form.php',
'/libraries/legacy/model/item.php',
'/libraries/legacy/model/legacy.php',
'/libraries/legacy/model/list.php',
'/libraries/legacy/table/category.php',
'/libraries/legacy/table/content.php',
'/libraries/legacy/table/menu.php',
'/libraries/legacy/table/menu/type.php',
'/libraries/legacy/table/module.php',
'/libraries/legacy/view/categories.php',
'/libraries/legacy/view/category.php',
'/libraries/legacy/view/categoryfeed.php',
'/libraries/legacy/view/legacy.php',
'/libraries/legacy/web/client.php',
'/libraries/legacy/web/web.php',
);

// TODO There is an issue while deleting folders using the ftp mode
Expand Down Expand Up @@ -1726,6 +2003,86 @@ public function deleteUnexistingFiles()
'/administrator/components/com_messages/layouts',
// Joomla! 3.7.4
'/components/com_fields/controllers',
// Joomla! 3.8.0
'/libraries/cms/application',
'/libraries/cms/authentication',
'/libraries/cms/captcha',
'/libraries/cms/component/exception',
'/libraries/cms/component/router/rules',
'/libraries/cms/component/router',
'/libraries/cms/component',
'/libraries/cms/editor',
'/libraries/cms/error',
'/libraries/cms/form/field',
'/libraries/cms/form/rule',
'/libraries/cms/form',
'/libraries/cms/help',
'/libraries/cms/helper',
'/libraries/cms/installer/adapter',
'/libraries/cms/installer/manifest',
'/libraries/cms/installer',
'/libraries/cms/language',
'/libraries/cms/layout',
'/libraries/cms/library',
'/libraries/cms/menu',
'/libraries/cms/module',
'/libraries/cms/pagination',
'/libraries/cms/pathway',
'/libraries/cms/plugin',
'/libraries/cms/response',
'/libraries/cms/router',
'/libraries/cms/schema/changeitem',
'/libraries/cms/schema',
'/libraries/cms/search',
'/libraries/cms/table',
'/libraries/cms/toolbar/button',
'/libraries/cms/toolbar',
'/libraries/cms/ucm',
'/libraries/cms/version',
'/libraries/joomla/access/exception',
'/libraries/joomla/access/wrapper',
'/libraries/joomla/access',
'/libraries/joomla/association/extension',
'/libraries/joomla/association',
'/libraries/joomla/authentication',
'/libraries/joomla/cache/controller',
'/libraries/joomla/cache/exception',
'/libraries/joomla/cache/storage',
'/libraries/joomla/cache',
'/libraries/joomla/client/wrapper',
'/libraries/joomla/client',
'/libraries/joomla/crypt/cipher',
'/libraries/joomla/crypt/password',
'/libraries/joomla/crypt',
'/libraries/joomla/date',
'/libraries/joomla/environment',
'/libraries/joomla/filter/wrapper',
'/libraries/joomla/filter',
'/libraries/joomla/form/rule',
'/libraries/joomla/form/wrapper',
'/libraries/joomla/input',
'/libraries/joomla/language/stemmer',
'/libraries/joomla/language/wrapper',
'/libraries/joomla/log/logger',
'/libraries/joomla/log',
'/libraries/joomla/mail/language',
'/libraries/joomla/mail/wrapper',
'/libraries/joomla/mail',
'/libraries/joomla/microdata',
'/libraries/joomla/profiler',
'/libraries/joomla/session/exception',
'/libraries/joomla/table',
'/libraries/joomla/updater/adapters',
'/libraries/joomla/updater',
'/libraries/joomla/uri',
'/libraries/joomla/user/wrapper',
'/libraries/joomla/user',
'/libraries/legacy/access',
'/libraries/legacy/categories',
'/libraries/legacy/controller',
'/libraries/legacy/model',
'/libraries/legacy/view',
'/libraries/legacy/web',
);

jimport('joomla.filesystem.file');
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_admin/views/sysinfo/view.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public function display($tpl = null)
*
* @since 1.6
* @note Necessary for Hathor compatibility
* @deprecated 4.0 To be removed with Hathor
*/
protected function _setSubMenu()
{
Expand Down

0 comments on commit 956a9cd

Please sign in to comment.