joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-07-03 18:43:40 +00:00
Code Packages Releases Activity

Merge commit 'cd8d650' into 4.0-dev

Browse Source
This commit is contained in:
wilsonge 2018-07-13 16:04:42 +01:00
commit c356b679ad
No known key found for this signature in database
GPG Key ID: EF81319318FC9D04
11 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
administrator/components/com_admin/Model/SysinfoModel.php
View File

@ -244,13 +244,11 @@ class SysInfoModel extends BaseDatabaseModel
return $this->php_settings; return $this->php_settings;
} }
$outputBuffering = ini_get('output_buffering');
$this->php_settings = array( $this->php_settings = array(
'display_errors' => ini_get('display_errors') == '1', 'display_errors' => ini_get('display_errors') == '1',
'short_open_tag' => ini_get('short_open_tag') == '1', 'short_open_tag' => ini_get('short_open_tag') == '1',
'file_uploads' => ini_get('file_uploads') == '1', 'file_uploads' => ini_get('file_uploads') == '1',
'output_buffering' => ($outputBuffering === 'On') ? true : is_numeric($outputBuffering), 'output_buffering' => (int) ini_get('output_buffering') !== 0,
'open_basedir' => ini_get('open_basedir'), 'open_basedir' => ini_get('open_basedir'),
'session.save_path' => ini_get('session.save_path'), 'session.save_path' => ini_get('session.save_path'),
'session.auto_start' => ini_get('session.auto_start'), 'session.auto_start' => ini_get('session.auto_start'),

2
administrator/components/com_content/Model/ArticleModel.php
View File

@ -195,7 +195,7 @@ class ArticleModel extends AdminModel
* *
* @return boolean True on success. * @return boolean True on success.
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
protected function batchMove($value, $pks, $contexts) protected function batchMove($value, $pks, $contexts)
{ {

6
administrator/components/com_users/Model/NotesModel.php
View File

@ -121,10 +121,10 @@ class NotesModel extends ListModel
$query->where('(a.state IN (0, 1))'); $query->where('(a.state IN (0, 1))');
} }
// Filter by a single or group of categories. // Filter by a single category.
$categoryId = $this->getState('filter.category_id'); $categoryId = (int) $this->getState('filter.category_id');
if ($categoryId && is_scalar($categoryId)) if ($categoryId)
{ {
$query->where('a.catid = ' . $categoryId); $query->where('a.catid = ' . $categoryId);
} }

6
cli/sessionMetadataGc.php
View File

@ -2,7 +2,7 @@
/** /**
* @package Joomla.Cli * @package Joomla.Cli
* *
* @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 * @license GNU General Public License version 2 or later; see LICENSE.txt
*/ */
@ -36,7 +36,7 @@ require_once JPATH_LIBRARIES . '/cms.php';
/** /**
* Cron job to trash expired session metadata. * Cron job to trash expired session metadata.
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
class SessionMetadataGc extends JApplicationCli class SessionMetadataGc extends JApplicationCli
{ {
@ -45,7 +45,7 @@ class SessionMetadataGc extends JApplicationCli
* *
* @return void * @return void
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
public function doExecute() public function doExecute()
{ {

2
libraries/src/Application/CMSApplication.php
View File

@ -84,7 +84,7 @@ abstract class CMSApplication extends WebApplication implements ContainerAwareIn
* The session metadata manager * The session metadata manager
* *
* @var MetadataManager * @var MetadataManager
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
protected $metadataManager = null; protected $metadataManager = null;

2
libraries/src/MVC/Model/AdminModel.php
View File

@ -28,7 +28,7 @@ abstract class AdminModel extends FormModel
* The type alias for this content type (for example, 'com_content.article'). * The type alias for this content type (for example, 'com_content.article').
* *
* @var string * @var string
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
public $typeAlias; public $typeAlias;

4
libraries/src/Schema/ChangeItem/MysqlChangeItem.php
View File

@ -330,7 +330,7 @@ class MysqlChangeItem extends ChangeItem
* *
* @return string The query clause for NULL check in the check query * @return string The query clause for NULL check in the check query
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
private function checkNull($changesArray) private function checkNull($changesArray)
{ {
@ -361,7 +361,7 @@ class MysqlChangeItem extends ChangeItem
* *
* @return string The query clause for DEFAULT check in the check query * @return string The query clause for DEFAULT check in the check query
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
private function checkDefault($changesArray, $type) private function checkDefault($changesArray, $type)
{ {

12
libraries/src/Session/MetadataManager.php
View File

@ -18,7 +18,7 @@ use Joomla\CMS\User\User;
/** /**
* Manager for optional session metadata. * Manager for optional session metadata.
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
* @internal * @internal
*/ */
final class MetadataManager final class MetadataManager
@ -27,7 +27,7 @@ final class MetadataManager
* Application object. * Application object.
* *
* @var AbstractApplication * @var AbstractApplication
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
private $app; private $app;
@ -35,7 +35,7 @@ final class MetadataManager
* Database driver. * Database driver.
* *
* @var \JDatabaseDriver * @var \JDatabaseDriver
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
private $db; private $db;
@ -45,7 +45,7 @@ final class MetadataManager
* @param AbstractApplication $app Application object. * @param AbstractApplication $app Application object.
* @param \JDatabaseDriver $db Database driver. * @param \JDatabaseDriver $db Database driver.
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
public function __construct(AbstractApplication $app, \JDatabaseDriver $db) public function __construct(AbstractApplication $app, \JDatabaseDriver $db)
{ {
@ -61,7 +61,7 @@ final class MetadataManager
* *
* @return void * @return void
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
* @throws \RuntimeException * @throws \RuntimeException
*/ */
public function createRecordIfNonExisting(Session $session, User $user) public function createRecordIfNonExisting(Session $session, User $user)
@ -136,7 +136,7 @@ final class MetadataManager
* *
* @return void * @return void
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
public function deletePriorTo($time) public function deletePriorTo($time)
{ {

4
plugins/system/remember/remember.php
View File

@ -111,7 +111,7 @@ class PlgSystemRemember extends CMSPlugin
* *
* @return boolean * @return boolean
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
public function onUserBeforeSave($user, $isnew, $data) public function onUserBeforeSave($user, $isnew, $data)
{ {
@ -122,7 +122,7 @@ class PlgSystemRemember extends CMSPlugin
} }
// Irrelevant, because password was not changed by user // Irrelevant, because password was not changed by user
if ($data['password_clear'] == '') if (empty($data['password_clear']))
{ {
return true; return true;
} }

8
plugins/system/sessiongc/sessiongc.php
View File

@ -17,7 +17,7 @@ use Joomla\CMS\Session\MetadataManager;
/** /**
* Garbage collection handler for session related data * Garbage collection handler for session related data
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
class PlgSystemSessionGc extends CMSPlugin class PlgSystemSessionGc extends CMSPlugin
{ {
@ -25,7 +25,7 @@ class PlgSystemSessionGc extends CMSPlugin
* Application object * Application object
* *
* @var CMSApplication * @var CMSApplication
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
protected $app; protected $app;
@ -33,7 +33,7 @@ class PlgSystemSessionGc extends CMSPlugin
* Database driver * Database driver
* *
* @var JDatabaseDriver * @var JDatabaseDriver
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
protected $db; protected $db;
@ -42,7 +42,7 @@ class PlgSystemSessionGc extends CMSPlugin
* *
* @return void * @return void
* *
* @since __DEPLOY_VERSION__ * @since 3.8.6
*/ */
public function onAfterRespond() public function onAfterRespond()
{ {

2
plugins/system/sessiongc/sessiongc.xml
View File

@ -7,7 +7,7 @@
<license>GNU General Public License version 2 or later; see LICENSE.txt</license> <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<authorEmail>admin@joomla.org</authorEmail> <authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl> <authorUrl>www.joomla.org</authorUrl>
<version>__DEPLOY_VERSION__</version> <version>3.8.6</version>
<description>PLG_SYSTEM_SESSIONGC_XML_DESCRIPTION</description> <description>PLG_SYSTEM_SESSIONGC_XML_DESCRIPTION</description>
<files> <files>
<filename plugin="sessiongc">sessiongc.php</filename> <filename plugin="sessiongc">sessiongc.php</filename>