joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-20 19:15:27 +00:00
Code Packages Releases Activity

Simplification for the release process Fixes #7292

Browse Source
This commit is contained in:
Robert Deutz 2015-06-30 21:41:43 +02:00 committed by Viktor Vogel
parent a2a1bb1d8a
commit 3931d32ba1
3 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
administrator/includes/framework.php
View File

@ -11,9 +11,23 @@ defined('_JEXEC') or die;
// Joomla system checks.
@ini_set('magic_quotes_runtime', 0);
// System includes
require_once JPATH_LIBRARIES . '/import.legacy.php';
// Set system error handling
JError::setErrorHandling(E_NOTICE, 'message');
JError::setErrorHandling(E_WARNING, 'message');
JError::setErrorHandling(E_ERROR, 'message', array('JError', 'customErrorPage'));
// Bootstrap the CMS libraries.
require_once JPATH_LIBRARIES . '/cms.php';
$version = new JVersion;
// Installation check, and check on removal of the install directory.
if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) /* || file_exists(JPATH_INSTALLATION . '/index.php')*/)
|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
|| (file_exists(JPATH_INSTALLATION . '/index.php') && (false === $version->isInDevelopmentState())))
{
if (file_exists(JPATH_INSTALLATION . '/index.php'))
{
@ -29,17 +43,6 @@ if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
}
}
// System includes
require_once JPATH_LIBRARIES . '/import.legacy.php';
// Set system error handling
JError::setErrorHandling(E_NOTICE, 'message');
JError::setErrorHandling(E_WARNING, 'message');
JError::setErrorHandling(E_ERROR, 'message', array('JError', 'customErrorPage'));
// Bootstrap the CMS libraries.
require_once JPATH_LIBRARIES . '/cms.php';
// Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
ob_start();
require_once JPATH_CONFIGURATION . '/configuration.php';

27
includes/framework.php
View File

@ -11,9 +11,23 @@ defined('_JEXEC') or die;
// Joomla system checks.
@ini_set('magic_quotes_runtime', 0);
// System includes
require_once JPATH_LIBRARIES . '/import.legacy.php';
// Set system error handling
JError::setErrorHandling(E_NOTICE, 'message');
JError::setErrorHandling(E_WARNING, 'message');
JError::setErrorHandling(E_ERROR, 'callback', array('JError', 'customErrorPage'));
// Bootstrap the CMS libraries.
require_once JPATH_LIBRARIES . '/cms.php';
$version = new JVersion;
// Installation check, and check on removal of the install directory.
if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION . '/index.php')*/)
|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
|| (file_exists(JPATH_INSTALLATION . '/index.php') && (false === $version->isInDevelopmentState())))
{
if (file_exists(JPATH_INSTALLATION . '/index.php'))
{
@ -29,17 +43,6 @@ if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
}
}
// System includes
require_once JPATH_LIBRARIES . '/import.legacy.php';
// Set system error handling
JError::setErrorHandling(E_NOTICE, 'message');
JError::setErrorHandling(E_WARNING, 'message');
JError::setErrorHandling(E_ERROR, 'callback', array('JError', 'customErrorPage'));
// Bootstrap the CMS libraries.
require_once JPATH_LIBRARIES . '/cms.php';
// Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
ob_start();
require_once JPATH_CONFIGURATION . '/configuration.php';

14
libraries/cms/version/version.php
View File

@ -49,12 +49,24 @@ final class JVersion
/** @var string Link text. */
public $URL = '<a href="http://www.joomla.org">Joomla!</a> is Free Software released under the GNU General Public License.';
/**
* Check if we are in development mode
*
* @return boolean
*
* @since 3.4.3
*/
public function isInDevelopmentState()
{
return strtolower($this->DEV_STATUS) != 'stable';
}
/**
* Compares two a "PHP standardized" version number against the current Joomla version.
*
* @param string $minimum The minimum version of the Joomla which is compatible.
*
* @return bool True if the version is compatible.
* @return boolean True if the version is compatible.
*
* @see http://www.php.net/version_compare
* @since 1.0