[Joomla-commits] r22950 - in development/trunk: installation installation/language/nl-NL libraries/joomla/application

[githu...@jcode001.directrouter.com]

Author: github_bot
Date: 2012-03-25 17:26:15 -0500 (Sun, 25 Mar 2012)
New Revision: 22950

Modified:
development/trunk/installation/CHANGELOG
development/trunk/installation/language/nl-NL/nl-NL.ini
development/trunk/libraries/joomla/application/categories.php
Log:
Merge branch 'master' of github.com:joomla/joomla-cms

Modified: development/trunk/installation/CHANGELOG
===================================================================
--- development/trunk/installation/CHANGELOG 2012-03-25 20:26:17 UTC (rev 22949)
+++ development/trunk/installation/CHANGELOG 2012-03-25 22:26:15 UTC (rev 22950)
@@ -26,6 +26,10 @@
- -> Removed
! -> Note

+25-Mar-2012 Jean-Marie Simonet
+ $ Updating installation ini file nl-NL
+ # *SEF issue when using article button in multilanguage. Thanks Christophe
+
25-Mar-2012 Christophe Demko
# [#28284] System messages included in cached pages
# [#28268] Update MooTools to 1.4.5 (Rouven Weßling)

Modified: development/trunk/installation/language/nl-NL/nl-NL.ini
===================================================================
--- development/trunk/installation/language/nl-NL/nl-NL.ini 2012-03-25 20:26:17 UTC (rev 22949)
+++ development/trunk/installation/language/nl-NL/nl-NL.ini 2012-03-25 22:26:15 UTC (rev 22950)
@@ -1,3 +1,4 @@
+; $Id: nl-NL.ini 2.5
; Joomla! Project
; Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt
@@ -37,6 +38,7 @@
INSTL_DATABASE_HOST_LABEL="Naam host"
INSTL_DATABASE_NAME_DESC="Sommige hostingproviders staan slechts één databasenaam toe per account. In dat geval kunt u een ander tabelvoorvoegsel gebruiken om onderscheid te maken tussen verschillende Joomla! installaties."
INSTL_DATABASE_NAME_LABEL="Naam database"
+INSTL_DATABASE_NO_SCHEMA="Er bestaat geen databaseschema voor dit type database."
INSTL_DATABASE_OLD_PROCESS_DESC="Alle bestaande back-up tabellen van vorige Joomla! installaties worden vervangen"
INSTL_DATABASE_OLD_PROCESS_LABEL="Oude database verwerking"
INSTL_DATABASE_PASSWORD_DESC="Voor de veiligheid van uw website is het verplicht een wachtwoord te gebruiken voor de MySQL account"
@@ -97,6 +99,8 @@
INSTL_SITE_INSTALL_SAMPLE_DESC="Het installeren van voorbeelddata wordt dringend aangeraden voor nieuwe gebruikers. Hiermee wordt voorbeelddata uit het installatiepakket in de Joomla! website geplaatst."
INSTL_SITE_SAMPLE_LOADED="Installeren voorbeelddata geslaagd."
INSTL_SAMPLE_DATA_SET="Standaard Engelse (GB) voorbeelddata"
+INSTL_SAMPLE_BLOG_SET="Blog Engelse (GB) voorbeelddata"
+INSTL_SAMPLE_BROCHURE_SET="Brochure Engelse (GB) voorbeelddata"

;Complete view
INSTL_COMPLETE="Voltooien"

Modified: development/trunk/libraries/joomla/application/categories.php
===================================================================
--- development/trunk/libraries/joomla/application/categories.php 2012-03-25 20:26:17 UTC (rev 22949)
+++ development/trunk/libraries/joomla/application/categories.php 2012-03-25 22:26:15 UTC (rev 22950)
@@ -317,10 +317,18 @@
if ($id != 'root')
{
// Get the selected category
- $query->leftJoin('#__categories AS s ON (s.lft <= c.lft AND s.rgt >= c.rgt) OR (s.lft > c.lft AND s.rgt < c.rgt)');
$query->where('s.id=' . (int) $id);
}

+ if ($app->isSite() && $app->getLanguageFilter())
+ {
+ $query->leftJoin('#__categories AS s ON (s.lft < c.lft AND s.rgt > c.rgt AND c.language in (' . $db->Quote(JFactory::getLanguage()->getTag()) . ',' . $db->Quote('*') . ')) OR (s.lft >= c.lft AND s.rgt <= c.rgt)');
+ }
+ else
+ {
+ $query->leftJoin('#__categories AS s ON (s.lft <= c.lft AND s.rgt >= c.rgt) OR (s.lft > c.lft AND s.rgt < c.rgt)');
+ }
+
$subQuery = ' (SELECT cat.id as id FROM #__categories AS cat JOIN #__categories AS parent ' .
'ON cat.lft BETWEEN parent.lft AND parent.rgt WHERE parent.extension = ' . $db->quote($extension) .
' AND parent.published != 1 GROUP BY cat.id) ';
@@ -350,15 +358,6 @@
c.lft, c.metadata, c.metadesc, c.metakey, c.modified_time, c.note, c.params, c.parent_id,
c.path, c.published, c.rgt, c.title, c.modified_user_id');

- // Filter by language
- if ($app->isSite() && $app->getLanguageFilter())
- {
- $query->where(
- '(' . ($id != 'root' ? 'c.id=s.id OR ' : '') . 'c.language in (' . $db->Quote(JFactory::getLanguage()->getTag()) . ',' .
- $db->Quote('*') . '))'
- );
- }
-
// Get the results
$db->setQuery($query);
$results = $db->loadObjectList('id');

_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits