Skip to content

Commit

Permalink
Merge branch 'staging' into improveReinstall
Browse files Browse the repository at this point in the history
  • Loading branch information
@zero-24
zero-24 committed Sep 22, 2016
2 parents 6023b6d + 00f0ce1 commit 9ed5850
Show file tree
Hide file tree
Showing 28 changed files with 221 additions and 397 deletions.
10 changes: 5 additions & 5 deletions README.md
View file
Expand Up @@ -15,13 +15,13 @@ What is this?

What is Joomla?
---------------------
* [Joomla](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
* [Joomla!](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find [full technical requirements here](https://www.joomla.org/about-joomla/technical-requirements.html).
* Joomla is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.
* Joomla! is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.

Is Joomla! for you?
---------------------
* Joomla is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
* Joomla! is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
* View Joomla's [core features here](https://www.joomla.org/core-features.html).
* Try it out for yourself in our [online demo](https://demo.joomla.org).

Expand All @@ -38,9 +38,9 @@ Learn Joomla!

What are the benefits of Joomla?
---------------------
* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
* The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
* There are many ready-made extensions that you can download and install.
* Check out the [Joomla! Extensions Directory (JED)](http://extensions.joomla.org).
* Check out the [Joomla! Extensions Directory (JED)](https://extensions.joomla.org).

Is it easy to change the layout display?
---------------------
Expand Down
8 changes: 4 additions & 4 deletions README.txt
View file
Expand Up @@ -5,13 +5,13 @@
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master

2- What is Joomla?
* Joomla is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
* Joomla! is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
* It's a free and OpenSource software, distributed under the GNU General Public License version 2 or later.
* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run.
You can find full technical requirements here: https://www.joomla.org/about-joomla/technical-requirements.html.

3- Is Joomla! for you?
* Joomla is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
* Joomla! is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
* See Joomla's core features - https://www.joomla.org/core-features.html
* Try out our online demo: https://demo.joomla.org/

Expand All @@ -25,9 +25,9 @@
* Before installing, read the beginners guide: https://docs.joomla.org/Portal:Beginners

6- What are the benefits of Joomla?
* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
* The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
* There are many ready-made extensions that you can download and install.
* Check out the Joomla! Extensions Directory (JED): http://extensions.joomla.org
* Check out the Joomla! Extensions Directory (JED): https://extensions.joomla.org

7- Is it easy to change the layout display?
* The layout is controlled by templates that you can edit.
Expand Down
4 changes: 2 additions & 2 deletions administrator/language/en-GB/en-GB.com_installer.ini
View file
Expand Up @@ -67,8 +67,8 @@ COM_INSTALLER_INSTALL_FROM_DIRECTORY="Install from Folder"
COM_INSTALLER_INSTALL_FROM_URL="Install from URL"
COM_INSTALLER_INSTALL_FROM_WEB="Install from Web"
COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB="Add "Install from Web" tab"
COM_INSTALLER_INSTALL_FROM_WEB_INFO="<a class="_QQ_"alert-link"_QQ_" href="_QQ_"http://extensions.joomla.org"_QQ_" target="_QQ_"_blank"_QQ_">Joomla! Extensions Directory&trade; (JED)</a> now available with <a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://docs.joomla.org/Install_from_Web"_QQ_" target="_QQ_"_blank"_QQ_">Install from Web</a> on this page."
COM_INSTALLER_INSTALL_FROM_WEB_TOS="By selecting "_QQ_"Add Install from Web tab"_QQ_" below, you agree to the JED <a class="_QQ_"alert-link"_QQ_" href="_QQ_"http://extensions.joomla.org/tos"_QQ_" target="_QQ_"_blank"_QQ_">Terms of Service</a> and all applicable third party license terms."
COM_INSTALLER_INSTALL_FROM_WEB_INFO="<a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://extensions.joomla.org"_QQ_" target="_QQ_"_blank"_QQ_">Joomla! Extensions Directory&trade; (JED)</a> now available with <a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://docs.joomla.org/Install_from_Web"_QQ_" target="_QQ_"_blank"_QQ_">Install from Web</a> on this page."
COM_INSTALLER_INSTALL_FROM_WEB_TOS="By selecting "_QQ_"Add Install from Web tab"_QQ_" below, you agree to the JED <a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://extensions.joomla.org/tos"_QQ_" target="_QQ_"_blank"_QQ_">Terms of Service</a> and all applicable third party license terms."
COM_INSTALLER_INSTALL_LANGUAGE_SUCCESS="Installation of the <strong>%s</strong> language was successful."
COM_INSTALLER_INSTALL_SUCCESS="Installation of the %s was successful."
COM_INSTALLER_INSTALL_URL="Install URL"
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_menu/tmpl/default_enabled.php
View file
Expand Up @@ -376,7 +376,7 @@
$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DOCUMENTATION'), 'https://docs.joomla.org', 'class:help-docs', false, '_blank'));
$menu->addSeparator();

$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'http://extensions.joomla.org', 'class:help-jed', false, '_blank'));
$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'https://extensions.joomla.org', 'class:help-jed', false, '_blank'));
$menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_TRANSLATIONS'), 'https://community.joomla.org/translations.html', 'class:help-trans', false, '_blank')
);
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/hathor/html/mod_menu/default_enabled.php
View file
Expand Up @@ -348,7 +348,7 @@
$menu->addSeparator();

$menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'http://extensions.joomla.org', 'class:help-jed', false, '_blank')
new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'https://extensions.joomla.org', 'class:help-jed', false, '_blank')
);
$menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_TRANSLATIONS'), 'https://community.joomla.org/translations.html', 'class:help-trans', false, '_blank')
Expand Down
2 changes: 1 addition & 1 deletion installation/INSTALL
View file
Expand Up @@ -142,7 +142,7 @@ Use Admin to install and configure additional extensions, add users, select
default language and much more.

Note that additional community contributed extensions and languages are
available at the Joomla! Extensions Directory (JED): http://extensions.joomla.org/
available at the Joomla! Extensions Directory (JED): https://extensions.joomla.org/

You can also install and use the `Install from Web Tab` to access the JED
directly from the Admin here:
Expand Down
34 changes: 15 additions & 19 deletions installation/application/web.php
View file
Expand Up @@ -49,23 +49,6 @@ public function __construct()
JUri::root(null, implode('/', $parts));
}

/**
* Event listener for the `onAfterSessionStart` event.
*
* @param JSession $session Session object
*
* @return void
*
* @since __DEPLOY_VERSION__
*/
public function afterSessionStart(JSession $session)
{
if ($session->isNew())
{
$session->set('registry', new Registry('session'));
}
}

/**
* Method to display errors in language parsing.
*
Expand Down Expand Up @@ -535,12 +518,25 @@ public function loadSession(JSession $session = null)
'force_ssl' => $this->get('force_ssl'),
);

$this->registerEvent('onAfterSessionStart', array($this, 'afterSessionStart'));

// Instantiate the session object.
$session = JSession::getInstance($handler, $options);
$session->initialise($this->input, $this->dispatcher);

if ($session->getState() == 'expired')
{
$session->restart();
}
else
{
$session->start();
}

if (!$session->get('registry') instanceof Registry)
{
// Registry has been corrupted somehow.
$session->set('registry', new Registry('session'));
}

// Set the session object.
$this->session = $session;

Expand Down

0 comments on commit 9ed5850

Please sign in to comment.