Merge branch 'staging' into improveReinstall

joomla · Sep 12, 2016 · bf6fbb8 · bf6fbb8
2 parents 1bd8edd + b39ada2
commit bf6fbb8
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
@@ -424,7 +424,7 @@ JGLOBAL_MENU_SELECTION="Menu Selection:"
 JGLOBAL_MODIFIED="Modified"
 JGLOBAL_MODIFIED_DATE="Modified Date"
 JGLOBAL_MOST_HITS="Most Hits"
-JGLOBAL_MOST_RECENT_FIRST="Most recent first"
+JGLOBAL_MOST_RECENT_FIRST="Most Recent First"
 JGLOBAL_MULTI_COLUMN_ORDER_DESC="Order articles down or across columns."
 JGLOBAL_MULTI_COLUMN_ORDER_LABEL="Multi Column Order"
 JGLOBAL_MULTI_LEVEL="Multi Level"
@@ -447,7 +447,7 @@ JGLOBAL_NUMBER_CATEGORY_ITEMS_LABEL="Show Article Count"
 JGLOBAL_NUMBER_ITEMS_LIST_DESC="Default number of articles to list on a page."
 JGLOBAL_NUMBER_ITEMS_LIST_LABEL="# Articles to List"
 JGLOBAL_NO_MATCHING_RESULTS="No Matching Results"
-JGLOBAL_OLDEST_FIRST="Oldest first"
+JGLOBAL_OLDEST_FIRST="Oldest First"
 JGLOBAL_ORDER_ASCENDING="Ascending"
 JGLOBAL_ORDER_DESCENDING="Descending"
 JGLOBAL_ORDER_DIRECTION_LABEL="Direction"

diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
@@ -7519,8 +7519,8 @@ h6 {
 .sidebar-nav .nav-list > li > a {
 	color: #555;
 	padding: 3px 25px;
-	margin-left: -25px;
-	margin-right: -25px;
+	margin-left: -26px;
+	margin-right: -26px;
 }
 .sidebar-nav .nav-list > li.active > a {
 	color: #fff;

diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
@@ -7519,8 +7519,8 @@ h6 {
 .sidebar-nav .nav-list > li > a {
 	color: #555;
 	padding: 3px 25px;
-	margin-left: -25px;
-	margin-right: -25px;
+	margin-left: -26px;
+	margin-right: -26px;
 }
 .sidebar-nav .nav-list > li.active > a {
 	color: #fff;

diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less
@@ -496,8 +496,8 @@ h6 {
 .sidebar-nav .nav-list > li > a {
 	color: #555;
 	padding: 3px 25px;
-	margin-left: -25px;
-	margin-right: -25px;
+	margin-left: -26px;
+	margin-right: -26px;
 }
 
 .sidebar-nav .nav-list > li.active > a {

diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
@@ -677,14 +677,16 @@ public static function keepalive()
 			return;
 		}
 
+		$session = JFactory::getSession();
+
 		// If the handler is not 'Database', we set a fixed, small refresh value (here: 5 min)
-		if (JFactory::getConfig()->get('session_handler') != 'database')
+		if ($session->storeName != 'database')
 		{
 			$refresh_time = 300000;
 		}
 		else
 		{
-			$life_time    = JFactory::getConfig()->get('lifetime') * 60000;
+			$life_time    = $session->getExpire() * 1000;
 			$refresh_time = ($life_time <= 60000) ? 45000 : $life_time - 60000;
 
 			// The longest refresh period is one hour to prevent integer overflow.
@@ -694,14 +696,12 @@ public static function keepalive()
 			}
 		}
 
+		$url = JUri::base(true) . '/index.php';
+
 		// If we are in the frontend or logged in as a user, we can use the ajax component to reduce the load
 		if (JFactory::getApplication()->isSite() || !JFactory::getUser()->guest)
 		{
-			$url = JUri::base(true) . '/index.php?option=com_ajax&format=json';
-		}
-		else
-		{
-			$url = JUri::base(true) . '/index.php';
+			$url .= '?option=com_ajax&format=json';
 		}
 
 		$script = 'window.setInterval(function(){';

diff --git a/libraries/joomla/language/language.php b/libraries/joomla/language/language.php
@@ -723,18 +723,19 @@ public static function exists($lang, $basePath = JPATH_BASE)
 	 */
 	public function load($extension = 'joomla', $basePath = JPATH_BASE, $lang = null, $reload = false, $default = true)
 	{
+		// If language is null set as the current language.
+		if (!$lang)
+		{
+			$lang = $this->lang;
+		}
+
 		// Load the default language first if we're not debugging and a non-default language is requested to be loaded
 		// with $default set to true
 		if (!$this->debug && ($lang != $this->default) && $default)
 		{
 			$this->load($extension, $basePath, $this->default, false, true);
 		}
 
-		if (!$lang)
-		{
-			$lang = $this->lang;
-		}
-
 		$path = self::getLanguagePath($basePath, $lang);
 
 		$internal = $extension == 'joomla' || $extension == '';

diff --git a/tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php b/tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php
@@ -45,6 +45,7 @@ protected function setUp()
 
 		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$document = $this->getMockDocument();
+		JFactory::$session = $this->getMockSession();
 
 		// We generate a random template name so that we don't collide or hit anything
 		JFactory::$application->expects($this->any())