Skip to content

Commit

Permalink
Merge branch 'staging' into patch-92
Browse files Browse the repository at this point in the history
  • Loading branch information
@alikon
alikon committed Mar 12, 2018
2 parents f61f6ab + b4ff7d8 commit da74b89
Show file tree
Hide file tree
Showing 4,121 changed files with 31,104 additions and 13,582 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 4 additions & 8 deletions README.md
View file
Expand Up @@ -3,13 +3,9 @@ Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cm

Build Status
---------------------
Travis-CI: [![Build Status](https://travis-ci.org/joomla/joomla-cms.svg?branch=staging)](https://travis-ci.org/joomla/joomla-cms)

Drone -CI: [![Build Status](http://213.160.72.75/api/badges/joomla/joomla-cms/status.svg)](http://213.160.72.75/joomla/joomla-cms)

AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/bpcxulw6nnxlv8kb/branch/staging?svg=true)](https://ci.appveyor.com/project/joomla/joomla-cms)

Jenkins: [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/)
| Travis-CI | Drone-CI | AppVeyor | Jenkins |
| ------------- | ------------- | ------------- | ------------- |
| [![Build Status](https://travis-ci.org/joomla/joomla-cms.svg?branch=staging)](https://travis-ci.org/joomla/joomla-cms) | [![Build Status](http://213.160.72.75/api/badges/joomla/joomla-cms/status.svg)](http://213.160.72.75/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/bpcxulw6nnxlv8kb/branch/staging?svg=true)](https://ci.appveyor.com/project/joomla/joomla-cms) | [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/) |

What is this?
---------------------
Expand Down Expand Up @@ -90,7 +86,7 @@ Do you want to improve Joomla?

Copyright
---------------------
* Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
* Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
* [Special Thanks](https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks)
* Distributed under the GNU General Public License version 2 or later
* See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)
2 changes: 1 addition & 1 deletion README.txt
View file
Expand Up @@ -66,7 +66,7 @@
* Documentation for Web designers: https://docs.joomla.org/Special:MyLanguage/Web_designers

Copyright:
* Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
* Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
* Special Thanks: https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks
* Distributed under the GNU General Public License version 2 or later
* See Licenses details at https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses
2 changes: 1 addition & 1 deletion RoboFile.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage RoboFile
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/admin.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/admin.xml
View file
Expand Up @@ -3,7 +3,7 @@
<name>com_admin</name>
<author>Joomla! Project</author>
<creationDate>April 2006</creationDate>
<copyright>(C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/controller.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/controllers/profile.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/helpers/html/directory.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/helpers/html/phpsetting.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/helpers/html/system.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
3 changes: 2 additions & 1 deletion administrator/components/com_admin/models/forms/profile.xml
View file
Expand Up @@ -84,7 +84,7 @@

<field
name="id"
type="text"
type="number"
label="JGLOBAL_FIELD_ID_LABEL"
description="JGLOBAL_FIELD_ID_DESC"
class="readonly"
Expand All @@ -106,6 +106,7 @@
label="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_LABEL"
description="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_DESC"
client="administrator"
filter="uint"
>
<option value="">JOPTION_USE_DEFAULT</option>
</field>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/models/help.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/models/profile.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_admin/models/sysinfo.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down Expand Up @@ -246,7 +246,7 @@ public function &getPhpSettings()
'file_uploads' => ini_get('file_uploads') == '1',
'magic_quotes_gpc' => ini_get('magic_quotes_gpc') == '1',
'register_globals' => ini_get('register_globals') == '1',
'output_buffering' => (bool) ini_get('output_buffering'),
'output_buffering' => (int) ini_get('output_buffering') !== 0,
'open_basedir' => ini_get('open_basedir'),
'session.save_path' => ini_get('session.save_path'),
'session.auto_start' => ini_get('session.auto_start'),
Expand All @@ -256,7 +256,6 @@ public function &getPhpSettings()
'zip' => function_exists('zip_open') && function_exists('zip_read'),
'mbstring' => extension_loaded('mbstring'),
'iconv' => function_exists('iconv'),
'mcrypt' => extension_loaded('mcrypt'),
'max_input_vars' => ini_get('max_input_vars'),
);

Expand Down Expand Up @@ -309,6 +308,7 @@ public function &getInfo()

$this->info = array(
'php' => php_uname(),
'dbserver' => $db->getServerType(),
'dbversion' => $db->getVersion(),
'dbcollation' => $db->getCollation(),
'dbconnectioncollation' => $db->getConnectionCollation(),
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/eaccelerator.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for eAccelerator compatibility.
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/htaccess.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for notifying users of a change
Expand Down
9 changes: 5 additions & 4 deletions administrator/components/com_admin/postinstall/joomla40checks.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for Joomla 4.0 pre checks
Expand All @@ -12,13 +12,14 @@
defined('_JEXEC') or die;

/**
* Checks if the installation meats the current requirements for Joomla 4
* Checks if the installation meets the current requirements for Joomla 4
*
* @return boolean True if any check fails.
*
* @since 3.7
*
* @link https://developer.joomla.org/news/658-joomla4-manifesto.html
* @link https://developer.joomla.org/news/704-looking-forward-with-joomla-4.html
*/
function admin_postinstall_joomla40checks_condition()
{
Expand Down Expand Up @@ -50,6 +51,6 @@ function admin_postinstall_joomla40checks_condition()
return true;
}

// PHP minimum version is 5.5
return version_compare(PHP_VERSION, '5.5.9', 'lt');
// PHP minimum version is 7.0
return version_compare(PHP_VERSION, '7.0', 'lt');
}
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/languageaccess340.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for the checks if the installation is
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/statscollection.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for the checking minimum PHP version support
Expand Down

0 comments on commit da74b89

Please sign in to comment.