diff -aruN --binary 10/administrator/components/com_config/controllers/application.php 11/administrator/components/com_config/controllers/application.php
--- 10/administrator/components/com_config/controllers/application.php	2009-03-28 01:43:38.000000000 +0100
+++ 11/administrator/components/com_config/controllers/application.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: application.php 11687 2009-03-11 17:49:23Z ian $
+ * @version		$Id: application.php 11795 2009-05-06 01:59:19Z ian $
  * @package		Joomla
  * @subpackage	Config
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -193,7 +193,7 @@
 		$lists['feed_limit']	= JHTML::_('select.genericlist',  $listLimit, 'feed_limit', 'class="inputbox" size="1"', 'value', 'text', ($row->feed_limit ? $row->feed_limit : 10));
 		$emailOptions = array (	JHTML::_('select.option', 'author', JText::_('Author Email')),
 								JHTML::_('select.option', 'site', JText::_('Site Email')));
-		$lists['feed_email'] = JHTML::_('select.genericlist', $emailOptions, 'feed_email', 'class="inputbox" size="1"', 'value', 'text', ($row->feed_email) ? $row->feed_email : 'author');
+		$lists['feed_email'] = JHTML::_('select.genericlist', $emailOptions, 'feed_email', 'class="inputbox" size="1"', 'value', 'text', (@$row->feed_email) ? $row->feed_email : 'author');
 		
 		// SESSION SETTINGS
 		$stores = JSession::getStores();
diff -aruN --binary 10/administrator/components/com_content/toolbar.content.html.php 11/administrator/components/com_content/toolbar.content.html.php
--- 10/administrator/components/com_content/toolbar.content.html.php	2008-07-06 23:38:42.000000000 +0200
+++ 11/administrator/components/com_content/toolbar.content.html.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: toolbar.content.html.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: toolbar.content.html.php 11798 2009-05-06 02:11:47Z ian $
 * @package		Joomla
 * @subpackage	Content
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -64,7 +64,7 @@
 	{
 		global $filter_state;
 
-		JToolBarHelper::title( JText::_( 'Article Manager' ), 'addedit.png' );
+		JToolBarHelper::title( JText::_( 'Article Manager' ), 'article.png' );
 		if ($filter_state == 'A' || $filter_state == NULL) {
 			JToolBarHelper::unarchiveList();
 		}
diff -aruN --binary 10/administrator/components/com_media/config.xml 11/administrator/components/com_media/config.xml
--- 10/administrator/components/com_media/config.xml	2008-11-11 01:30:12.000000000 +0100
+++ 11/administrator/components/com_media/config.xml	2009-06-02 23:51:34.000000000 +0200
@@ -9,6 +9,12 @@
 			<option value="0">NO</option>
 			<option value="1">YES</option>
 		</param>
+		<param name="allowed_media_usergroup" type="list" default="3" label="ALLOWED_USERGROUP" description="ALLOWED_USERGROUP_DESC">
+			<option value="4">Registered</option>
+			<option value="3">Author</option>
+			<option value="2">Editor</option>
+			<option value="1">Publisher</option>
+		</param>		
 		<param name="check_mime" type="radio" default="1" label="CHECK MIME" description="CHECK MIME DESC">
 			<option value="0">NO</option>
 			<option value="1">YES</option>
diff -aruN --binary 10/administrator/components/com_users/views/user/tmpl/form.php 11/administrator/components/com_users/views/user/tmpl/form.php
--- 10/administrator/components/com_users/views/user/tmpl/form.php	2008-07-06 23:38:36.000000000 +0200
+++ 11/administrator/components/com_users/views/user/tmpl/form.php	2009-06-02 23:51:34.000000000 +0200
@@ -22,7 +22,7 @@
 
 <?php
 	// clean item data
-	JFilterOutput::objectHTMLSafe( $user, ENT_QUOTES, '' );
+	JFilterOutput::objectHTMLSafe( $this->user, ENT_QUOTES, '' );
 
 	if ($this->user->get('lastvisitDate') == "0000-00-00 00:00:00") {
 		$lvisit = JText::_( 'Never' );
diff -aruN --binary 10/administrator/help/helpsites-15.xml 11/administrator/help/helpsites-15.xml
--- 10/administrator/help/helpsites-15.xml	2009-03-28 01:43:44.000000000 +0100
+++ 11/administrator/help/helpsites-15.xml	2009-06-03 23:03:50.000000000 +0200
@@ -2,10 +2,6 @@
 <joshelp>
 <sites>
    	<site tag="en-GB" url="http://help.joomla.org">English (GB) - help.joomla.org</site>
-   	<site tag="es-ES" url="http://comunidadjoomla.org"> Spanish -comunidadjoomla.org</site>
-    <site tag="it-IT" url="http://www.joomla.it"> Italian - joomla.it</site>
-    <site tag="hu-HU" url="http://help.joomla.org.hu"> Hungarian -joomla.org.hu</site>
-    <site tag="de-DE" url="http://hilfe.jgerman.de"> German -hilfe.jgerman.de</site>
-    <site tag="nl-NL" url="http://help.joomlacommunity.eu"> Dutch(NL) - help.joomlacommunity.eu</site>
+    <site tag="ca-ES" url="http://www.joomla.cat"> Catalan - joomla.cat</site>
 </sites>
 </joshelp>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 10/administrator/includes/framework.php 11/administrator/includes/framework.php
--- 10/administrator/includes/framework.php	2009-03-28 01:43:44.000000000 +0100
+++ 11/administrator/includes/framework.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: framework.php 11704 2009-03-25 21:15:56Z willebil $
+* @version		$Id: framework.php 11992 2009-06-03 03:21:10Z ian $
 * @package		Joomla
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
diff -aruN --binary 10/administrator/language/en-GB/en-GB.com_config.ini 11/administrator/language/en-GB/en-GB.com_config.ini
--- 10/administrator/language/en-GB/en-GB.com_config.ini	2009-03-28 01:43:44.000000000 +0100
+++ 11/administrator/language/en-GB/en-GB.com_config.ini	2009-06-02 23:51:34.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: en-GB.com_config.ini 11687 2009-03-11 17:49:23Z ian $
+# $Id: en-GB.com_config.ini 11784 2009-04-24 17:34:11Z kdevine $
 # Joomla! Project
 # Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
@@ -7,6 +7,8 @@
 ADD SUFFIX TO URLS=Add suffix to URLs
 ADMINISTRATOR ONLY=Administrator Only
 ALLOW USER REGISTRATION=Allow User Registration
+ALLOWED_USERGROUP=Minimum User Level for Media Manager
+ALLOWED_USERGROUP_DESC=Select the lowest user level that can use the Media Manager in the front end. Users in this group and higher groups will be able to access the Media Manager.
 ATOM=Atom
 AUTHOR NAMES=Author Names
 CACHE=Cache
@@ -64,6 +66,7 @@
 HELPREFRESH ERROR FETCH=The current Help Sites list could not be fetched from the remote server
 HELPREFRESH ERROR STORE=The new Help Sites list could not be saved
 HELPREFRESH SUCCESS=The Help Sites list has been refreshed.
+HOST=HOST
 HOSTNAME=Hostname
 INTRO TEXT=Intro Text
 ITEM RATING/VOTING=Article Rating/Voting
@@ -91,6 +94,10 @@
 MAXIMUM SIZE LABEL=Maximum Size (in bytes)
 MAXIMUM SIZE DESC=The maximum size for an upload (in bytes). Use zero for no limit.
 MEDIA SETTINGS=Media Settings
+MEMCACHE=Memory Cache
+MEMCACHE PERSISTENT=Persistent Memory Cache
+MEMCACHE COMPRESSION=Memory Cache Compression
+MEMCACHE SERVER=Memory Cache Server
 METADATA=Metadata
 METADATA SETTINGS=Metadata Settings
 MODIFIED DATE AND TIME=Modified Date and Time
@@ -104,6 +111,7 @@
 PATH TO FILE FOLDER=Path to Media Folder
 PDF ICON=PDF Icon
 PHP MAIL FUNCTION=PHP Mail Function
+PORT=Port
 READ MORE LINK=Read more...link
 REFRESH=Refresh
 RSS=RSS
diff -aruN --binary 10/administrator/language/en-GB/en-GB.com_installer.ini 11/administrator/language/en-GB/en-GB.com_installer.ini
--- 10/administrator/language/en-GB/en-GB.com_installer.ini	2009-03-28 01:43:44.000000000 +0100
+++ 11/administrator/language/en-GB/en-GB.com_installer.ini	2009-06-02 23:51:34.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: en-GB.com_installer.ini 11656 2009-03-08 20:05:54Z willebil $
+# $Id: en-GB.com_installer.ini 11788 2009-04-24 18:32:46Z kdevine $
 # Joomla! Project
 # Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
@@ -158,3 +158,5 @@
 THERE ARE NO CUSTOM LANGUAGES INSTALLED=There are no custom languages installed.
 THERE ARE NO CUSTOM MODULES INSTALLED=There are no custom modules installed.
 THERE ARE NO CUSTOM PLUGINS INSTALLED=There are no custom plugins installed.
+INVALIDINSTALLFILE=Incorrect %s file detected, for more information see <a href="http://docs.joomla.org/Incorrect_Install_File">incorrect install file</a> on the documentation wiki.
+BLANKSCRIPTELEMENT=%s script value was blank! Set this to a value or delete the tag.
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 10/administrator/language/en-GB/en-GB.com_statistics.ini 11/administrator/language/en-GB/en-GB.com_statistics.ini
--- 10/administrator/language/en-GB/en-GB.com_statistics.ini	2008-07-06 23:38:32.000000000 +0200
+++ 11/administrator/language/en-GB/en-GB.com_statistics.ini	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-# $Id: en-GB.com_statistics.ini 10496 2008-07-03 07:08:39Z ircmaxell $
-# Joomla! Project
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
-# License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
-# Note : All ini files need to be saved as UTF-8 - No BOM
-
-BROWSERS=Browsers
-BROWSER, OS, DOMAIN STATISTICS=Browser, OS, Domain Statistics
-DISABLED=Disabled
-DOMAIN=Domain
-DOMAIN STATS=Domain Stats
-HIDE SEARCH RESULTS=Hide Search Results
-LOGGING IS=Logging is
-OPERATING SYSTEM=Operating System
-OS STATS=OS Stats
-ARTICLE IMPRESSION STATISTICS=Article Impression Statistics
-ARTICLE IMPRESSIONS=Article Impressions
-RESULTS RETURNED=Results Returned
-SEARCH ENGINE TEXT=Search Engine Text
-SEARCH TEXT=Search Text
-SORT ASCENDING=Sort Ascending
-SORT DESCENDING=Sort Descending
-TIMES REQUESTED=Times Requested
-RESET STATISTICS FAILED=Reset Statistics Failed
-RESET STATISTICS SUCCES=Reset Statistics Succeeded
-SHOW SEARCH RESULTS=Show Search Results
-UNCATEGORIZED=Uncategorised
-WARN_RESULTS=Activating this can dramatically slow, and even lock up your Web site because it is a highly query-intensive operation.
-BROWSER, OS, DOMAIN=Browser, OS, Domain
-SEARCH LOGGING=Search Logging
diff -aruN --binary 10/administrator/language/en-GB/en-GB.ini 11/administrator/language/en-GB/en-GB.ini
--- 10/administrator/language/en-GB/en-GB.ini	2009-03-28 01:43:44.000000000 +0100
+++ 11/administrator/language/en-GB/en-GB.ini	2009-06-02 23:51:34.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: en-GB.ini 11667 2009-03-08 20:32:38Z willebil $
+# $Id: en-GB.ini 11799 2009-05-06 02:15:50Z ian $
 # Joomla! Project
 # Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
@@ -422,7 +422,7 @@
 PARAMETER CONTROL=Parameter Control
 PARAMETERS=Parameters
 PARAMENABLED=Enable this Plugin.
-PARAMMENUIMAGE=A small image to be placed to the left or right of your Menu Item. Images must be in images/stories/
+PARAMMENUIMAGE=A small image to be placed beside your Menu Item. Images must be in images/stories/
 PARAMPAGECLASSSFX=A suffix to be applied to the CSS classes of the page. This allows individual page styling.
 PARAMPAGETITLE=Text to display as the Page title. If left blank, a default title will be used instead.
 PARAMPAGEHEADER=Text to display at the top of the page. If left blank, the Menu title will be used instead.
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_admin.ini 11/administrator/language/es-ES/es-ES.com_admin.ini
--- 10/administrator/language/es-ES/es-ES.com_admin.ini	2009-03-28 20:11:36.000000000 +0100
+++ 11/administrator/language/es-ES/es-ES.com_admin.ini	2009-05-21 08:09:44.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_admin.ini 1.5.0 2009-03-28 20:11:36 17:00:11 ~0 $
+# $Id: es-ES.com_admin.ini 1.5.0 2009-05-21 08:09:42 17:00:11 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_banners.ini 11/administrator/language/es-ES/es-ES.com_banners.ini
--- 10/administrator/language/es-ES/es-ES.com_banners.ini	2008-07-28 15:19:32.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_banners.ini	2009-05-21 08:11:48.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_banners.ini 1.5.0 2008-07-28 16:19:33 15:27:36 ~0 $
+# $Id: es-ES.com_banners.ini 1.5.0 2009-05-21 08:11:47 15:27:36 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -56,5 +56,5 @@
 WARNCANNOTDELCLIENTBANNER=No puedo borrar a este cliente mientras tenga algún anuncio activo.
 WARNEDITEDBYPERSON=El cliente [ %s ] está actualmente siendo editado por otra persona.
 YES=Sí
-YOU MUST PROVIDE A BANNER NAME.=Debes facilitar un nombre de anuncio.
+YOU MUST PROVIDE A BANNER NAME.=Debes facilitar un nombre al anuncio.
 FILTER RESET=Restablecer
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_banners.menu.ini 11/administrator/language/es-ES/es-ES.com_banners.menu.ini
--- 10/administrator/language/es-ES/es-ES.com_banners.menu.ini	2008-07-08 20:20:42.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_banners.menu.ini	2009-05-21 08:12:22.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_banners.menu.ini 1.5.0 2008-07-08 16:13:16 02:29:07 ~0 $
+# $Id: es-ES.com_banners.menu.ini 1.5.0 2009-05-21 08:12:21 02:29:07 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_cache.ini 11/administrator/language/es-ES/es-ES.com_cache.ini
--- 10/administrator/language/es-ES/es-ES.com_cache.ini	2009-01-11 02:24:14.000000000 +0100
+++ 11/administrator/language/es-ES/es-ES.com_cache.ini	2009-05-21 08:14:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_cache.ini 1.5.0 2009-01-11 02:24:15 15:28:17 ~0 $
+# $Id: es-ES.com_cache.ini 1.5.0 2009-05-21 08:14:11 15:28:17 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -8,9 +8,9 @@
 CACHE MANAGER - CLEAN CACHE ADMIN=Administrador de caché - Limpiar la caché del Admin
 CACHE MANAGER - PURGE CACHE ADMIN=Administrador de caché - Purgar caché Admin
 PURGE EXPIRED=Purga expirada
-PURGE EXPIRED ITEMS=Purgue elementos expirados
+PURGE EXPIRED ITEMS=Purgar elementos expirados
 WARNING: THIS CAN BE RESOURCE INTENSIVE ON SITES WITH LARGE NUMBER OF ITEMS!=ADVERTENCIA: Este puede causar intensidad de recursos en los sitios con gran número de temas!
-CLICK ON THE PURGE EXPIRED ICON IN THE TOOLBAR TO DELETE ALL EXPIRED CACHE FILES. NOTE: CACHE FILES THAT ARE STILL CURRENT WILL NOT BE DELETED.=Haga clic en la purga de expirado de la barra de herramientas para eliminar todos los archivos de la caché expirados. Nota: El caché de los archivos que aún están en curso no se eliminarán.
+CLICK ON THE PURGE EXPIRED ICON IN THE TOOLBAR TO DELETE ALL EXPIRED CACHE FILES. NOTE: CACHE FILES THAT ARE STILL CURRENT WILL NOT BE DELETED.=Haga clic en la purga de expirado de la barra de herramientas para eliminar todos los archivos de la caché expirados. Nota: La caché de los archivos que aún están en curso no se eliminarán.
 EXPIRED ITEMS HAVE BEEN PURGED=Items expirados que se han purgado
 SUCCESS!=¡Completado con éxito!
 CACHE DIRECTORY IS UNWRITABLE=El directorio de la caché no es escribible
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_categories.ini 11/administrator/language/es-ES/es-ES.com_categories.ini
--- 10/administrator/language/es-ES/es-ES.com_categories.ini	2009-03-28 20:12:54.000000000 +0100
+++ 11/administrator/language/es-ES/es-ES.com_categories.ini	2009-05-21 08:19:42.000000000 +0200
@@ -1,13 +1,13 @@
-# $Id: es-ES.com_categories.ini 1.5.0 2009-03-28 20:12:55 15:32:16 ~0 $
+# $Id: es-ES.com_categories.ini 1.5.0 2009-05-21 08:19:41 15:32:16 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
 
-A LONG NAME TO BE DISPLAYED IN HEADINGS=Nombre completo para mostrar en los encabezados
+A LONG NAME TO BE DISPLAYED IN HEADINGS=Un nombre largo para que se muestre la página como título, cuando este campo está configurado en Mostrar.
 ACTIVE=Activo
-ALIAS=Alias
+ALIAS=Alías
 ALL CATEGORIES=Todas las categorías
 ALL CONTENT=Todo el contenido
 ALL CONTENT:=Todo el contenido:
@@ -47,7 +47,7 @@
 CONTENT:=Contenido: %s
 CONTENT: ALL=Contenido: Todo
 COPY CATEGORY=Copiar categoría
-COPY OF=Copia de
+COPY OF=Copia de %s
 COPY TO SECTION=Copiar a sección
 DESCNEWITEMSLAST=Nuevas categorías en el último lugar por defecto.El orden se puede cambiar después de que esta categoría se salve.
 IMAGE POSITION=Posición de la imagen
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_checkin.ini 11/administrator/language/es-ES/es-ES.com_checkin.ini
--- 10/administrator/language/es-ES/es-ES.com_checkin.ini	2008-07-08 20:20:42.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_checkin.ini	2009-05-21 08:21:20.000000000 +0200
@@ -1,12 +1,12 @@
-# $Id: es-ES.com_checkin.ini 1.5.0 2008-07-08 17:05:19 15:32:52 ~0 $
+# $Id: es-ES.com_checkin.ini 1.5.0 2009-05-21 08:21:19 15:32:52 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
 
-CHECKED-IN=Desbloqueado
-CHECKED OUT ITEMS HAVE NOW BEEN ALL CHECKED IN=Todos los objetos bloqueados ahora están desbloqueados.
+CHECKED-IN=Comprobado en
+CHECKED OUT ITEMS HAVE NOW BEEN ALL CHECKED IN=Todos los objetos bloqueados ahora están desbloqueados y comprobados.
 CHECKING TABLE=Comprobar tabla
 DATABASE TABLE=Tabla de la base de datos
 DESCITEMCHECKEDIN=Todos los objetos bloqueados ahora están desbloqueados.
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_config.ini 11/administrator/language/es-ES/es-ES.com_config.ini
--- 10/administrator/language/es-ES/es-ES.com_config.ini	2009-01-11 02:27:10.000000000 +0100
+++ 11/administrator/language/es-ES/es-ES.com_config.ini	2009-05-21 08:35:40.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_config.ini 1.5.0 2009-01-11 02:27:10 15:45:22 ~0 $
+# $Id: es-ES.com_config.ini 1.5.0 2009-05-21 08:35:39 15:45:22 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -8,6 +8,8 @@
 ADD SUFFIX TO URLS=Agregar el sufijo a las URLs
 ADMINISTRATOR ONLY=Solo el administrador
 ALLOW USER REGISTRATION=Permitir el registro de usuarios
+ALLOWED_USERGROUP=Nivel mínimo de Usuario para Media Manager
+ALLOWED_USERGROUP_DESC=Seleccionar el nivel más bajo  de usuario que pueda usar la Media Manager en la parte frontal. Los usuarios de este grupo y los grupos de mayor nivel accederán a la Media Manager.
 ATOM=ATOM
 AUTHOR NAMES=Nombre del autor
 CACHE=Caché
@@ -41,6 +43,7 @@
 ENTIRE SITE=Sitio entero
 ERROR REPORTING=Informe de errores
 ERRORCONFIGFILE=¡Ha ocurrido un error! ¡No es posible abrir/escribir el archivo de configuración!
+FEED EMAIL=Feed Email
 FEEDLIMIT=Límite de la noticia
 FEED LENGTH=Longitud de la noticia
 FOR EACH ARTICLE, SHOW=Para cada artículo, mostrar
@@ -64,13 +67,14 @@
 HELPREFRESH ERROR FETCH=El servidor remoto, no puede conectarse con los siguientes sitios de ayuda
 HELPREFRESH ERROR STORE=No es posible guardar la lista de los nuevos sitios de ayuda
 HELPREFRESH SUCCESS=Se actualizó la lista de sitios de ayuda.
+HOST=HOST
 HOSTNAME=Nombre del proveedor
 INTRO TEXT=Texto de introducción
 ITEM RATING/VOTING=Clasificación/Votación de contenidos
 JCLIENTHELPER::SETCREDENTIALSFROMREQUEST FAILED=Imposible conectarse con el servidor con las credenciales facilitadas.
 LEGAL EXTENSIONS LABEL=Extensiones permitidas
-LEGAL EXTENSIONS DESC=Extensiones que puede subir, separadas por una coma.
-LEGAL IMAGE EXTENSIONS LABEL=Extensiones permitidas (Tipos de Archivo)
+LEGAL EXTENSIONS DESC=Extensiones (tipos de archivo) para los archivos que se permiten ser subidos (separados por comas).
+LEGAL IMAGE EXTENSIONS LABEL=Imagen legal de Extensiones (tipos de archivo)
 LEGAL IMAGE EXTENSIONS DESC=Extensiones (tipos de archivo) que puedes subir, separados por una coma.
 RESTRICT UPLOADS=Subidas restringidas
 RESTRICT UPLOADS DESC=Subidas restringidas para usuarios con rango menor a Autor. Cuando el Fileinfo o MIME Magic no esté instalado se limitará a dichas subidas.
@@ -91,6 +95,10 @@
 MAXIMUM SIZE LABEL=Tamaño máximo (en bytes)
 MAXIMUM SIZE DESC=El tamaño máximo a subir (en bytes). Utilize cero para hacerlo ilimitado.
 MEDIA SETTINGS=Configuración multimedia
+MEMCACHE=Memoria de la caché
+MEMCACHE PERSISTENT=Memoria de la caché persistente
+MEMCACHE COMPRESSION=Compresión de la Memoria de la caché
+MEMCACHE SERVER=Memoria de la caché del Server
 METADATA=Metadatos
 METADATA SETTINGS=Parámetros de los metadatos
 MODIFIED DATE AND TIME=Fecha y hora de modificación
@@ -104,6 +112,7 @@
 PATH TO FILE FOLDER=Ruta al directorio de archivos
 PDF ICON=Icono PDF
 PHP MAIL FUNCTION=Función de correo PHP
+PORT=Puerto
 READ MORE LINK=Mostrar enlace Leer más...
 REFRESH=Actualizar
 RSS=RSS
@@ -126,6 +135,7 @@
 SIMPLE=Simple
 SITE NAME=Nombre del sitio web
 SITE OFFLINE=Sitio desactivado
+SITE EMAIL=Email del sitio
 SITE SETTINGS=Configuración del sitio
 SMTP AUTH=Autenticacion SMTP
 SMTP HOST=Servidor SMTP
@@ -138,7 +148,7 @@
 SYSTEM SETTINGS=Configuración del sistema
 THE CONFIGURATION DETAILS HAVE BEEN UPDATED=Se han actualiazado los detalles de la configuración
 TIPALLOWUSERREG=Si eliges 'Si', permite a los usuarios registrarse por sí mismos
-TIPAUTOLOGOUTTIMEOF=Desconectar automáticamente a un usuario después de este tiempo de inactividad
+TIPAUTOLOGOUTTIMEOF=Auto sesión de usuario después de que han estado inactivas por el número de minutos desde que entró. No demasiado alto.
 TIPCACHETIME=El tiempo máximo, en minutos, que debe pasar para que se renueve la caché.
 TIPCACHE=Selecciona si la caché está habilitada, o no.
 TIPCACHEHANDLER=El mecanismo predeterminado de la caché es en base a archivo.
@@ -153,6 +163,7 @@
 TIPDEFWYSIWYG=Selecciona el editor WYSIWYG por defecto para tu sitio. Lo usuarios registrados podrán cambiarlo desde sus detalles de cuenta personales, si permites esa opción.
 TIPENABLEWEBSERVICES=Habilita la capacidad de la instalación a hacer RPC(Llamadas remotas a procedimientos) usando HTTP como medio de transporte y XML como la codificación del lenguaje. Esta función es necesaria para asegurar que muchas de las extensiones de terceros funcionen. Por defecto, está habilitada.
 TIPERRORREPORTING=Selecciona el nivel apropiado de informes desde la siguiente lista seleccionable. Mira la pantalla de ayuda para detalles completos.
+TIPFEEDEMAIL=El RSS y Atom de noticias incluyen la dirección de correo electrónico del autor. Seleccione Autor Enviar un correo electrónico a cada uno de los autores del uso de correo electrónico (desde el Administrador de usuarios) en las noticias. Seleccione Sitio Enviar un correo electrónico a incluir el sitio "Correo de 'dirección de correo electrónico para cada uno de los artículos.
 TIPFROMNAME=Por defecto, este campo se cumplimenta con el nombre del sitio, introducido durante el proceso de instalación.
 TIPFRONTENDUSERPARAMS=Si esta configurado en mostrar, los usuarios podrán seleccionar su idioma, editor y preferencias de ayuda del sitio desde sus perfiles, una vez estén logueados en el sitio.
 TIPENABLEFTP=Habilita la funcionalidad del FTP(Protocolo de trasferencia de archivos)dentro de Joomla!, para ser usado en lugar de la funcionalidad normal de subida de archivos de Joomla!
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_contact.ini 11/administrator/language/es-ES/es-ES.com_contact.ini
--- 10/administrator/language/es-ES/es-ES.com_contact.ini	2008-07-08 20:20:42.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_contact.ini	2009-05-21 08:37:12.000000000 +0200
@@ -1,13 +1,13 @@
-# $Id: es-ES.com_contact.ini 1.5.0 2008-07-08 16:34:24 15:48:25 ~0 $
+# $Id: es-ES.com_contact.ini 1.5.0 2009-05-21 08:37:11 15:48:25 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
 
 A CONTACTS CATEGORY=Una categoría de contactos
 ACCESS=Nivel de acceso
-ADDRESS ICON=Icono dirección
+ADDRESS ICON=Icono de dirección
 ALIGNMENT OF THE IMAGE=Alineación de la imagen
 BANNED EMAIL LABEL=E-mail bloqueado
 BANNED EMAIL DESC=Los e-mails que contengan alguno de los textos listados serán bloqueados. Separa las distintas palabras con un punto y coma. (Por ejemplo ban;text;etc).
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_contact.menu.ini 11/administrator/language/es-ES/es-ES.com_contact.menu.ini
--- 10/administrator/language/es-ES/es-ES.com_contact.menu.ini	2008-07-08 20:20:42.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_contact.menu.ini	2009-05-21 08:38:12.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_contact.menu.ini 1.5.0 2008-07-08 16:31:00 15:49:28 ~0 $
+# $Id: es-ES.com_contact.menu.ini 1.5.0 2009-05-21 08:38:11 15:49:28 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_content.ini 11/administrator/language/es-ES/es-ES.com_content.ini
--- 10/administrator/language/es-ES/es-ES.com_content.ini	2009-03-28 20:19:38.000000000 +0100
+++ 11/administrator/language/es-ES/es-ES.com_content.ini	2009-05-21 08:44:54.000000000 +0200
@@ -1,12 +1,12 @@
-# $Id: es-ES.com_content.ini 1.5.0 2009-03-28 20:19:39 21:06:30 ~0 $
+# $Id: es-ES.com_content.ini 1.5.0 2009-05-21 08:41:26 21:06:30 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
 
 ACROSS=a través de
-ALIAS=Alias
+ALIAS=Alías
 ALTERNATIVE READ MORE TEXT=El texto alternativo del <em>Leer más:</em>
 AN ERROR HAS OCCURRED=¡Ha ocurrido un errror!
 APPENDIX=Apéndice
@@ -176,7 +176,7 @@
 TIPFILTERINGOPTIONS=Opciones de filtrado para dar más control sobre el código HTML de su proveedor de contenido a presentar. Puede ser tan estrictas como liberales o como usted requiere para satisfacer las necesidades de su sitio. El filtrado es opt-in y la configuración por defecto proporcionar una buena protección contra las marcas comúnmente asociado con los ataques sitio Web. Opciones de filtrado para dar más control sobre el código HTML que sus proveedores de contenidos a presentar. Puede ser tan estrictas como liberales o como usted requiere para satisfacer las necesidades de su sitio. El filtrado es opt-in y la configuración por defecto pagar una buena protección contra las marcas comúnmente asociado con los ataques sitio web.
 TIPSFILTERTAGS=Lista de etiquetas adicionales, separando cada nombre de etiqueta con un espacio o una coma.
 TIPSFILTERATTRIBUTES=Lista de atributos adicionales, separando cada nombre del atributo con un espacio o una coma.
-TIPSFILTERTYPE=La Lista negra permite que todas las etiquetas y los atributos, excepto para los que están en la lista negra.&lt;br /&gt;&lt;strong&gt;--&lt;/strong&gt;The default blacklist includes the following tags: 'applet', 'body', 'bgsound', 'base', 'basefont', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'&lt;br /&gt;&lt;strong&gt;--&lt;/strong&gt; The default blacklist includes the following attributes:\n'action', 'background', 'codebase', 'dynsrc', 'lowsrc'&lt;br /&gt;&lt;strong&gt;--&lt;/strong&gt;You can blacklist additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a space or comma.&lt;/p&gt;&lt;p&gt; Whitelist allows only the tags listed in the Filter Tags and Filter Attributes fields.&lt;/p&gt;&lt;p&gt;No HTML removes all HTML tags from the content when it is saved.&lt;/p&gt; &lt;p&gt;Please note that these settings work regardless of the editor that you are using. &lt;br /&gt;Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database.
+TIPSFILTERTYPE=La Lista negra permite que todas las etiquetas y los atributos, excepto para los que están en la lista negra.<br /><strong>--</strong>The default blacklist includes the following tags: 'applet', 'body', 'bgsound', 'base', 'basefont', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'<br /><strong>--</strong> The default blacklist includes the following attributes:\n'action', 'background', 'codebase', 'dynsrc', 'lowsrc'<br /><strong>--</strong>You can blacklist additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a space or comma.</p><p> Whitelist allows only the tags listed in the Filter Tags and Filter Attributes fields.</p><p>No HTML removes all HTML tags from the content when it is saved.</p> <p>Please note that these settings work regardless of the editor that you are using. <br />Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database.
 TIPSHOWFEEDITEM=Mostrar solo el texto de introducción o el texto completo del artículo.
 UNARCHIVE=Desarchivar
 UNCATEGORIZED=Sin clasificar
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_cpanel.ini 11/administrator/language/es-ES/es-ES.com_cpanel.ini
--- 10/administrator/language/es-ES/es-ES.com_cpanel.ini	2008-07-08 20:20:42.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_cpanel.ini	2009-05-21 08:46:36.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_cpanel.ini 1.5.0 2008-07-08 17:03:26 02:30:34 ~0 $
+# $Id: es-ES.com_cpanel.ini 1.5.0 2009-05-21 08:46:34 02:30:34 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_frontpage.ini 11/administrator/language/es-ES/es-ES.com_frontpage.ini
--- 10/administrator/language/es-ES/es-ES.com_frontpage.ini	2008-07-08 20:20:42.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_frontpage.ini	2009-05-21 08:47:50.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_frontpage.ini 1.5.0 2008-07-08 17:07:36 02:30:43 ~0 $
+# $Id: es-ES.com_frontpage.ini 1.5.0 2009-05-21 08:47:49 02:30:43 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_installer.ini 11/administrator/language/es-ES/es-ES.com_installer.ini
--- 10/administrator/language/es-ES/es-ES.com_installer.ini	2009-03-28 20:18:14.000000000 +0100
+++ 11/administrator/language/es-ES/es-ES.com_installer.ini	2009-05-21 08:53:26.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_installer.ini 1.5.0 2009-03-28 20:18:14 15:51:00 ~0 $
+# $Id: es-ES.com_installer.ini 1.5.0 2009-05-21 08:53:24 15:51:00 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -158,4 +158,6 @@
 THERE ARE NO CUSTOM TEMPLATES INSTALLED=No hay plantillas adicionales instaladas.
 THERE ARE NO CUSTOM LANGUAGES INSTALLED=No hay idiomas adicionales instalados.
 THERE ARE NO CUSTOM MODULES INSTALLED=No hay módulos adicionales instalados.
-THERE ARE NO CUSTOM PLUGINS INSTALLED=No hay plugins adicionales instalados.
\ No hay ningún carácter de nueva línea al final del fichero
+THERE ARE NO CUSTOM PLUGINS INSTALLED=No hay plugins adicionales instalados.
+INVALIDINSTALLFILE=Incorrecto %s archivo detectado, para mas información mirar <a href="http://docs.joomla.org/Incorrect_Install_File">incorrecta instalación de archivo </a> en la documentación wiki.
+BLANKSCRIPTELEMENT=%s script valor en blanco! Establezca este valor o eliminar la etiqueta.
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_languages.ini 11/administrator/language/es-ES/es-ES.com_languages.ini
--- 10/administrator/language/es-ES/es-ES.com_languages.ini	2008-07-08 20:20:42.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_languages.ini	2009-05-21 08:54:28.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_languages.ini 1.5.0 2008-07-08 17:52:34 02:30:52 ~0 $
+# $Id: es-ES.com_languages.ini 1.5.0 2009-05-21 08:54:26 02:30:52 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_login.ini 11/administrator/language/es-ES/es-ES.com_login.ini
--- 10/administrator/language/es-ES/es-ES.com_login.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_login.ini	2009-05-21 08:55:14.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_login.ini 1.5.0 2008-07-08 17:52:59 02:31:17 ~0 $
+# $Id: es-ES.com_login.ini 1.5.0 2009-05-21 08:55:12 02:31:17 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_massmail.ini 11/administrator/language/es-ES/es-ES.com_massmail.ini
--- 10/administrator/language/es-ES/es-ES.com_massmail.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_massmail.ini	2009-05-23 04:42:50.000000000 +0200
@@ -1,12 +1,12 @@
-# $Id: es-ES.com_massmail.ini 1.5.0 2008-07-08 17:54:07 20:30:05 ~0 $
+# $Id: es-ES.com_massmail.ini 1.5.0 2009-05-23 04:42:49 20:30:05 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
 
 ALL USER GROUPS=Todos los grupos de usuarios
-BODYSUFFIXTIP=Ésto, se añadira tras el texto del correo
+BODYSUFFIXTIP=Esto se añade tras el texto del correo
 DESCMASSMAIL=Este componente te permite enviar correo masivo a determinados grupos de usuarios
 E-MAIL SENT TO=E-mail enviado a %s usuarios
 GROUP=Grupo
@@ -14,13 +14,13 @@
 MAIL TO CHILD GROUPS=Correo a subgrupos
 MASS MAIL=Correo Masivo
 PLEASE FILL IN THE FORM CORRECTLY=Por favor, rellena el formulario correctamente
-PLEASE FILL IN THE SUBJECT=Por favor, introduzca el asunto
-PLEASE FILLIN THE MESSAGE=Por favor, introduzca el mensaje
+PLEASE FILL IN THE SUBJECT=Por favor, introducir el asunto
+PLEASE FILLIN THE MESSAGE=Por favor, introducir el mensaje
 PLEASE SELECT A GROUP=Por favor, seleccionar un grupo
 RECIPIENTS AS BCC=Receptores como BCC.<br /> Añade copia del sitio en el e-mail.
 SEND AS BLIND CARBON COPY=Oculta la lista de destinatarios.
 SEND IN HTML MODE=Enviar en modo HTML
 SEND MAIL=Enviar mail
 SUBJECT PREFIX=Prefijo del asunto
-SUBJECTPREFIXTIP=Ésto, se añadira delante del asunto
+SUBJECTPREFIXTIP=Esto se añade delante de cada asunto del correo
 USERS=Usuarios
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_media.ini 11/administrator/language/es-ES/es-ES.com_media.ini
--- 10/administrator/language/es-ES/es-ES.com_media.ini	2008-07-28 16:18:14.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_media.ini	2009-05-23 04:45:14.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_media.ini 1.5.0 2008-07-08 17:55:49 15:24:34 ~0 $
+# $Id: es-ES.com_media.ini 1.5.0 2009-05-23 04:45:12 15:24:34 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -10,8 +10,8 @@
 *CLICK FOR URL*=*Haz click para ver la URL*
 *CLICK TO ENLARGE*=*Haz click para verla al completo*
 *CLICK TO OPEN*=*Haz click para abrir*
-ADD MORE FILES=Agregar más archivos
-ADD FILE=Agregar archivo
+ADD MORE FILES=Añadir más archivos
+ADD FILE=Añadir un archivo
 ALIGN=Alinear
 BROWSE=Navegador
 BROWSE FILES=Navegador de archivos
@@ -65,12 +65,12 @@
 MAXIMUM SIZE DESC=El tamaño máximo para una subida (en bytes). Usa cero para que sea ilimitado. Ten cuidado de que tu servidor tenga el límite al máximo, porque finalmente es ese límite el que rige en el máximo permitido y solo podemos restringirlo a una cantidad menor.
 MEDIA MANAGER=Gestor Multimedia
 NAME=Nombre del Item
-NO IMAGES FOUND=No encuentro Imágenes
+NO IMAGES FOUND=No encuentro imágenes
 NOT SET=Sin asignar
 NUMFILES=Archivos:
 NUMFOLDERS=Carpetas:
 PLEASE DELETE ALL FILES/FOLDER IN=Por favor, borra todos los archivos/carpetas del interior
-PX=Px
+PX=px
 REMOVE FROM QUEUE=Eliminar de la cola
 SELECT FILE=Selecionar Archivo
 SIZE=Tamaño
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_menus.ini 11/administrator/language/es-ES/es-ES.com_menus.ini
--- 10/administrator/language/es-ES/es-ES.com_menus.ini	2009-03-28 20:22:46.000000000 +0100
+++ 11/administrator/language/es-ES/es-ES.com_menus.ini	2009-05-23 04:49:14.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_menus.ini 1.5.0 2009-03-28 20:22:46 21:04:13 ~0 $
+# $Id: es-ES.com_menus.ini 1.5.0 2009-05-23 04:49:12 21:04:13 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -8,7 +8,7 @@
 A DESCRIPTION FOR THE MENU=Una descripción para el menú
 A PROPER TITLE FOR THE MENU=Un título apropiado para el menú
 ADVANCED PARAMETERS=Parámetros avanzados
-ALIAS=Alias
+ALIAS=Alías
 ALIGNMENT OF THE IMAGE=Alineación de la imagen
 ALL CATEGORIES=Todas las categorías
 ALL SECTIONS=Todas las secciones
@@ -176,7 +176,7 @@
 OTHER CATEGORIES=Otras categorias
 PAGINATION=Paginación
 PAGINATION RESULTS=Resultados de paginación
-PARAMADD=Por defecto http:// será agregado si no se detecta un  http:// o https:// en la URL que facilitas. Ésto, permite desconectar esta habilidad
+PARAMADD=Por defecto http:// será añadido si no se detecta un  http:// o https:// en la URL que se proporciona. Ésto, permite desconectar esta habilidad
 PARAMETERS - ADVANCED=Parámetros avanzados
 PARAMARTICLES=Mostrar/Ocultar el número de artículos en las noticias(Feeds)
 PARAMAUTHOR=Mostrar/Ocultar el nombre del autor del artículo - Solo afecta a esta página
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_menus.menu.ini 11/administrator/language/es-ES/es-ES.com_menus.menu.ini
--- 10/administrator/language/es-ES/es-ES.com_menus.menu.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_menus.menu.ini	2009-05-23 04:45:52.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_menus.menu.ini 1.5.0 2008-07-08 18:01:31 14:19:09 ~0 $
+# $Id: es-ES.com_menus.menu.ini 1.5.0 2009-05-23 04:45:49 14:19:09 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_messages.ini 11/administrator/language/es-ES/es-ES.com_messages.ini
--- 10/administrator/language/es-ES/es-ES.com_messages.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_messages.ini	2009-05-23 04:51:48.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_messages.ini 1.5.0 2008-07-08 18:02:24 20:34:38 ~0 $
+# $Id: es-ES.com_messages.ini 1.5.0 2009-05-23 04:51:46 20:34:38 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -8,7 +8,7 @@
 A NEW PRIVATE MESSAGE HAS ARRIVED=Ha llegado un nuevo mensaje
 ARE YOU SURE?=¿Estás seguro?
 AUTO PURGE MESSAGES=Auto purgar mensajes
-DAYS OLD=Antigüedad
+DAYS OLD=días pasados
 FROM=De
 GENERAL=General
 LOCK INBOX=Bloquear bandeja de entrada
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_modules.ini 11/administrator/language/es-ES/es-ES.com_modules.ini
--- 10/administrator/language/es-ES/es-ES.com_modules.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_modules.ini	2009-05-23 05:00:16.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_modules.ini 1.5.0 2008-07-08 18:04:35 15:58:45 ~0 $
+# $Id: es-ES.com_modules.ini 1.5.0 2009-05-23 04:57:27 15:58:45 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -43,7 +43,7 @@
 NEW MODULE=Nuevo módulo
 NEW=Nuevo
 NO CACHING=No usar la caché
-NUM=núm.
+NUM=#
 ONLINE USERS=Usuarios en línea
 PAGES=Páginas
 PARAMMODULECLASSSUFFIX=Un sufijo a ser aplicado desde la clase del CSS del módulo. Ésto permite el estilo individual de módulos
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_newsfeeds.ini 11/administrator/language/es-ES/es-ES.com_newsfeeds.ini
--- 10/administrator/language/es-ES/es-ES.com_newsfeeds.ini	2009-01-11 02:32:04.000000000 +0100
+++ 11/administrator/language/es-ES/es-ES.com_newsfeeds.ini	2009-05-23 05:03:02.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_newsfeeds.ini 1.5.0 2009-01-11 02:32:05 20:32:58 ~0 $
+# $Id: es-ES.com_newsfeeds.ini 1.5.0 2009-05-23 05:03:01 20:32:58 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -17,7 +17,7 @@
 CATEGORY LIST - CATEGORY=Lista de categorías - Categoría
 CATEGORY LIST - SECTION=Lista de categorías - Sección
 CHANGES TO NEWSFEED SAVED=Cambios guardados en el servidor de noticias
-DESCNEWITEMSLAST=Las nuevas Noticias Feeds por defecto en el último lugar. El orden se pueden cambiar después de que esta Noticia Feed se guarde.
+DESCNEWITEMSLAST=Las nuevas Noticias Feeds por defecto se pondrán en el último lugar. El orden se pueden cambiar después de que esta Noticia Feed se guarde.
 DESCRIPTION FOR PAGE=Descripción para la página
 DESCRIPTION TEXT=Texto descriptivo
 EDIT NEWSFEED=Editar los parámetros de este servidor de noticias
@@ -70,7 +70,7 @@
 SHOW LIMIT BOX=Mostrar el marco delimitador
 SHOW/HIDE THE LIMIT BOX=Mostrar/Ocultar el marco limitador
 SHOW/HIDE THE TABLE HEADINGS=Mostrar/Ocultar Los encabezados de la tabla
-SITE LANGUAGE DIRECTION=Dirección del idioma del sitio
+SITE LANGUAGE DIRECTION=Dirección del idioma en el sitio
 TABLE HEADINGS=Encabezados de la tabla
 THIS COMPONENT MANAGES RSS/RDF NEWSFEEDS=Este componente maneja las subscripciones al servidor de noticias RSS/RDF
 TIPCACHETIME=El numero de minutos que deben pasar antes de que se recargue la caché del servidor de noticias.
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_newsfeeds.menu.ini 11/administrator/language/es-ES/es-ES.com_newsfeeds.menu.ini
--- 10/administrator/language/es-ES/es-ES.com_newsfeeds.menu.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_newsfeeds.menu.ini	2009-05-23 05:03:36.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_newsfeeds.menu.ini 1.5.0 2008-07-08 18:10:14 02:32:18 ~0 $
+# $Id: es-ES.com_newsfeeds.menu.ini 1.5.0 2009-05-23 05:03:35 02:32:18 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_plugins.ini 11/administrator/language/es-ES/es-ES.com_plugins.ini
--- 10/administrator/language/es-ES/es-ES.com_plugins.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_plugins.ini	2009-05-23 05:04:10.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_plugins.ini 1.5.0 2008-07-08 18:10:42 20:50:03 ~0 $
+# $Id: es-ES.com_plugins.ini 1.5.0 2009-05-23 05:04:08 20:50:03 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_poll.ini 11/administrator/language/es-ES/es-ES.com_poll.ini
--- 10/administrator/language/es-ES/es-ES.com_poll.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_poll.ini	2009-05-23 05:06:00.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_poll.ini 1.5.0 2008-07-08 18:12:10 02:32:54 ~0 $
+# $Id: es-ES.com_poll.ini 1.5.0 2009-05-23 05:05:59 02:32:54 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -17,7 +17,7 @@
 #If the variable does not work in your language use following line
 # PLEASE MAKE A SELECTION FROM THE LIST TO=Please select a Poll from the list
 #instead of
-PLEASE MAKE A SELECTION FROM THE LIST TO=Por favor, selecciona una encuesta de la lista a
+PLEASE MAKE A SELECTION FROM THE LIST TO=Por favor, selecciona una encuesta de la lista a %s
 PLEASE SELECT A POLL=Por favor seleccionar una encuesta
 POLL=Encuesta
 POLL LAYOUT=Presentación de la encuesta
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_poll.menu.ini 11/administrator/language/es-ES/es-ES.com_poll.menu.ini
--- 10/administrator/language/es-ES/es-ES.com_poll.menu.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_poll.menu.ini	2009-05-23 05:06:44.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_poll.menu.ini 1.5.0 2008-07-08 18:12:28 02:33:02 ~0 $
+# $Id: es-ES.com_poll.menu.ini 1.5.0 2009-05-23 05:06:42 02:33:02 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_search.ini 11/administrator/language/es-ES/es-ES.com_search.ini
--- 10/administrator/language/es-ES/es-ES.com_search.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_search.ini	2009-05-23 05:07:54.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_search.ini 1.5.0 2008-07-08 18:12:58 02:35:47 ~0 $
+# $Id: es-ES.com_search.ini 1.5.0 2009-05-23 05:07:52 02:35:47 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -15,6 +15,6 @@
 SHOW CREATED DATE=Mostrar fecha de creación
 SHOW SEARCH RESULTS=Mostrar los resultados de la búsqueda
 STANDARD SEARCH FORM=Formulario de búsqueda estandar
-STANDARD SEARCH LAYOUT DESC=La presentación en pantalla de búsquedas estandar, muestra el formulario de búsqueda y los resusltados.
+STANDARD SEARCH LAYOUT DESC=La presentación en pantalla de búsquedas estándar, muestra el formulario de búsqueda y los resultados.
 TIMES REQUESTED=Cantidad de veces solicitado
 TIPSEARCHSTATISTICS=Habilitar/Deshabilitar el registro de estadísticas del sitio
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_search.menu.ini 11/administrator/language/es-ES/es-ES.com_search.menu.ini
--- 10/administrator/language/es-ES/es-ES.com_search.menu.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_search.menu.ini	2009-05-23 05:08:16.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_search.menu.ini 1.5.0 2008-07-08 18:13:29 02:43:42 ~0 $
+# $Id: es-ES.com_search.menu.ini 1.5.0 2009-05-23 05:08:14 02:43:42 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_sections.ini 11/administrator/language/es-ES/es-ES.com_sections.ini
--- 10/administrator/language/es-ES/es-ES.com_sections.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_sections.ini	2009-05-23 05:16:04.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_sections.ini 1.5.0 2008-07-08 18:14:35 02:43:52 ~0 $
+# $Id: es-ES.com_sections.ini 1.5.0 2009-05-23 05:16:02 02:43:52 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -15,7 +15,7 @@
 DESCALLITEMSWITHINCAT=y todos los artículos sin clasificar (También listados)
 DESCCANNOTBEREMOVED=Seccione(s): %s No puede borrarse si contiene categorías
 DESCNEWITEMSLAST=Las nuevas secciones por defecto en el último lugar. El orden se puede cambiar después de que esta sección se guarde.
-DESCNEWMENUITEM=Ésto creará un nuevo ítem en el menú seleccionado
+DESCNEWMENUITEM=Esto creará un nuevo ítem en el menú seleccionado
 GO TO MENU=Ir al menú
 GO TO MENU ITEM=Ir al ítem del menú
 IMAGE POSITION=Posición de la imagen
@@ -26,7 +26,7 @@
 #If the variable does not work in your language use following line
 # PLEASE MAKE A SELECTION FROM THE LIST TO=Please select a Section from the list
 #instead of
-PLEASE MAKE A SELECTION FROM THE LIST TO=Por favor, selecciona la sección del listado a la que aplicar una acción:
+PLEASE MAKE A SELECTION FROM THE LIST TO=Por favor seleccione una sección de la lista para %s
 PLEASE SELECT A MENU TYPE=Por favor, selecciona el tipo de menú
 PUBLISH ITEM=Publicar esta sección
 SCOPE=Ámbito
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_statistics.ini 11/administrator/language/es-ES/es-ES.com_statistics.ini
--- 10/administrator/language/es-ES/es-ES.com_statistics.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_statistics.ini	1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-# $Id: es-ES.com_statistics.ini 1.5.0 2008-07-08 18:16:01 02:44:20 ~0 $
-# author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
-# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
-
-# Note : All ini files need to be saved as UTF-8
-
-BROWSERS=Navegadores
-BROWSER, OS, DOMAIN STATISTICS=Estadísticas de Navegador, Sistema Operativo, Dominio
-DISABLED=Deshabilitado
-DOMAIN=Dominio
-DOMAIN STATS=Estado del dominio
-HIDE SEARCH RESULTS=Ocultar los resultados de búsqueda
-LOGGING IS=Resultados de la búsqueda
-OPERATING SYSTEM=Sistema Operativo
-OS STATS=Estado del Sistema Operativo
-ARTICLE IMPRESSION STATISTICS=Estadísticas de la impresiones(veces visto) de un artículo
-ARTICLE IMPRESSIONS=Impresiones de un artículo
-RESULTS RETURNED=Resultados devueltos
-SEARCH ENGINE TEXT=Texto del motor de búsqueda
-SEARCH TEXT=Buscar texto
-SORT ASCENDING=Orden Asecendente
-SORT DESCENDING=Orden Descendente
-TIMES REQUESTED=Veces solicitado
-RESET STATISTICS FAILED=Restablecimiento fallido de las estadísticas
-RESET STATISTICS SUCCES=Estadísticas restablecidas con éxito
-SHOW SEARCH RESULTS=Mostrar resultados de la busqueda
-UNCATEGORIZED=Sin Clasificar
-WARN_RESULTS=Activar esto puede resultar dramáticamente lento, tu sitio realizará gran cantidad de intensivas operaciones de consulta
-BROWSER, OS, DOMAIN=Navegadorr, Sistema Operativo, Dominio
-SEARCH LOGGING=Buscar accesos
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 10/administrator/language/es-ES/es-ES.com_templates.ini 11/administrator/language/es-ES/es-ES.com_templates.ini
--- 10/administrator/language/es-ES/es-ES.com_templates.ini	2008-07-08 20:20:44.000000000 +0200
+++ 11/administrator/language/es-ES/es-ES.com_templates.ini	2009-05-23 05:18:54.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.com_templates.ini 1.5.0 2008-07-08 18:17:12 16:07:35 ~0 $
+# $Id: es-ES.com_templates.ini 1.5.0 2009-05-23 05:18:52 16:07:35 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
diff -aruN --binary 10/administrator/language/es-ES/es-ES.ini 11/administrator/language/es-ES/es-ES.ini
--- 10/administrator/language/es-ES/es-ES.ini	2009-03-28 20:09:26.000000000 +0100
+++ 11/administrator/language/es-ES/es-ES.ini	2009-05-21 08:07:32.000000000 +0200
@@ -1,6 +1,6 @@
-# $Id: es-ES.ini 1.5.0 2009-03-28 20:09:26 16:28:06 ~0 $
+# $Id: es-ES.ini 1.5.0 2009-05-21 08:07:31 16:28:06 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
@@ -66,11 +66,11 @@
 DISPLAY %S FIRST=Mostrar %s primero
 DRAG TO MOVE=Arrástralo para moverlo
 GO TODAY=Ir a hoy
-NEXT MONTH (HOLD FOR MENU)=Haz clic para ir al próximo mes. Haz clic y mantenlo presionado para listar los meses
-NEXT YEAR (HOLD FOR MENU)=Haz clic para ir al próximo año. Haz clic y mantenlo presionado para listar los años.
-PREV. MONTH (HOLD FOR MENU)=Haz clic para ir al mes anterior. Haz clic y mantenlo presionado para listar los meses.
-PREV. YEAR (HOLD FOR MENU)=Haz clic para ir al año anterior. Haz clic y mantenlo presionado para listar los años.
-SELECT DATE=Selecciona una fecha.
+NEXT MONTH (HOLD FOR MENU)=Haz clic para ir al próximo mes. Haz clic y mantén presionado para listar los meses
+NEXT YEAR (HOLD FOR MENU)=Haz clic para ir al próximo año. Haz clic y mantén presionado para listar los años.
+PREV. MONTH (HOLD FOR MENU)=Haz clic para ir al mes anterior. Haz clic y mantén presionado para listar los meses.
+PREV. YEAR (HOLD FOR MENU)=Haz clic para ir al año anterior. Haz clic y mantén presionado para listar los años.
+SELECT DATE=Seleccionar una fecha.
 TIME=Fecha
 TIME:=Fecha:
 CLOSE=Cerrar
@@ -145,8 +145,8 @@
 ADMINISTRATOR FILES=Administrador de archivos
 ADVANCED PARAMETERS=Parámetros avanzados
 ALERTNOTAUTH=No estás autorizado para poder ver este recurso.
-ALIAS=Alias
-ALIASTIP=Leave this blank and Joomla! will fill in a default value, which is the title in lower case and with dashes instead of spaces. You may enter the Alias manually. Use lowercase letters and hypens (-). No spaces or underscores are allowed. The Alias will be used in the SEF URL. Default value will be a date and time if the title is typed in non-latin letters.
+ALIAS=Alías
+ALIASTIP=Déjelo en blanco y Joomla! rellenará un valor predeterminado, que es el título en minúsculas y con guiones en lugar de espacios. Puede introducir manualmente los alias. Utilice letras minúsculas y hypens (-). Espacios no se permite o se destaca. El alias se utilizará en el SEF URL. El valor por defecto será una fecha y hora, si el título no está escrito en letras latínas .
 ALIGN=Alineación
 ALL=Todos
 ALPHABETICAL INDEX=Índice alfabético
@@ -204,7 +204,7 @@
 CONTENT IMAGES=Contenido de imágenes
 CONTINUE=Continuar
 COPY=Copiar
-COPYRIGHT=Copyright
+COPYRIGHT=Derechos de Autor
 COULD NOT CREATE DIRECTORY=No se ha podido crear el directorio
 COULD NOT DELETE FOLDER=No se ha podido borrar el directorio
 COULD NOT MAKE CONFIGURATION.PHP UNWRITABLE=No puedo cambiar el archivo configuration.php a no escribible.
@@ -384,8 +384,8 @@
 NOT FOUND IN FILE=No encontrado en el archivo
 NOT MODIFIED=No Modificado
 NOT PUBLISHED=No Publicado
-NOTICE=Notice
-NUM=núm.
+NOTICE=Noticia
+NUM=#
 NUM ACTIVE=# Activo
 NUM CATEGORIES=# Categorías
 NUM ITEMS=# Ítems
diff -aruN --binary 10/administrator/language/es-ES/es-ES.xml 11/administrator/language/es-ES/es-ES.xml
--- 10/administrator/language/es-ES/es-ES.xml	2009-03-28 20:14:06.000000000 +0100
+++ 11/administrator/language/es-ES/es-ES.xml	2009-05-21 16:10:22.000000000 +0200
@@ -3,8 +3,8 @@
 	<tag>es-ES</tag>
 	<name>Español (spanish formal Internacional)</name>
 	<description>Idioma para usar en la parte administrativa de Joomla! 1.5. Creado por Joomla! Spanish - Traductor oficial asociado</description>
-	<version>1.5.10</version>
-	<creationDate>2009-03-28</creationDate>
+	<version>1.5.11</version>
+	<creationDate>2009-05-21</creationDate>
 	<author>Joomla! Spanish</author>
 	<authorUrl>www.joomlaspanish.org</authorUrl>
 	<authorEmail>extensiones@joomlaspanish.org</authorEmail>
@@ -14,7 +14,7 @@
 		<name>Español (spanish formal Internacional)</name>
 		<tag>es-ES</tag>
 		<rtl>0</rtl>
-		<locale>es_ES.UTF-8, es_ES, spanish, spanish.UTF-8, spa_ES.UTF-8, spa_ES, sp_ES, es</locale>
+		<locale>es_ES.utf8, es_ES.UTF-8, es_ES, spanish, spanish.UTF-8, spa_ES.UTF-8, spa_ES, sp_ES, es</locale>
 		<winCodePage>iso-8859-1</winCodePage>
 		<backwardLang>spanish</backwardLang>
 		<pdfFontName>vera</pdfFontName>
diff -aruN --binary 10/administrator/templates/khepri/css/icon.css 11/administrator/templates/khepri/css/icon.css
--- 10/administrator/templates/khepri/css/icon.css	2008-07-06 23:38:50.000000000 +0200
+++ 11/administrator/templates/khepri/css/icon.css	2009-06-02 23:51:34.000000000 +0200
@@ -80,7 +80,8 @@
 .icon-48-massemail 	{ background-image: url(../images/header/icon-48-massemail.png); }
 .icon-48-frontpage 	{ background-image: url(../images/header/icon-48-frontpage.png); }
 .icon-48-sections 	{ background-image: url(../images/header/icon-48-section.png); }
-.icon-48-addedit 		{ background-image: url(../images/header/icon-48-article.png); }
+.icon-48-addedit 		{ background-image: url(../images/header/icon-48-article-add.png); }
+.icon-48-article 		{ background-image: url(../images/header/icon-48-article.png); }
 .icon-48-categories 	{ background-image: url(../images/header/icon-48-category.png); }
 .icon-48-install 		{ background-image: url(../images/header/icon-48-extension.png); }
 .icon-48-dbbackup		{ background-image: url(../images/header/icon-48-backup.png); }
diff -aruN --binary 10/CHANGELOG.php 11/CHANGELOG.php
--- 10/CHANGELOG.php	2009-03-28 01:43:38.000000000 +0100
+++ 11/CHANGELOG.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: CHANGELOG.php 11722 2009-03-27 21:56:05Z willebil $
+* @version		$Id: CHANGELOG.php 11987 2009-06-03 01:08:57Z ian $
 * @package		Joomla
 * @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
@@ -37,6 +37,57 @@
 - -> Removed
 ! -> Note
 
+-------------------- 1.5.11 Stable Release [03-June-2009] ------------------
+
+01-Jun-2009 Ian MacLennan
+ # [#16236] Legacy code in installer premigration system causes unrelated errors
+
+30-May-2009 Ian MacLennan
+ ^ [#16397] helpsites.xml update
+ # [#16500] offline.php with wrong stylesheet
+ ^ Updated de-DE installer language pack
+ + Added gl-ES installer language pack
+ ^ Updated it-IT installer language pack
+ ^ Updated mn-MN installer language pack
+ ^ Updated nl-NL installer language pack
+ ^ Updated sk-SK installer language pack
+ ^ Updated tr-TR installer language pack
+
+30-May-2009 Sam Moffatt
+ ^ Updated CREDITS.php with minor fixes from Ole Ottosen
+
+29-May-2009 Ian MacLennan
+ # [#15736] Moving $this->escape validation to files which can't be overridden
+
+13-May-2009 Ian MacLennan
+ # [#13898] There is no translated description for component/module/plugin/etc. after installation
+ # [#15417] db->updateObject function outdated
+ # [#15727] Module cache, id, Itemid
+ # [#16314] PHPDoc Comment for JFactory getDocument method Incorrect
+ # [#16349] Revert 16122 and Replace sr-ME language files
+
+09-May-2009 Kevin Devine
+ # [#15909] RSS 2.0 feeds try to turn mailto: links into absolute urls
+ # [#16211] Atom Link in RSS feed causes validation problems
+ # [#16007] JFile::getName() loses first character
+
+05-May-2009 Ian MacLennan
+ # [#15541] Article Catagory Layout incorrectly sorted
+ # [#15699] Global Configuration Undefined Variable warning
+ # [#15740] At login use of task=register instead of view=register
+ # [#15853] Search results pagination broken when two or more search terms, SEF enabled
+ # [#15912] Error in KEPRI Template, css for icon 'article'
+ # [#15963] The align attribute in mod_mainmenu helper causes problems with some templates
+
+24-Apr-2009 Kevin Devine
+ # [#15446] Atom feed does not validate for Contact Category and Weblinks Category Layouts
+ # [#13890] < Prev and Next > links do not follow SEF rules (duplicate content)
+ # [#15691] Need better control of who can upload files
+ # [#16112] Change in Montengrin Language ISO Code
+ # [#15551] Inconsistent prefix for index.php in com_user #2
+ # [#15913] Change in installation version display (patch included)
+ # [#15701] Joomla 1.5.10 breaks package installation due to new installer PHP code
+
 -------------------- 1.5.10 Stable Release [27-March-2009] ------------------
 
 27-Mar-2009 Anthony Ferrara
diff -aruN --binary 10/components/com_contact/views/category/tmpl/default_items.php 11/components/com_contact/views/category/tmpl/default_items.php
--- 10/components/com_contact/views/category/tmpl/default_items.php	2008-07-06 23:39:08.000000000 +0200
+++ 11/components/com_contact/views/category/tmpl/default_items.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,5 +1,5 @@
 <?php
-/** $Id: default_items.php 10381 2008-06-01 03:35:53Z pasamio $ */
+/** $Id: default_items.php 11917 2009-05-29 19:37:05Z ian $ */
 defined( '_JEXEC' ) or die( 'Restricted access' );
 ?>
 <?php foreach($this->items as $item) : ?>
@@ -8,12 +8,12 @@
 		<?php echo $item->count +1; ?>
 	</td>
 	<td height="20">
-		<a href="<?php echo $item->link; ?>" class="category<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+		<a href="<?php echo $item->link; ?>" class="category<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php echo $item->name; ?></a>
 	</td>
 	<?php if ( $this->params->get( 'show_position' ) ) : ?>
 	<td>
-		<?php echo $item->con_position; ?>
+		<?php echo $this->escape($item->con_position); ?>
 	</td>
 	<?php endif; ?>
 	<?php if ( $this->params->get( 'show_email' ) ) : ?>
@@ -23,17 +23,17 @@
 	<?php endif; ?>
 	<?php if ( $this->params->get( 'show_telephone' ) ) : ?>
 	<td width="15%">
-		<?php echo $item->telephone; ?>
+		<?php echo $this->escape($item->telephone); ?>
 	</td>
 	<?php endif; ?>
 	<?php if ( $this->params->get( 'show_mobile' ) ) : ?>
 	<td width="15%">
-		<?php echo $item->mobile; ?>
+		<?php echo $this->escape($item->mobile); ?>
 	</td>
 	<?php endif; ?>
 	<?php if ( $this->params->get( 'show_fax' ) ) : ?>
 	<td width="15%">
-		<?php echo $item->fax; ?>
+		<?php echo $this->escape($item->fax); ?>
 	</td>
 	<?php endif; ?>
 </tr>
diff -aruN --binary 10/components/com_contact/views/category/tmpl/default.php 11/components/com_contact/views/category/tmpl/default.php
--- 10/components/com_contact/views/category/tmpl/default.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_contact/views/category/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Id: default.php 10967 2008-09-26 00:01:51Z ian $
+ * $Id: default.php 11917 2009-05-29 19:37:05Z ian $
  */
 defined( '_JEXEC' ) or die( 'Restricted access' );
 
@@ -8,13 +8,13 @@
 ?>
 
 <?php if ( $this->params->get( 'show_page_title', 1 ) ) : ?>
-<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <?php echo $this->escape($this->params->get('page_title')); ?>
 </div>
 <?php endif; ?>
-<div class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<div class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <?php if ($this->category->image || $this->category->description) : ?>
-	<div class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php if ($this->params->get('image') != -1 && $this->params->get('image') != '') : ?>
 		<img src="<?php echo $this->baseurl .'/'. 'images/stories' . '/'. $this->params->get('image'); ?>" align="<?php echo $this->params->get('image_align'); ?>" hspace="6" alt="<?php echo JText::_( 'Contacts' ); ?>" />
 	<?php elseif ($this->category->image) : ?>
@@ -46,7 +46,7 @@
 	</thead>
 	<tfoot>
 		<tr>
-			<td align="center" colspan="6" class="sectiontablefooter<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+			<td align="center" colspan="6" class="sectiontablefooter<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 				<?php echo $this->pagination->getPagesLinks(); ?>
 			</td>
 		</tr>
@@ -59,34 +59,34 @@
 	<tbody>
 	<?php if ($this->params->get( 'show_headings' )) : ?>
 		<tr>
-			<td width="5" align="right" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+			<td width="5" align="right" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 				<?php echo JText::_('Num'); ?>
 			</td>
-			<td height="20" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+			<td height="20" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 				<?php echo JHTML::_('grid.sort',  'Name', 'cd.name', $this->lists['order_Dir'], $this->lists['order'] ); ?>
 			</td>
 			<?php if ( $this->params->get( 'show_position' ) ) : ?>
-			<td height="20" class="sectiontableheader<?php echo  $this->params->get( 'pageclass_sfx' ); ?>">
+			<td height="20" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 				<?php echo JHTML::_('grid.sort',  'Position', 'cd.con_position', $this->lists['order_Dir'], $this->lists['order'] ); ?>
 			</td>
 			<?php endif; ?>
 			<?php if ( $this->params->get( 'show_email' ) ) : ?>
-			<td height="20" width="20%" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+			<td height="20" width="20%" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 				<?php echo JText::_( 'Email' ); ?>
 			</td>
 			<?php endif; ?>
 			<?php if ( $this->params->get( 'show_telephone' ) ) : ?>
-			<td height="20" width="15%" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+			<td height="20" width="15%" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 				<?php echo JText::_( 'Phone' ); ?>
 			</td>
 			<?php endif; ?>
 			<?php if ( $this->params->get( 'show_mobile' ) ) : ?>
-			<td height="20" width="15%" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+			<td height="20" width="15%" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 				<?php echo JText::_( 'Mobile' ); ?>
 			</td>
 			<?php endif; ?>
 			<?php if ( $this->params->get( 'show_fax' ) ) : ?>
-				<td height="20" width="15%" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+				<td height="20" width="15%" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 					<?php echo JText::_( 'Fax' ); ?>
 				</td>
 			<?php endif; ?>
diff -aruN --binary 10/components/com_contact/views/category/view.feed.php 11/components/com_contact/views/category/view.feed.php
--- 10/components/com_contact/views/category/view.feed.php	2008-07-06 23:39:08.000000000 +0200
+++ 11/components/com_contact/views/category/view.feed.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: view.feed.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: view.feed.php 11782 2009-04-24 17:25:58Z kdevine $
  * @package		Joomla
  * @subpackage	Contact
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -30,7 +30,12 @@
 		$db			=& JFactory::getDBO();
 		$document	=& JFactory::getDocument();
 		$document->link = JRoute::_('index.php?option=com_contact&view=category&catid='.JRequest::getVar('catid',null, '', 'int'));
-
+		
+		$siteEmail = $mainframe->getCfg('mailfrom');
+		$fromName = $mainframe->getCfg('fromname');
+		$document->editor = $fromName;
+		$document->editorEmail = $siteEmail;
+				
 		$limit 		= JRequest::getVar('limit', $mainframe->getCfg('feed_limit'), '', 'int');
 		$limitstart = JRequest::getVar('limitstart', 0, '', 'int');
 		$catid  	= JRequest::getVar('catid', 0, '', 'int');
@@ -81,4 +86,4 @@
 			$document->addItem( $item );
 		}
 	}
-}
\ No hay ningún carácter de nueva línea al final del fichero
+}
diff -aruN --binary 10/components/com_contact/views/contact/tmpl/default_address.php 11/components/com_contact/views/contact/tmpl/default_address.php
--- 10/components/com_contact/views/contact/tmpl/default_address.php	2009-01-10 03:58:06.000000000 +0100
+++ 11/components/com_contact/views/contact/tmpl/default_address.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,5 +1,5 @@
 <?php
-/** $Id: default_address.php 11328 2008-12-12 19:22:41Z kdevine $ */
+/** $Id: default_address.php 11917 2009-05-29 19:37:05Z ian $ */
 defined( '_JEXEC' ) or die( 'Restricted access' );
 ?>
 <?php if ( ( $this->contact->params->get( 'address_check' ) > 0 ) &&  ( $this->contact->address || $this->contact->suburb  || $this->contact->state || $this->contact->country || $this->contact->postcode ) ) : ?>
@@ -14,35 +14,35 @@
 <?php if ( $this->contact->address && $this->contact->params->get( 'show_street_address' ) ) : ?>
 <tr>
 	<td valign="top">
-		<?php echo nl2br($this->contact->address); ?>
+		<?php echo nl2br($this->escape($this->contact->address)); ?>
 	</td>
 </tr>
 <?php endif; ?>
 <?php if ( $this->contact->suburb && $this->contact->params->get( 'show_suburb' ) ) : ?>
 <tr>
 	<td valign="top">
-		<?php echo $this->contact->suburb; ?>
+		<?php echo $this->escape($this->contact->suburb); ?>
 	</td>
 </tr>
 <?php endif; ?>
 <?php if ( $this->contact->state && $this->contact->params->get( 'show_state' ) ) : ?>
 <tr>
 	<td valign="top">
-		<?php echo $this->contact->state; ?>
+		<?php echo $this->escape($this->contact->state); ?>
 	</td>
 </tr>
 <?php endif; ?>
 <?php if ( $this->contact->postcode && $this->contact->params->get( 'show_postcode' ) ) : ?>
 <tr>
 	<td valign="top">
-		<?php echo $this->contact->postcode; ?>
+		<?php echo $this->escape($this->contact->postcode); ?>
 	</td>
 </tr>
 <?php endif; ?>
 <?php if ( $this->contact->country && $this->contact->params->get( 'show_country' ) ) : ?>
 <tr>
 	<td valign="top">
-		<?php echo $this->contact->country; ?>
+		<?php echo $this->escape($this->contact->country); ?>
 	</td>
 </tr>
 <?php endif; ?>
@@ -71,7 +71,7 @@
 		<?php echo $this->contact->params->get( 'marker_telephone' ); ?>
 	</td>
 	<td>
-		<?php echo nl2br($this->contact->telephone); ?>
+		<?php echo nl2br($this->escape($this->contact->telephone)); ?>
 	</td>
 </tr>
 <?php endif; ?>
@@ -81,7 +81,7 @@
 		<?php echo $this->contact->params->get( 'marker_fax' ); ?>
 	</td>
 	<td>
-		<?php echo nl2br($this->contact->fax); ?>
+		<?php echo nl2br($this->escape($this->contact->fax)); ?>
 	</td>
 </tr>
 <?php endif; ?>
@@ -91,7 +91,7 @@
 	<?php echo $this->contact->params->get( 'marker_mobile' ); ?>
 	</td>
 	<td>
-		<?php echo nl2br($this->contact->mobile); ?>
+		<?php echo nl2br($this->escape($this->contact->mobile)); ?>
 	</td>
 </tr>
 <?php endif; ?>
@@ -100,8 +100,8 @@
 	<td width="<?php echo $this->contact->params->get( 'column_width' ); ?>" >
 	</td>
 	<td>
-		<a href="<?php echo $this->contact->webpage; ?>" target="_blank">
-			<?php echo $this->contact->webpage; ?></a>
+		<a href="<?php echo $this->escape($this->contact->webpage); ?>" target="_blank">
+			<?php echo $this->escape($this->contact->webpage); ?></a>
 	</td>
 </tr>
 <?php endif; ?>
@@ -115,7 +115,7 @@
 		<?php echo $this->contact->params->get( 'marker_misc' ); ?>
 	</td>
 	<td>
-		<?php echo $this->contact->misc; ?>
+		<?php echo $this->escape($this->contact->misc); ?>
 	</td>
 </tr>
 </table>
diff -aruN --binary 10/components/com_contact/views/contact/tmpl/default_form.php 11/components/com_contact/views/contact/tmpl/default_form.php
--- 10/components/com_contact/views/contact/tmpl/default_form.php	2009-01-10 03:58:06.000000000 +0100
+++ 11/components/com_contact/views/contact/tmpl/default_form.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,5 +1,5 @@
 <?php
-/** $Id: default_form.php 11328 2008-12-12 19:22:41Z kdevine $ */
+/** $Id: default_form.php 11917 2009-05-29 19:37:05Z ian $ */
 defined( '_JEXEC' ) or die( 'Restricted access' );
 
 	$script = '<!--
@@ -30,7 +30,7 @@
 	<td colspan="2">
 	<br /><br />
 	<form action="<?php echo JRoute::_( 'index.php' );?>" method="post" name="emailForm" id="emailForm" class="form-validate">
-		<div class="contact_email<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+		<div class="contact_email<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<label for="contact_name">
 				&nbsp;<?php echo JText::_( 'Enter your name' );?>:
 			</label>
diff -aruN --binary 10/components/com_contact/views/contact/tmpl/default.php 11/components/com_contact/views/contact/tmpl/default.php
--- 10/components/com_contact/views/contact/tmpl/default.php	2009-01-10 03:58:06.000000000 +0100
+++ 11/components/com_contact/views/contact/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,18 +1,18 @@
 <?php
 /**
- * $Id: default.php 11328 2008-12-12 19:22:41Z kdevine $
+ * $Id: default.php 11917 2009-05-29 19:37:05Z ian $
  */
 defined( '_JEXEC' ) or die( 'Restricted access' );
 
 $cparams = JComponentHelper::getParams ('com_media');
 ?>
 <?php if ( $this->params->get( 'show_page_title', 1 ) && !$this->contact->params->get( 'popup' ) && $this->params->get('page_title') != $this->contact->name ) : ?>
-	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->params->get( 'page_title' ); ?>
 	</div>
 <?php endif; ?>
 <div id="component-contact">
-<table width="100%" cellpadding="0" cellspacing="0" border="0" class="contentpaneopen<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table width="100%" cellpadding="0" cellspacing="0" border="0" class="contentpaneopen<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <?php if ( $this->params->get( 'show_contact_list' ) && count( $this->contacts ) > 1) : ?>
 <tr>
 	<td colspan="2" align="center">
@@ -28,15 +28,15 @@
 <?php endif; ?>
 <?php if ( $this->contact->name && $this->contact->params->get( 'show_name' ) ) : ?>
 <tr>
-	<td width="100%" class="contentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
-		<?php echo $this->contact->name; ?>
+	<td width="100%" class="contentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
+		<?php echo $this->escape($this->contact->name); ?>
 	</td>
 </tr>
 <?php endif; ?>
 <?php if ( $this->contact->con_position && $this->contact->params->get( 'show_position' ) ) : ?>
 <tr>
 	<td colspan="2">
-	<?php echo $this->contact->con_position; ?>
+	<?php echo $this->escape($this->contact->con_position); ?>
 		<br /><br />
 	</td>
 </tr>
diff -aruN --binary 10/components/com_content/helpers/icon.php 11/components/com_content/helpers/icon.php
--- 10/components/com_content/helpers/icon.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_content/helpers/icon.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: icon.php 11213 2008-10-25 12:43:11Z pasamio $
+ * @version		$Id: icon.php 11917 2009-05-29 19:37:05Z ian $
  * @package		Joomla
  * @subpackage	Content
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -123,7 +123,7 @@
 		$overlib .= '&lt;br /&gt;';
 		$overlib .= $date;
 		$overlib .= '&lt;br /&gt;';
-		$overlib .= $author;
+		$overlib .= htmlspecialchars($author, ENT_COMPAT, 'UTF-8');
 
 		$button = JHTML::_('link', JRoute::_($url), $text);
 
diff -aruN --binary 10/components/com_content/models/category.php 11/components/com_content/models/category.php
--- 10/components/com_content/models/category.php	2009-03-28 01:43:46.000000000 +0100
+++ 11/components/com_content/models/category.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: category.php 11687 2009-03-11 17:49:23Z ian $
+ * @version		$Id: category.php 11794 2009-05-06 01:56:42Z ian $
  * @package		Joomla
  * @subpackage	Content
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -387,6 +387,12 @@
 		{
 			$orderby .= $filter_order .' '. $filter_order_Dir.', ';
 		}
+	    elseif($filter_order == '' && $filter_order_Dir == '')
+		{
+				$filter_order='a.ordering';
+				$filter_order_Dir='ASC';
+				$orderby .= $filter_order .' '. $filter_order_Dir.', ';
+		}
 
 		if ($filter_order == 'author')
 		{
diff -aruN --binary 10/components/com_content/views/archive/tmpl/default_items.php 11/components/com_content/views/archive/tmpl/default_items.php
--- 10/components/com_content/views/archive/tmpl/default_items.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_content/views/archive/tmpl/default_items.php	2009-06-02 23:51:34.000000000 +0200
@@ -16,7 +16,7 @@
 					<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($item->sectionid)).'">'; ?>
 				<?php endif; ?>
 
-				<?php echo $item->section; ?>
+				<?php echo $this->escape($item->section); ?>
 
 				<?php if ($this->params->get('link_section')) : ?>
 					<?php echo '</a>'; ?>
@@ -32,7 +32,7 @@
 				<?php if ($this->params->get('link_category')) : ?>
 					<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($item->catslug, $item->sectionid)).'">'; ?>
 				<?php endif; ?>
-				<?php echo $item->category; ?>
+				<?php echo $this->escape($item->category); ?>
 				<?php if ($this->params->get('link_category')) : ?>
 					<?php echo '</a>'; ?>
 				<?php endif; ?>
@@ -49,7 +49,7 @@
 			<?php endif; ?>
 			<?php if ($this->params->get('show_author')) : ?>
 			<span class="author">
-				<?php echo JText::_('Author').': '; echo $item->created_by_alias ? $item->created_by_alias : $item->author; ?>
+				<?php echo JText::_('Author').': '; echo $this->escape($item->created_by_alias) ? $this->escape($item->created_by_alias) : $this->escape($item->author); ?>
 			</span>
 		<?php endif; ?>
 		</h5>
diff -aruN --binary 10/components/com_content/views/archive/tmpl/default.php 11/components/com_content/views/archive/tmpl/default.php
--- 10/components/com_content/views/archive/tmpl/default.php	2008-07-06 23:39:04.000000000 +0200
+++ 11/components/com_content/views/archive/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -2,7 +2,7 @@
 defined('_JEXEC') or die('Restricted access'); ?>
 <form id="jForm" action="<?php JRoute::_('index.php')?>" method="post">
 <?php if ($this->params->get('show_page_title', 1)) : ?>
-	<div class="componentheading<?php echo $this->params->get('pageclass_sfx')?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
 <?php endif; ?>
 	<p>
 		<?php if ($this->params->get('filter')) : ?>
diff -aruN --binary 10/components/com_content/views/article/tmpl/default.php 11/components/com_content/views/article/tmpl/default.php
--- 10/components/com_content/views/article/tmpl/default.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_content/views/article/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -4,17 +4,17 @@
 $canEdit	= ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own'));
 ?>
 <?php if ($this->params->get('show_page_title', 1) && $this->params->get('page_title') != $this->article->title) : ?>
-	<div class="componentheading<?php echo $this->params->get('pageclass_sfx')?>">
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->escape($this->params->get('page_title')); ?>
 	</div>
 <?php endif; ?>
 <?php if ($canEdit || $this->params->get('show_title') || $this->params->get('show_pdf_icon') || $this->params->get('show_print_icon') || $this->params->get('show_email_icon')) : ?>
-<table class="contentpaneopen<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table class="contentpaneopen<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <tr>
 	<?php if ($this->params->get('show_title')) : ?>
-	<td class="contentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>" width="100%">
+	<td class="contentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" width="100%">
 		<?php if ($this->params->get('link_titles') && $this->article->readmore_link != '') : ?>
-		<a href="<?php echo $this->article->readmore_link; ?>" class="contentpagetitle<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+		<a href="<?php echo $this->article->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php echo $this->escape($this->article->title); ?></a>
 		<?php else : ?>
 			<?php echo $this->escape($this->article->title); ?>
@@ -57,7 +57,7 @@
 	echo $this->article->event->afterDisplayTitle;
 endif; ?>
 <?php echo $this->article->event->beforeDisplayContent; ?>
-<table class="contentpaneopen<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table class="contentpaneopen<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <?php if (($this->params->get('show_section') && $this->article->sectionid) || ($this->params->get('show_category') && $this->article->catid)) : ?>
 <tr>
 	<td>
@@ -66,7 +66,7 @@
 			<?php if ($this->params->get('link_section')) : ?>
 				<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->article->sectionid)).'">'; ?>
 			<?php endif; ?>
-			<?php echo $this->article->section; ?>
+			<?php echo $this->escape($this->article->section); ?>
 			<?php if ($this->params->get('link_section')) : ?>
 				<?php echo '</a>'; ?>
 			<?php endif; ?>
@@ -80,7 +80,7 @@
 			<?php if ($this->params->get('link_category')) : ?>
 				<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->article->catslug, $this->article->sectionid)).'">'; ?>
 			<?php endif; ?>
-			<?php echo $this->article->category; ?>
+			<?php echo $this->escape($this->article->category); ?>
 			<?php if ($this->params->get('link_category')) : ?>
 				<?php echo '</a>'; ?>
 			<?php endif; ?>
@@ -93,7 +93,7 @@
 <tr>
 	<td valign="top">
 		<span class="small">
-			<?php JText::printf( 'Written by', ($this->article->created_by_alias ? $this->article->created_by_alias : $this->article->author) ); ?>
+			<?php JText::printf( 'Written by', ($this->escape($this->article->created_by_alias) ? $this->escape($this->article->created_by_alias) : $this->escape($this->article->author)) ); ?>
 		</span>
 		&nbsp;&nbsp;
 	</td>
@@ -112,7 +112,7 @@
 <tr>
 	<td valign="top">
 		<a href="http://<?php echo $this->article->urls ; ?>" target="_blank">
-			<?php echo $this->article->urls; ?></a>
+			<?php echo $this->escape($this->article->urls); ?></a>
 	</td>
 </tr>
 <?php endif; ?>
diff -aruN --binary 10/components/com_content/views/article/tmpl/form.php 11/components/com_content/views/article/tmpl/form.php
--- 10/components/com_content/views/article/tmpl/form.php	2009-01-10 03:58:06.000000000 +0100
+++ 11/components/com_content/views/article/tmpl/form.php	2009-06-02 23:51:34.000000000 +0200
@@ -63,7 +63,7 @@
 //-->
 </script>
 <?php if ($this->params->get('show_page_title', 1)) : ?>
-<div class="componentheading<?php echo $this->params->get('pageclass_sfx')?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
 <?php endif; ?>
 <form action="<?php echo $this->action ?>" method="post" name="adminForm" onSubmit="setgood();">
 <fieldset>
@@ -146,7 +146,7 @@
 		</label>
 	</td>
 	<td>
-		<input type="text" id="created_by_alias" name="created_by_alias" size="50" maxlength="100" value="<?php echo $this->article->created_by_alias; ?>" class="inputbox" />
+		<input type="text" id="created_by_alias" name="created_by_alias" size="50" maxlength="100" value="<?php echo $this->escape($this->article->created_by_alias); ?>" class="inputbox" />
 	</td>
 </tr>
 <tr>
diff -aruN --binary 10/components/com_content/views/category/tmpl/blog_item.php 11/components/com_content/views/category/tmpl/blog_item.php
--- 10/components/com_content/views/category/tmpl/blog_item.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_content/views/category/tmpl/blog_item.php	2009-06-02 23:51:34.000000000 +0200
@@ -6,12 +6,12 @@
 <?php endif; ?>
 
 <?php if ($this->item->params->get('show_title') || $this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon') || $canEdit) : ?>
-<table class="contentpaneopen<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<table class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 <tr>
 	<?php if ($this->item->params->get('show_title')) : ?>
-	<td class="contentheading<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>" width="100%">
+	<td class="contentheading<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>" width="100%">
 		<?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?>
-		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 			<?php echo $this->escape($this->item->title); ?></a>
 		<?php else : ?>
 			<?php echo $this->escape($this->item->title); ?>
@@ -48,7 +48,7 @@
 	echo $this->item->event->afterDisplayTitle;
 endif; ?>
 <?php echo $this->item->event->beforeDisplayContent; ?>
-<table class="contentpaneopen<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<table class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 <?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?>
 <tr>
 	<td>
@@ -57,7 +57,7 @@
 			<?php if ($this->item->params->get('link_section')) : ?>
 				<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?>
 			<?php endif; ?>
-			<?php echo $this->item->section; ?>
+			<?php echo $this->escape($this->item->section); ?>
 			<?php if ($this->item->params->get('link_section')) : ?>
 				<?php echo '</a>'; ?>
 			<?php endif; ?>
@@ -71,7 +71,7 @@
 			<?php if ($this->item->params->get('link_category')) : ?>
 				<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?>
 			<?php endif; ?>
-			<?php echo $this->item->category; ?>
+			<?php echo $this->escape($this->item->category); ?>
 			<?php if ($this->item->params->get('link_category')) : ?>
 				<?php echo '</a>'; ?>
 			<?php endif; ?>
@@ -85,7 +85,7 @@
 <tr>
 	<td width="70%"  valign="top" colspan="2">
 		<span class="small">
-			<?php JText::printf( 'Written by', ($this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author) ); ?>
+			<?php JText::printf( 'Written by', ($this->escape($this->item->created_by_alias) ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author)) ); ?>
 		</span>
 		&nbsp;&nbsp;
 	</td>
@@ -103,8 +103,8 @@
 <?php if ($this->item->params->get('show_url') && $this->item->urls) : ?>
 <tr>
 	<td valign="top" colspan="2">
-		<a href="http://<?php echo $this->item->urls ; ?>" target="_blank">
-			<?php echo $this->item->urls; ?></a>
+		<a href="http://<?php echo $this->escape($this->item->urls) ; ?>" target="_blank">
+			<?php echo $this->escape($this->item->urls); ?></a>
 	</td>
 </tr>
 <?php endif; ?>
@@ -129,7 +129,7 @@
 <?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?>
 <tr>
 	<td  colspan="2">
-		<a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+		<a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 			<?php if ($this->item->readmore_register) :
 				echo JText::_('Register to read more...');
 			elseif ($readmore = $this->item->params->get('readmore')) :
diff -aruN --binary 10/components/com_content/views/category/tmpl/blog_links.php 11/components/com_content/views/category/tmpl/blog_links.php
--- 10/components/com_content/views/category/tmpl/blog_links.php	2008-07-27 00:29:08.000000000 +0200
+++ 11/components/com_content/views/category/tmpl/blog_links.php	2009-06-02 23:51:34.000000000 +0200
@@ -7,7 +7,7 @@
 <?php foreach ($this->links as $link) : ?>
 	<li>
 			<a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>">
-			<?php echo $link->title; ?></a>
+			<?php echo $this->escape($link->title); ?></a>
 	</li>
 <?php endforeach; ?>
 </ul>
diff -aruN --binary 10/components/com_content/views/category/tmpl/blog.php 11/components/com_content/views/category/tmpl/blog.php
--- 10/components/com_content/views/category/tmpl/blog.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_content/views/category/tmpl/blog.php	2009-06-02 23:51:34.000000000 +0200
@@ -3,11 +3,11 @@
 $cparams =& JComponentHelper::getParams('com_media');
 ?>
 <?php if ($this->params->get('show_page_title', 1)) : ?>
-<div class="componentheading<?php echo $this->params->get('pageclass_sfx');?>">
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </div>
 <?php endif; ?>
-<table class="blog<?php echo $this->params->get('pageclass_sfx');?>" cellpadding="0" cellspacing="0">
+<table class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" cellpadding="0" cellspacing="0">
 <?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) :?>
 <tr>
 	<td valign="top">
@@ -93,7 +93,7 @@
 <?php if ($this->params->get('num_links') && ($i < $this->total)) : ?>
 <tr>
 	<td valign="top">
-		<div class="blog_more<?php echo $this->params->get('pageclass_sfx') ?>">
+		<div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php
 				$this->links = array_splice($this->items, $i - $this->pagination->limitstart);
 				echo $this->loadTemplate('links');
diff -aruN --binary 10/components/com_content/views/category/tmpl/default_items.php 11/components/com_content/views/category/tmpl/default_items.php
--- 10/components/com_content/views/category/tmpl/default_items.php	2009-03-28 01:43:46.000000000 +0100
+++ 11/components/com_content/views/category/tmpl/default_items.php	2009-06-02 23:51:34.000000000 +0200
@@ -39,33 +39,33 @@
 <?php endif; ?>
 <?php if ($this->params->get('show_headings')) : ?>
 <tr>
-	<td class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>" align="right" width="5%">
+	<td class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" align="right" width="5%">
 		<?php echo JText::_('Num'); ?>
 	</td>
 	<?php if ($this->params->get('show_title')) : ?>
- 	<td class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>" width="45%">
+ 	<td class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" width="45%">
 		<?php echo JHTML::_('grid.sort',  'Item Title', 'a.title', $this->lists['order_Dir'], $this->lists['order'] ); ?>
 	</td>
 	<?php endif; ?>
 	<?php if ($this->params->get('show_date')) : ?>
-	<td class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>" width="25%">
+	<td class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" width="25%">
 		<?php echo JHTML::_('grid.sort',  'Date', 'a.created', $this->lists['order_Dir'], $this->lists['order'] ); ?>
 	</td>
 	<?php endif; ?>
 	<?php if ($this->params->get('show_author')) : ?>
-	<td class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>"  width="20%">
+	<td class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"  width="20%">
 		<?php echo JHTML::_('grid.sort',  'Author', 'author', $this->lists['order_Dir'], $this->lists['order'] ); ?>
 	</td>
 	<?php endif; ?>
 	<?php if ($this->params->get('show_hits')) : ?>
-	<td align="center" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>" width="5%" nowrap="nowrap">
+	<td align="center" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" width="5%" nowrap="nowrap">
 		<?php echo JHTML::_('grid.sort',  'Hits', 'a.hits', $this->lists['order_Dir'], $this->lists['order'] ); ?>
 	</td>
 	<?php endif; ?>
 </tr>
 <?php endif; ?>
 <?php foreach ($this->items as $item) : ?>
-<tr class="sectiontableentry<?php echo ($item->odd +1 ) . $this->params->get( 'pageclass_sfx' ); ?>" >
+<tr class="sectiontableentry<?php echo ($item->odd +1 ) . $this->escape($this->params->get('pageclass_sfx')); ?>; ?>" >
 	<td align="right">
 		<?php echo $this->pagination->getRowOffset( $item->count ); ?>
 	</td>
@@ -73,7 +73,7 @@
 	<?php if ($item->access <= $this->user->get('aid', 0)) : ?>
 	<td>
 		<a href="<?php echo $item->link; ?>">
-			<?php echo $item->title; ?></a>
+			<?php echo $this->escape($item->title); ?></a>
 			<?php $this->item = $item; echo JHTML::_('icon.edit', $item, $this->params, $this->access) ?>
 	</td>
 	<?php else : ?>
@@ -98,12 +98,12 @@
 	<?php endif; ?>
 	<?php if ($this->params->get('show_author')) : ?>
 	<td >
-		<?php echo $item->created_by_alias ? $item->created_by_alias : $item->author; ?>
+		<?php echo $this->escape($item->created_by_alias) ? $this->escape($item->created_by_alias) : $this->escape($item->author); ?>
 	</td>
 	<?php endif; ?>
 	<?php if ($this->params->get('show_hits')) : ?>
 	<td align="center">
-		<?php echo $item->hits ? $item->hits : '-'; ?>
+		<?php echo $this->escape($item->hits) ? $this->escape($item->hits) : '-'; ?>
 	</td>
 	<?php endif; ?>
 </tr>
@@ -113,7 +113,7 @@
 	<td colspan="5">&nbsp;</td>
 </tr>
 <tr>
-	<td align="center" colspan="4" class="sectiontablefooter<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<td align="center" colspan="4" class="sectiontablefooter<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->pagination->getPagesLinks(); ?>
 	</td>
 </tr>
diff -aruN --binary 10/components/com_content/views/category/tmpl/default.php 11/components/com_content/views/category/tmpl/default.php
--- 10/components/com_content/views/category/tmpl/default.php	2008-07-06 23:39:02.000000000 +0200
+++ 11/components/com_content/views/category/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -3,13 +3,13 @@
 $cparams =& JComponentHelper::getParams('com_media');
 ?>
 <?php if ($this->params->get('show_page_title', 1)) : ?>
-<div class="componentheading<?php echo $this->params->get('pageclass_sfx');?>">
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </div>
 <?php endif; ?>
-<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <tr>
-	<td width="60%" valign="top" class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' ); ?>" colspan="2">
+	<td width="60%" valign="top" class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" colspan="2">
 	<?php if ($this->category->image) : ?>
 		<img src="<?php echo $this->baseurl . '/' . $cparams->get('image_path') . '/'. $this->category->image;?>" align="<?php echo $this->category->image_position;?>" hspace="6" alt="<?php echo $this->category->image;?>" />
 	<?php endif; ?>
diff -aruN --binary 10/components/com_content/views/category/view.feed.php 11/components/com_content/views/category/view.feed.php
--- 10/components/com_content/views/category/view.feed.php	2009-03-28 01:43:46.000000000 +0100
+++ 11/components/com_content/views/category/view.feed.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: view.feed.php 11687 2009-03-11 17:49:23Z ian $
+ * @version		$Id: view.feed.php 11795 2009-05-06 01:59:19Z ian $
  * @package		Joomla
  * @subpackage	Content
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -32,7 +32,7 @@
 
 		$doc     =& JFactory::getDocument();
 		$params =& $mainframe->getParams();
-		$feedEmail = ($mainframe->getCfg('feed_email')) ? $mainframe->getCfg('feed_email') : 'author';
+		$feedEmail = (@$mainframe->getCfg('feed_email')) ? $mainframe->getCfg('feed_email') : 'author';
 		$siteEmail = $mainframe->getCfg('mailfrom');
 
 		// Get some data from the model
diff -aruN --binary 10/components/com_content/views/frontpage/tmpl/default_item.php 11/components/com_content/views/frontpage/tmpl/default_item.php
--- 10/components/com_content/views/frontpage/tmpl/default_item.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_content/views/frontpage/tmpl/default_item.php	2009-06-02 23:51:34.000000000 +0200
@@ -8,13 +8,13 @@
 <?php endif; ?>
 
 <?php if ($canEdit || $this->item->params->get('show_title') || $this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?>
-<table class="contentpaneopen<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<table class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 <tr>
 	<?php if ($this->item->params->get('show_title')) : ?>
-	<td class="contentheading<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>" width="100%">
+	<td class="contentheading<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>" width="100%">
 		<?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?>
-		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
-			<?php echo $this->item->title; ?></a>
+		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
+			<?php echo $this->escape($this->item->title); ?></a>
 		<?php else : ?>
 			<?php echo $this->escape($this->item->title); ?>
 		<?php endif; ?>
@@ -50,7 +50,7 @@
 	echo $this->item->event->afterDisplayTitle;
 endif; ?>
 <?php echo $this->item->event->beforeDisplayContent; ?>
-<table class="contentpaneopen<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<table class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 <?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?>
 <tr>
 	<td>
@@ -59,7 +59,7 @@
 			<?php if ($this->item->params->get('link_section')) : ?>
 				<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?>
 			<?php endif; ?>
-			<?php echo $this->item->section; ?>
+			<?php echo $this->escape($this->item->section); ?>
 			<?php if ($this->item->params->get('link_section')) : ?>
 				<?php echo '</a>'; ?>
 			<?php endif; ?>
@@ -73,7 +73,7 @@
 			<?php if ($this->item->params->get('link_category')) : ?>
 				<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?>
 			<?php endif; ?>
-			<?php echo $this->item->category; ?>
+			<?php echo $this->escape($this->item->category); ?>
 			<?php if ($this->item->params->get('link_category')) : ?>
 				<?php echo '</a>'; ?>
 			<?php endif; ?>
@@ -87,7 +87,7 @@
 <tr>
 	<td width="70%"  valign="top" colspan="2">
 		<span class="small">
-			<?php JText::printf( 'Written by', ($this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author) ); ?>
+			<?php JText::printf( 'Written by', ($this->escape($this->item->created_by_alias) ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author)) ); ?>
 		</span>
 		&nbsp;&nbsp;
 	</td>
@@ -105,8 +105,8 @@
 <?php if ($this->item->params->get('show_url') && $this->item->urls) : ?>
 <tr>
 	<td valign="top" colspan="2">
-		<a href="http://<?php echo $this->item->urls ; ?>" target="_blank">
-			<?php echo $this->item->urls; ?></a>
+		<a href="http://<?php echo $this->escape($this->item->urls) ; ?>" target="_blank">
+			<?php echo $this->escape($this->item->urls); ?></a>
 	</td>
 </tr>
 <?php endif; ?>
@@ -131,7 +131,7 @@
 <?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?>
 <tr>
 	<td  colspan="2">
-		<a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+		<a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 			<?php if ($this->item->readmore_register) :
 				echo JText::_('Register to read more...');
 			elseif ($readmore = $this->item->params->get('readmore')) :
diff -aruN --binary 10/components/com_content/views/frontpage/tmpl/default_links.php 11/components/com_content/views/frontpage/tmpl/default_links.php
--- 10/components/com_content/views/frontpage/tmpl/default_links.php	2008-07-06 23:39:04.000000000 +0200
+++ 11/components/com_content/views/frontpage/tmpl/default_links.php	2009-06-02 23:51:34.000000000 +0200
@@ -7,7 +7,7 @@
 <?php foreach ($this->links as $link) : ?>
 	<li>
 		<a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>">
-			<?php echo $link->title; ?></a>
+			<?php echo $this->escape($link->title); ?></a>
 	</li>
 <?php endforeach; ?>
-</ul>
\ No hay ningún carácter de nueva línea al final del fichero
+</ul>
diff -aruN --binary 10/components/com_content/views/frontpage/tmpl/default.php 11/components/com_content/views/frontpage/tmpl/default.php
--- 10/components/com_content/views/frontpage/tmpl/default.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_content/views/frontpage/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,11 +1,11 @@
 <?php // no direct access
 defined('_JEXEC') or die('Restricted access'); ?>
 <?php if ($this->params->get('show_page_title', 1)) : ?>
-<div class="componentheading<?php echo $this->params->get('pageclass_sfx') ?>">
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </div>
 <?php endif; ?>
-<table class="blog<?php echo $this->params->get('pageclass_sfx') ?>" cellpadding="0" cellspacing="0">
+<table class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" cellpadding="0" cellspacing="0">
 <?php if ($this->params->def('num_leading_articles', 1)) : ?>
 <tr>
 	<td valign="top">
@@ -75,7 +75,7 @@
 <?php if ($this->params->def('num_links', 4) && ($i < $this->total)) : ?>
 <tr>
 	<td valign="top">
-		<div class="blog_more<?php echo $this->params->get('pageclass_sfx') ?>">
+		<div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php
 				$this->links = array_splice($this->items, $i - $this->pagination->limitstart);
 				echo $this->loadTemplate('links');
diff -aruN --binary 10/components/com_content/views/frontpage/view.feed.php 11/components/com_content/views/frontpage/view.feed.php
--- 10/components/com_content/views/frontpage/view.feed.php	2009-03-28 01:43:46.000000000 +0100
+++ 11/components/com_content/views/frontpage/view.feed.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: view.feed.php 11687 2009-03-11 17:49:23Z ian $
+ * @version		$Id: view.feed.php 11795 2009-05-06 01:59:19Z ian $
  * @package		Joomla
  * @subpackage	Content
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -35,7 +35,7 @@
 		$db			=& JFactory::getDBO();
 		$document	=& JFactory::getDocument();
 		$params =& $mainframe->getParams();
-		$feedEmail = ($mainframe->getCfg('feed_email')) ? $mainframe->getCfg('feed_email') : 'author';
+		$feedEmail = (@$mainframe->getCfg('feed_email')) ? $mainframe->getCfg('feed_email') : 'author';
 		$siteEmail = $mainframe->getCfg('mailfrom');
 		$document->link = JRoute::_('index.php?option=com_content&view=frontpage');
 
diff -aruN --binary 10/components/com_content/views/section/tmpl/blog_item.php 11/components/com_content/views/section/tmpl/blog_item.php
--- 10/components/com_content/views/section/tmpl/blog_item.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_content/views/section/tmpl/blog_item.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,7 +1,7 @@
 <?php // no direct access
 defined('_JEXEC') or die('Restricted access'); ?>
 <?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?>
-	<div class="contentpaneopen_edit<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+	<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 		<?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?>
 	</div>
 <?php endif; ?>
@@ -10,12 +10,12 @@
 <?php endif; ?>
 
 <?php if ($this->item->params->get('show_title') || $this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?>
-<table class="contentpaneopen<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<table class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 <tr>
 	<?php if ($this->item->params->get('show_title')) : ?>
-	<td class="contentheading<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>" width="100%">
+	<td class="contentheading<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>" width="100%">
 		<?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?>
-		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 			<?php echo $this->escape($this->item->title); ?></a>
 		<?php else : ?>
 			<?php echo $this->escape($this->item->title); ?>
@@ -47,16 +47,16 @@
 	echo $this->item->event->afterDisplayTitle;
 endif; ?>
 <?php echo $this->item->event->beforeDisplayContent; ?>
-<table class="contentpaneopen<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<table class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 <?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?>
 <tr>
 	<td>
-		<?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->item->section)) : ?>
+		<?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->section->title)) : ?>
 		<span>
 			<?php if ($this->item->params->get('link_section')) : ?>
 				<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?>
 			<?php endif; ?>
-			<?php echo $this->item->section; ?>
+			<?php echo $this->escape($this->section->title); ?>
 			<?php if ($this->item->params->get('link_section')) : ?>
 				<?php echo '</a>'; ?>
 			<?php endif; ?>
@@ -70,7 +70,7 @@
 			<?php if ($this->item->params->get('link_category')) : ?>
 				<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?>
 			<?php endif; ?>
-			<?php echo $this->item->category; ?>
+			<?php echo $this->escape($this->item->category); ?>
 			<?php if ($this->item->params->get('link_category')) : ?>
 				<?php echo '</a>'; ?>
 			<?php endif; ?>
@@ -84,7 +84,7 @@
 <tr>
 	<td width="70%"  valign="top" colspan="2">
 		<span class="small">
-			<?php JText::printf( 'Written by', ($this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author) ); ?>
+			<?php JText::printf( 'Written by', ($this->escape($this->item->created_by_alias) ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author)) ); ?>
 		</span>
 		&nbsp;&nbsp;
 	</td>
@@ -102,8 +102,8 @@
 <?php if ($this->item->params->get('show_url') && $this->item->urls) : ?>
 <tr>
 	<td valign="top" colspan="2">
-		<a href="http://<?php echo $this->item->urls ; ?>" target="_blank">
-			<?php echo $this->item->urls; ?></a>
+		<a href="http://<?php echo $this->escape($this->item->urls) ; ?>" target="_blank">
+			<?php echo $this->escape($this->item->urls); ?></a>
 	</td>
 </tr>
 <?php endif; ?>
@@ -128,7 +128,7 @@
 <?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?>
 <tr>
 	<td  colspan="2">
-		<a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+		<a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 			<?php if ($this->item->readmore_register) :
 				echo JText::_('Register to read more...');
 			elseif ($readmore = $this->item->params->get('readmore')) :
diff -aruN --binary 10/components/com_content/views/section/tmpl/blog_links.php 11/components/com_content/views/section/tmpl/blog_links.php
--- 10/components/com_content/views/section/tmpl/blog_links.php	2008-07-27 00:29:08.000000000 +0200
+++ 11/components/com_content/views/section/tmpl/blog_links.php	2009-06-02 23:51:34.000000000 +0200
@@ -7,7 +7,7 @@
  foreach ($this->links as $link) : ?>
 	<li>
 		<a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>">
-			<?php echo $link->title; ?></a>
+			<?php echo $this->escape($link->title); ?></a>
 	</li>
 <?php endforeach; ?>
 </ul>
diff -aruN --binary 10/components/com_content/views/section/tmpl/blog.php 11/components/com_content/views/section/tmpl/blog.php
--- 10/components/com_content/views/section/tmpl/blog.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_content/views/section/tmpl/blog.php	2009-06-02 23:51:34.000000000 +0200
@@ -3,11 +3,11 @@
 $cparams =& JComponentHelper::getParams('com_media');
 ?>
 <?php if ($this->params->get('show_page_title')) : ?>
-<div class="componentheading<?php echo $this->params->get('pageclass_sfx');?>">
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </div>
 <?php endif; ?>
-<table class="blog<?php echo $this->params->get('pageclass_sfx'); ?>" cellpadding="0" cellspacing="0">
+<table class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" cellpadding="0" cellspacing="0">
 <?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) :?>
 <tr>
 	<td valign="top">
@@ -93,7 +93,7 @@
 <?php if ($this->params->def('num_links', 4) && ($i < $this->total)) : ?>
 <tr>
 	<td valign="top">
-		<div class="blog_more<?php echo $this->params->get('pageclass_sfx') ?>">
+		<div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php
 				$this->links = array_splice($this->items, $i - $this->pagination->limitstart);
 				echo $this->loadTemplate('links');
diff -aruN --binary 10/components/com_content/views/section/tmpl/default.php 11/components/com_content/views/section/tmpl/default.php
--- 10/components/com_content/views/section/tmpl/default.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_content/views/section/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -3,13 +3,13 @@
 $cparams =& JComponentHelper::getParams('com_media');
 ?>
 <?php if ($this->params->get('show_page_title', 1)) : ?>
-<div class="componentheading<?php echo $this->params->get('pageclass_sfx');?>">
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </div>
 <?php endif; ?>
-<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <tr>
-	<td width="60%" valign="top" class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' ); ?>" colspan="2">
+	<td width="60%" valign="top" class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" colspan="2">
 	<?php if ($this->params->get('show_description_image') && $this->section->image) : ?>
 		<img src="<?php echo $this->baseurl . '/' . $cparams->get('image_path') . '/'.  $this->section->image;?>" align="<?php echo $this->section->image_position;?>" hspace="6" alt="<?php echo $this->section->image;?>" />
 	<?php endif; ?>
@@ -26,7 +26,7 @@
 		<?php if (!$this->params->get('show_empty_categories') && !$category->numitems) continue; ?>
 		<li>
 			<a href="<?php echo $category->link; ?>" class="category">
-				<?php echo $category->title;?></a>
+				<?php echo $this->escape($category->title);?></a>
 			<?php if ($this->params->get('show_cat_num_articles')) : ?>
 			&nbsp;
 			<span class="small">
diff -aruN --binary 10/components/com_content/views/section/view.feed.php 11/components/com_content/views/section/view.feed.php
--- 10/components/com_content/views/section/view.feed.php	2009-03-28 01:43:46.000000000 +0100
+++ 11/components/com_content/views/section/view.feed.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: view.feed.php 11687 2009-03-11 17:49:23Z ian $
+ * @version		$Id: view.feed.php 11795 2009-05-06 01:59:19Z ian $
  * @package		Joomla
  * @subpackage	Content
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -32,7 +32,7 @@
 		global $mainframe;
 		$doc =& JFactory::getDocument();
 		$params =& $mainframe->getParams();
-		$feedEmail = ($mainframe->getCfg('feed_email')) ? $mainframe->getCfg('feed_email') : 'author';
+		$feedEmail = (@$mainframe->getCfg('feed_email')) ? $mainframe->getCfg('feed_email') : 'author';
 		$siteEmail = $mainframe->getCfg('mailfrom');
 		
 		// Get some data from the model
diff -aruN --binary 10/components/com_mailto/views/mailto/tmpl/default.php 11/components/com_mailto/views/mailto/tmpl/default.php
--- 10/components/com_mailto/views/mailto/tmpl/default.php	2008-09-09 16:19:40.000000000 +0200
+++ 11/components/com_mailto/views/mailto/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -33,25 +33,25 @@
 	<p>
 		<?php echo JText::_('EMAIL_TO'); ?>:
 		<br />
-		<input type="text" name="mailto" class="inputbox" size="25" value="<?php echo $data->mailto ?>"/>
+		<input type="text" name="mailto" class="inputbox" size="25" value="<?php echo $this->escape($data->mailto) ?>"/>
 	</p>
 
 	<p>
 		<?php echo JText::_('SENDER'); ?>:
 		<br />
-		<input type="text" name="sender" class="inputbox" value="<?php echo $data->sender ?>" size="25" />
+		<input type="text" name="sender" class="inputbox" value="<?php echo $this->escape($data->sender) ?>" size="25" />
 	</p>
 
 	<p>
 		<?php echo JText::_('YOUR_EMAIL'); ?>:
 		<br />
-		<input type="text" name="from" class="inputbox" value="<?php echo $data->from ?>" size="25" />
+		<input type="text" name="from" class="inputbox" value="<?php echo $this->escape($data->from) ?>" size="25" />
 	</p>
 
 	<p>
 		<?php echo JText::_('SUBJECT'); ?>:
 		<br />
-		<input type="text" name="subject" class="inputbox" value="<?php echo $data->subject ?>" size="25" />
+		<input type="text" name="subject" class="inputbox" value="<?php echo $this->escape($data->subject) ?>" size="25" />
 	</p>
 
 	<p>
@@ -70,4 +70,4 @@
 	<input type="hidden" name="tmpl" value="component" />
 	<input type="hidden" name="link" value="<?php echo $data->link; ?>" />
 	<?php echo JHTML::_( 'form.token' ); ?>
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/components/com_media/media.php 11/components/com_media/media.php
--- 10/components/com_media/media.php	2008-07-06 23:39:06.000000000 +0200
+++ 11/components/com_media/media.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: media.php 10381 2008-06-01 03:35:53Z pasamio $
+ * @version		$Id: media.php 11784 2009-04-24 17:34:11Z kdevine $
  * @package		Joomla
  * @subpackage	Massmail
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -15,15 +15,19 @@
 // no direct access
 defined('_JEXEC') or die('Restricted access');
 
+$params =& JComponentHelper::getParams('com_media');
+$ranks = array('publisher', 'editor', 'author', 'registered');
+$acl = & JFactory::getACL();
+for($i = 0; $i < $params->get('allowed_media_usergroup', 3); $i++)
+{
+	$acl->addACL( 'com_media', 'popup', 'users', $ranks[$i] );
+}
 // Make sure the user is authorized to view this page
 $user = & JFactory::getUser();
 if (!$user->authorize( 'com_media', 'popup' )) {
 	$mainframe->redirect('index.php', JText::_('ALERTNOTAUTH'));
 }
 
-// Get the media component configuration settings
-$params =& JComponentHelper::getParams('com_media');
-
 // Set the path definitions
 define('COM_MEDIA_BASE',    JPATH_ROOT.DS.$params->get('image_path', 'images'.DS.'stories'));
 define('COM_MEDIA_BASEURL', JURI::root(true).'/'.$params->get('image_path', 'images/stories'));
diff -aruN --binary 10/components/com_newsfeeds/views/categories/tmpl/default.php 11/components/com_newsfeeds/views/categories/tmpl/default.php
--- 10/components/com_newsfeeds/views/categories/tmpl/default.php	2008-07-06 23:39:06.000000000 +0200
+++ 11/components/com_newsfeeds/views/categories/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,18 +1,18 @@
 <?php // no direct access
 defined('_JEXEC') or die('Restricted access'); ?>
 <?php if ( $this->params->get( 'show_page_title', 1 ) ) : ?>
-	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->escape($this->params->get('page_title')); ?>
 	</div>
 <?php endif; ?>
 
-<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 <?php if ( ($this->params->get('image') != -1) || $this->params->get('show_comp_description') ) : ?>
 <tr>
-	<td valign="top" class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<td valign="top" class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php
 		if ( isset($this->image) ) :  echo $this->image; endif;
-		echo $this->params->get('comp_description');
+		echo $this->escape($this->params->get('comp_description'));
 	?>
 	</td>
 </tr>
@@ -21,8 +21,8 @@
 <ul>
 <?php foreach ( $this->categories as $category ) : ?>
 	<li>
-		<a href="<?php echo $category->link ?>" class="category<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
-			<?php echo $category->title;?></a>
+		<a href="<?php echo $category->link ?>" class="category<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
+			<?php echo $this->escape($category->title);?></a>
 		<?php if ( $this->params->get( 'show_cat_items' ) ) : ?>
 		&nbsp;
 		<span class="small">
diff -aruN --binary 10/components/com_newsfeeds/views/category/tmpl/default_items.php 11/components/com_newsfeeds/views/category/tmpl/default_items.php
--- 10/components/com_newsfeeds/views/category/tmpl/default_items.php	2008-07-06 23:39:04.000000000 +0200
+++ 11/components/com_newsfeeds/views/category/tmpl/default_items.php	2009-06-02 23:51:34.000000000 +0200
@@ -14,16 +14,16 @@
 <?php endif; ?>
 <?php if ( $this->params->get( 'show_headings' ) ) : ?>
 <tr>
-	<td class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>" align="right" width="5">
+	<td class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" align="right" width="5">
 		<?php echo JText::_('Num'); ?>
 	</td>
 	<?php if ( $this->params->get( 'show_name' ) ) : ?>
-	<td height="20" width="90%" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<td height="20" width="90%" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo JText::_( 'Feed Name' ); ?>
 	</td>
 	<?php endif; ?>
 	<?php if ( $this->params->get( 'show_articles' ) ) : ?>
-	<td height="20" width="10%" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>" align="center" nowrap="nowrap">
+	<td height="20" width="10%" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" align="center" nowrap="nowrap">
 		<?php echo JText::_( 'Num Articles' ); ?>
 	</td>
 	<?php endif; ?>
@@ -35,8 +35,8 @@
 		<?php echo $item->count + 1; ?>
 	</td>
 	<td height="20" width="90%">
-		<a href="<?php echo $item->link; ?>" class="category<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
-			<?php echo $item->name; ?></a>
+		<a href="<?php echo $item->link; ?>" class="category<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
+			<?php echo $this->escape($item->name); ?></a>
 	</td>
 	<?php if ( $this->params->get( 'show_articles' ) ) : ?>
 	<td height="20" width="10%" align="center">
@@ -46,7 +46,7 @@
 </tr>
 <?php endforeach; ?>
 <tr>
-	<td align="center" colspan="4" class="sectiontablefooter<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<td align="center" colspan="4" class="sectiontablefooter<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php
 
 		echo $this->pagination->getPagesLinks();
@@ -59,4 +59,4 @@
 	</td>
 </tr>
 </table>
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/components/com_newsfeeds/views/category/tmpl/default.php 11/components/com_newsfeeds/views/category/tmpl/default.php
--- 10/components/com_newsfeeds/views/category/tmpl/default.php	2008-07-06 23:39:04.000000000 +0200
+++ 11/components/com_newsfeeds/views/category/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,13 +1,13 @@
 <?php // no direct access
 defined('_JEXEC') or die('Restricted access'); ?>
 <?php if ( $this->params->get( 'show_page_title', 1 ) ) : ?>
-	<div class="componentheading<?php echo $this->params->get('pageclass_sfx')?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
 <?php endif; ?>
 
-<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <?php if ( @$this->image || @$this->category->description ) : ?>
 <tr>
-	<td valign="top" class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<td valign="top" class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php
 		if ( isset($this->image) ) :  echo $this->image; endif;
 		echo $this->category->description;
diff -aruN --binary 10/components/com_newsfeeds/views/newsfeed/tmpl/default.php 11/components/com_newsfeeds/views/newsfeed/tmpl/default.php
--- 10/components/com_newsfeeds/views/newsfeed/tmpl/default.php	2009-01-10 03:58:06.000000000 +0100
+++ 11/components/com_newsfeeds/views/newsfeed/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -32,11 +32,11 @@
 ?>
 <div style="<?php echo $direction; ?><?php echo $align; ?>">
 <?php if ($this->params->get('show_page_title', 1)) : ?>
-	<div class="componentheading<?php echo $this->params->get('pageclass_sfx')?>" style="<?php echo $direction; ?><?php echo $align; ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" style="<?php echo $direction; ?><?php echo $align; ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
 <?php endif; ?>
-<table width="100%" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table width="100%" class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <tr>
-	<td class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>" style="<?php echo $direction; ?><?php echo $align; ?>">
+	<td class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" style="<?php echo $direction; ?><?php echo $align; ?>">
 		<a href="<?php echo $this->newsfeed->channel['link']; ?>" target="_blank">
 			<?php echo str_replace('&apos;', "'", $this->newsfeed->channel['title']); ?></a>
 	</td>
diff -aruN --binary 10/components/com_poll/views/poll/tmpl/default_graph.php 11/components/com_poll/views/poll/tmpl/default_graph.php
--- 10/components/com_poll/views/poll/tmpl/default_graph.php	2008-07-06 23:39:06.000000000 +0200
+++ 11/components/com_poll/views/poll/tmpl/default_graph.php	2009-06-02 23:51:34.000000000 +0200
@@ -6,7 +6,7 @@
 	<tr>
 		<th colspan="3" class="sectiontableheader">
 			<img src="<?php echo $this->baseurl; ?>/components/com_poll/assets/poll.png" align="middle" border="0" width="12" height="14" alt="" />
-			<?php echo $this->poll->title; ?>
+			<?php echo $this->escape($this->poll->title); ?>
 		</th>
 	</tr>
 </thead>
@@ -19,10 +19,10 @@
 	</tr>
 	<tr class="sectiontableentry<?php echo $vote->odd; ?>">
 		<td align="right" width="25">
-			<strong><?php echo $vote->hits; ?></strong>&nbsp;
+			<strong><?php echo $this->escape($vote->hits); ?></strong>&nbsp;
 		</td>
 		<td width="30" >
-			<?php echo $vote->percent; ?>%
+			<?php echo $this->escape($vote->percent); ?>%
 		</td>
 		<td width="300" >
 			<div class="<?php echo $vote->class; ?>" style="height:<?php echo $vote->barheight; ?>px;width:<?php echo $vote->percent; ?>%"></div>
@@ -49,7 +49,7 @@
 		</td>
 		<td class="smalldark">
 			&nbsp;:&nbsp;
-			<?php echo $this->first_vote; ?>
+			<?php echo $this->escape($this->first_vote); ?>
 		</td>
 	</tr>
 	<tr>
@@ -58,8 +58,8 @@
 		</td>
 		<td class="smalldark">
 			&nbsp;:&nbsp;
-			<?php echo $this->last_vote; ?>
+			<?php echo $this->escape($this->last_vote); ?>
 		</td>
 	</tr>
 </tbody>
-</table>
\ No hay ningún carácter de nueva línea al final del fichero
+</table>
diff -aruN --binary 10/components/com_poll/views/poll/tmpl/default.php 11/components/com_poll/views/poll/tmpl/default.php
--- 10/components/com_poll/views/poll/tmpl/default.php	2008-07-06 23:39:06.000000000 +0200
+++ 11/components/com_poll/views/poll/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -6,17 +6,17 @@
 
 <form action="index.php" method="post" name="poll" id="poll">
 <?php if ($this->params->get( 'show_page_title', 1)) : ?>
-<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ) ?>">
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </div>
 <?php endif; ?>
-<div class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ) ?>">
+<div class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<label for="id">
 		<?php echo JText::_('Select Poll'); ?>
 		<?php echo $this->lists['polls']; ?>
 	</label>
 </div>
-<div class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ) ?>">
+<div class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <?php echo $this->loadTemplate('graph'); ?>
 </div>
 </form>
diff -aruN --binary 10/components/com_search/views/search/tmpl/default_error.php 11/components/com_search/views/search/tmpl/default_error.php
--- 10/components/com_search/views/search/tmpl/default_error.php	2008-07-06 23:39:00.000000000 +0200
+++ 11/components/com_search/views/search/tmpl/default_error.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,9 +1,9 @@
 <?php defined('_JEXEC') or die('Restricted access'); ?>
 
-<table class="searchintro<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table class="searchintro<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<tr>
 		<td colspan="3" >
 			<?php echo $this->escape($this->error); ?>
 		</td>
 	</tr>
-</table>
\ No hay ningún carácter de nueva línea al final del fichero
+</table>
diff -aruN --binary 10/components/com_search/views/search/tmpl/default_form.php 11/components/com_search/views/search/tmpl/default_form.php
--- 10/components/com_search/views/search/tmpl/default_form.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/components/com_search/views/search/tmpl/default_form.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,7 +1,7 @@
 <?php defined('_JEXEC') or die('Restricted access'); ?>
 
 <form id="searchForm" action="<?php echo JRoute::_( 'index.php?option=com_search' );?>" method="post" name="searchForm">
-	<table class="contentpaneopen<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<table class="contentpaneopen<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<tr>
 			<td nowrap="nowrap">
 				<label for="search_searchword">
@@ -42,7 +42,7 @@
 	<?php endif; ?>
 
 
-	<table class="searchintro<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<table class="searchintro<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<tr>
 		<td colspan="3" >
 			<br />
diff -aruN --binary 10/components/com_search/views/search/tmpl/default.php 11/components/com_search/views/search/tmpl/default.php
--- 10/components/com_search/views/search/tmpl/default.php	2008-07-06 23:39:00.000000000 +0200
+++ 11/components/com_search/views/search/tmpl/default.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,7 +1,7 @@
 <?php defined('_JEXEC') or die('Restricted access'); ?>
 
 <?php if ( $this->params->get( 'show_page_title', 1 ) ) : ?>
-<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->params->get( 'page_title' ); ?>
 </div>
 <?php endif; ?>
diff -aruN --binary 10/components/com_search/views/search/tmpl/default_results.php 11/components/com_search/views/search/tmpl/default_results.php
--- 10/components/com_search/views/search/tmpl/default_results.php	2008-07-06 23:39:00.000000000 +0200
+++ 11/components/com_search/views/search/tmpl/default_results.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,13 +1,13 @@
 <?php defined('_JEXEC') or die('Restricted access'); ?>
 
-<table class="contentpaneopen<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table class="contentpaneopen<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<tr>
 		<td>
 		<?php
 		foreach( $this->results as $result ) : ?>
 			<fieldset>
 				<div>
-					<span class="small<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+					<span class="small<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 						<?php echo $this->pagination->limitstart + $result->count.'. ';?>
 					</span>
 					<?php if ( $result->href ) :
@@ -24,7 +24,7 @@
 						<?php endif;
 						if ( $result->section ) : ?>
 							<br />
-							<span class="small<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+							<span class="small<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 								(<?php echo $this->escape($result->section); ?>)
 							</span>
 						<?php endif; ?>
@@ -35,7 +35,7 @@
 				</div>
 				<?php
 					if ( $this->params->get( 'show_date' )) : ?>
-				<div class="small<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+				<div class="small<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 					<?php echo $result->created; ?>
 				</div>
 				<?php endif; ?>
@@ -50,4 +50,4 @@
 			</div>
 		</td>
 	</tr>
-</table>
\ No hay ningún carácter de nueva línea al final del fichero
+</table>
diff -aruN --binary 10/components/com_user/views/login/tmpl/default_login.php 11/components/com_user/views/login/tmpl/default_login.php
--- 10/components/com_user/views/login/tmpl/default_login.php	2008-09-09 16:19:40.000000000 +0200
+++ 11/components/com_user/views/login/tmpl/default_login.php	2009-06-02 23:51:34.000000000 +0200
@@ -12,11 +12,11 @@
 		JHTML::_('script', 'openid.js');
 endif; ?>
 <form action="<?php echo JRoute::_( 'index.php', true, $this->params->get('usesecure')); ?>" method="post" name="com-login" id="com-form-login">
-<table width="100%" border="0" align="center" cellpadding="4" cellspacing="0" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table width="100%" border="0" align="center" cellpadding="4" cellspacing="0" class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <tr>
 	<td colspan="2">
 		<?php if ( $this->params->get( 'show_login_title' ) ) : ?>
-		<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+		<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php echo $this->params->get( 'header_login' ); ?>
 		</div>
 		<?php endif; ?>
@@ -61,7 +61,7 @@
 	$usersConfig = &JComponentHelper::getParams( 'com_users' );
 	if ($usersConfig->get('allowUserRegistration')) : ?>
 	<li>
-		<a href="<?php echo JRoute::_( 'index.php?option=com_user&task=register' ); ?>">
+		<a href="<?php echo JRoute::_( 'index.php?option=com_user&view=register' ); ?>">
 			<?php echo JText::_('REGISTER'); ?></a>
 	</li>
 	<?php endif; ?>
@@ -71,4 +71,4 @@
 	<input type="hidden" name="task" value="login" />
 	<input type="hidden" name="return" value="<?php echo $this->return; ?>" />
 	<?php echo JHTML::_( 'form.token' ); ?>
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/components/com_user/views/login/tmpl/default_logout.php 11/components/com_user/views/login/tmpl/default_logout.php
--- 10/components/com_user/views/login/tmpl/default_logout.php	2008-09-09 16:19:40.000000000 +0200
+++ 11/components/com_user/views/login/tmpl/default_logout.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,19 +1,19 @@
 <?php defined('_JEXEC') or die('Restricted access'); ?>
 <?php /** @todo Should this be routed */ ?>
-<form action="index.php" method="post" name="login" id="login">
+<form action="<?php echo JRoute::_( 'index.php' ); ?>" method="post" name="login" id="login">
 <?php if ( $this->params->get( 'show_logout_title' ) ) : ?>
-<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
-	<?php echo $this->params->get( 'header_logout' ); ?>
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
+	<?php echo $this->escape($this->params->get( 'header_logout' )); ?>
 </div>
 <?php endif; ?>
-<table border="0" align="center" cellpadding="4" cellspacing="0" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>" width="100%">
+<table border="0" align="center" cellpadding="4" cellspacing="0" class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" width="100%">
 <tr>
 	<td valign="top">
 		<div>
 		<?php echo $this->image; ?>
 		<?php
 			if ($this->params->get('description_logout')) :
-				echo $this->params->get('description_logout_text');
+				echo $this->escape($this->params->get('description_logout_text'));
 			endif;
 		?>
 		</div>
@@ -33,4 +33,4 @@
 <input type="hidden" name="option" value="com_user" />
 <input type="hidden" name="task" value="logout" />
 <input type="hidden" name="return" value="<?php echo $this->return; ?>" />
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/components/com_user/views/register/tmpl/default_message.php 11/components/com_user/views/register/tmpl/default_message.php
--- 10/components/com_user/views/register/tmpl/default_message.php	2008-07-06 23:38:58.000000000 +0200
+++ 11/components/com_user/views/register/tmpl/default_message.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,9 +1,9 @@
 <?php // no direct access
 defined('_JEXEC') or die('Restricted access'); ?>
 <div class="componentheading">
-	<?php echo $this->message->title ; ?>
+	<?php echo $this->escape($this->message->title) ; ?>
 </div>
 
 <div class="message">
-	<?php echo  $this->message->text ; ?>
+	<?php echo $this->escape($this->message->text) ; ?>
 </div>
diff -aruN --binary 10/components/com_user/views/register/tmpl/default.php 11/components/com_user/views/register/tmpl/default.php
--- 10/components/com_user/views/register/tmpl/default.php	2009-03-28 01:43:48.000000000 +0100
+++ 11/components/com_user/views/register/tmpl/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -17,7 +17,7 @@
 <form action="<?php echo JRoute::_( 'index.php?option=com_user' ); ?>" method="post" id="josForm" name="josForm" class="form-validate">
 
 <?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
-<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
 <?php endif; ?>
 
 <table cellpadding="0" cellspacing="0" border="0" width="100%" class="contentpane">
@@ -28,7 +28,7 @@
 		</label>
 	</td>
   	<td>
-  		<input type="text" name="name" id="name" size="40" value="<?php echo $this->user->get( 'name' );?>" class="inputbox required" maxlength="50" /> *
+  		<input type="text" name="name" id="name" size="40" value="<?php echo $this->escape($this->user->get( 'name' ));?>" class="inputbox required" maxlength="50" /> *
   	</td>
 </tr>
 <tr>
@@ -38,7 +38,7 @@
 		</label>
 	</td>
 	<td>
-		<input type="text" id="username" name="username" size="40" value="<?php echo $this->user->get( 'username' );?>" class="inputbox required validate-username" maxlength="25" /> *
+		<input type="text" id="username" name="username" size="40" value="<?php echo $this->escape($this->user->get( 'username' ));?>" class="inputbox required validate-username" maxlength="25" /> *
 	</td>
 </tr>
 <tr>
@@ -48,7 +48,7 @@
 		</label>
 	</td>
 	<td>
-		<input type="text" id="email" name="email" size="40" value="<?php echo $this->user->get( 'email' );?>" class="inputbox required validate-email" maxlength="100" /> *
+		<input type="text" id="email" name="email" size="40" value="<?php echo $this->escape($this->user->get( 'email' ));?>" class="inputbox required validate-email" maxlength="100" /> *
 	</td>
 </tr>
 <tr>
diff -aruN --binary 10/components/com_user/views/remind/tmpl/default.php 11/components/com_user/views/remind/tmpl/default.php
--- 10/components/com_user/views/remind/tmpl/default.php	2009-03-28 01:43:48.000000000 +0100
+++ 11/components/com_user/views/remind/tmpl/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,7 +1,7 @@
 <?php defined('_JEXEC') or die; ?>
 
 <?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
-	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->escape($this->params->get('page_title')); ?>
 	</div>
 <?php endif; ?>
diff -aruN --binary 10/components/com_user/views/reset/tmpl/confirm.php 11/components/com_user/views/reset/tmpl/confirm.php
--- 10/components/com_user/views/reset/tmpl/confirm.php	2009-03-28 01:43:48.000000000 +0100
+++ 11/components/com_user/views/reset/tmpl/confirm.php	2009-06-02 23:51:36.000000000 +0200
@@ -4,7 +4,7 @@
 	<?php echo JText::_('Confirm your Account'); ?>
 </div>
 
-<form action="<?php echo JRoute::_( 'index.php?option=com_user&amp;task=confirmreset' ); ?>" method="post" class="josForm form-validate">
+<form action="<?php echo JRoute::_( 'index.php?option=com_user&task=confirmreset' ); ?>" method="post" class="josForm form-validate">
 	<table cellpadding="0" cellspacing="0" border="0" width="100%" class="contentpane">
 		<tr>
 			<td colspan="2" height="40">
@@ -23,4 +23,4 @@
 
 	<button type="submit" class="validate"><?php echo JText::_('Submit'); ?></button>
 	<?php echo JHTML::_( 'form.token' ); ?>
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/components/com_user/views/reset/tmpl/default.php 11/components/com_user/views/reset/tmpl/default.php
--- 10/components/com_user/views/reset/tmpl/default.php	2009-03-28 01:43:48.000000000 +0100
+++ 11/components/com_user/views/reset/tmpl/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,7 +1,7 @@
 <?php defined('_JEXEC') or die; ?>
 
 <?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
-	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->escape($this->params->get('page_title')); ?>
 	</div>
 <?php endif; ?>
diff -aruN --binary 10/components/com_user/views/user/tmpl/default.php 11/components/com_user/views/user/tmpl/default.php
--- 10/components/com_user/views/user/tmpl/default.php	2009-03-28 01:43:48.000000000 +0100
+++ 11/components/com_user/views/user/tmpl/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,7 +1,7 @@
 <?php // no direct access
 defined('_JEXEC') or die('Restricted access'); ?>
 <?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
-	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->escape($this->params->get('page_title')); ?>
 	</div>
 <?php endif; ?>
@@ -9,7 +9,7 @@
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
 <tr>
 	<td>
-		<?php echo nl2br($this->params->get('welcome_desc', JText::_( 'WELCOME_DESC' ))); ?>
+		<?php echo nl2br($this->escape($this->params->get('welcome_desc', JText::_( 'WELCOME_DESC' )))); ?>
 	</td>
 </tr>
 </table>
diff -aruN --binary 10/components/com_user/views/user/tmpl/form.php 11/components/com_user/views/user/tmpl/form.php
--- 10/components/com_user/views/user/tmpl/form.php	2009-03-28 01:43:48.000000000 +0100
+++ 11/components/com_user/views/user/tmpl/form.php	2009-06-02 23:51:36.000000000 +0200
@@ -11,7 +11,7 @@
 
 <form action="<?php echo JRoute::_( 'index.php' ); ?>" method="post" name="userform" autocomplete="off" class="form-validate">
 <?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
-	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->escape($this->params->get('page_title')); ?>
 	</div>
 <?php endif; ?>
@@ -33,7 +33,7 @@
 		</label>
 	</td>
 	<td>
-		<input class="inputbox required" type="text" id="name" name="name" value="<?php echo $this->user->get('name');?>" size="40" />
+		<input class="inputbox required" type="text" id="name" name="name" value="<?php echo $this->escape($this->user->get('name'));?>" size="40" />
 	</td>
 </tr>
 <tr>
@@ -43,7 +43,7 @@
 		</label>
 	</td>
 	<td>
-		<input class="inputbox required validate-email" type="text" id="email" name="email" value="<?php echo $this->user->get('email');?>" size="40" />
+		<input class="inputbox required validate-email" type="text" id="email" name="email" value="<?php echo $this->escape($this->user->get('email'));?>" size="40" />
 	</td>
 </tr>
 <?php if($this->user->get('password')) : ?>
diff -aruN --binary 10/components/com_weblinks/views/categories/tmpl/default.php 11/components/com_weblinks/views/categories/tmpl/default.php
--- 10/components/com_weblinks/views/categories/tmpl/default.php	2008-07-06 23:39:06.000000000 +0200
+++ 11/components/com_weblinks/views/categories/tmpl/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,15 +1,15 @@
 <?php // no direct access
 defined('_JEXEC') or die('Restricted access'); ?>
 <?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
-	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->escape($this->params->get('page_title')); ?>
 	</div>
 <?php endif; ?>
 
 <?php if ( ($this->params->def('image', -1) != -1) || $this->params->def('show_comp_description', 1) ) : ?>
-<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <tr>
-	<td valign="top" class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<td valign="top" class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php
 		if ( isset($this->image) ) :  echo $this->image; endif;
 		echo $this->params->get('comp_description');
@@ -21,7 +21,7 @@
 <ul>
 <?php foreach ( $this->categories as $category ) : ?>
 	<li>
-		<a href="<?php echo $category->link; ?>" class="category<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+		<a href="<?php echo $category->link; ?>" class="category<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 			<?php echo $this->escape($category->title);?></a>
 		&nbsp;
 		<span class="small">
diff -aruN --binary 10/components/com_weblinks/views/category/tmpl/default_items.php 11/components/com_weblinks/views/category/tmpl/default_items.php
--- 10/components/com_weblinks/views/category/tmpl/default_items.php	2008-07-06 23:39:06.000000000 +0200
+++ 11/components/com_weblinks/views/category/tmpl/default_items.php	2009-06-02 23:51:36.000000000 +0200
@@ -21,15 +21,15 @@
 </tr>
 <?php if ( $this->params->def( 'show_headings', 1 ) ) : ?>
 <tr>
-	<td width="10" style="text-align:right;" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<td width="10" style="text-align:right;" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo JText::_('Num'); ?>
 	</td>
-	<td width="90%" height="20" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<td width="90%" height="20" class="sectiontableheader<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 		<?php echo JHTML::_('grid.sort',  'Web Link', 'title', $this->lists['order_Dir'], $this->lists['order'] ); ?>
 	</td>
 	<?php if ( $this->params->get( 'show_link_hits' ) ) : ?>
 
-	<td width="30" height="20" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>" style="text-align:center;" nowrap="nowrap">
+	<td width="30" height="20" class="sectiontableheader<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>" style="text-align:center;" nowrap="nowrap">
 		<?php echo JHTML::_('grid.sort',  'Hits', 'hits', $this->lists['order_Dir'], $this->lists['order'] ); ?>
 	</td>
 	<?php endif; ?>
@@ -46,7 +46,7 @@
 		<?php endif; ?>
 		<?php echo $item->link; ?>
 		<?php if ( $this->params->get( 'show_link_description' ) ) : ?>
-		<br /><span class="description"><?php echo nl2br($item->description); ?></span>
+		<br /><span class="description"><?php echo nl2br($this->escape($item->description)); ?></span>
 		<?php endif; ?>
 	</td>
 	<?php if ( $this->params->get( 'show_link_hits' ) ) : ?>
@@ -57,7 +57,7 @@
 </tr>
 <?php endforeach; ?>
 <tr>
-	<td align="center" colspan="4" class="sectiontablefooter<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<td align="center" colspan="4" class="sectiontablefooter<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->pagination->getPagesLinks(); ?>
 	</td>
 </tr>
@@ -69,4 +69,4 @@
 </table>
 <input type="hidden" name="filter_order" value="<?php echo $this->lists['order']; ?>" />
 <input type="hidden" name="filter_order_Dir" value="" />
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/components/com_weblinks/views/category/tmpl/default.php 11/components/com_weblinks/views/category/tmpl/default.php
--- 10/components/com_weblinks/views/category/tmpl/default.php	2008-07-06 23:39:06.000000000 +0200
+++ 11/components/com_weblinks/views/category/tmpl/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,14 +1,14 @@
 <?php defined('_JEXEC') or die('Restricted access'); ?>
 <?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
-	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->escape($this->params->get('page_title')); ?>
 	</div>
 <?php endif; ?>
 
-<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center" class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <?php if ( @$this->category->image || @$this->category->description ) : ?>
 <tr>
-	<td valign="top" class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<td valign="top" class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php
 		if ( isset($this->category->image) ) :  echo $this->category->image; endif;
 		echo $this->category->description;
@@ -27,7 +27,7 @@
 		<ul>
 		<?php foreach ( $this->categories as $category ) : ?>
 			<li>
-				<a href="<?php echo $category->link; ?>" class="category<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+				<a href="<?php echo $category->link; ?>" class="category<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 					<?php echo $this->escape($category->title);?></a>
 				&nbsp;
 				<span class="small">
diff -aruN --binary 10/components/com_weblinks/views/category/view.feed.php 11/components/com_weblinks/views/category/view.feed.php
--- 10/components/com_weblinks/views/category/view.feed.php	2008-07-06 23:39:06.000000000 +0200
+++ 11/components/com_weblinks/views/category/view.feed.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: view.feed.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: view.feed.php 11782 2009-04-24 17:25:58Z kdevine $
 * @package		Joomla
 * @subpackage	Weblinks
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -36,6 +36,10 @@
 		$document->link = JRoute::_('index.php?option=com_weblinks&view=category&id='.JRequest::getVar('id',null, '', 'int'));
 
 		JRequest::setVar('limit', $mainframe->getCfg('feed_limit'));
+		$siteEmail = $mainframe->getCfg('mailfrom');
+		$fromName = $mainframe->getCfg('fromname');
+		$document->editor = $fromName;
+		$document->editorEmail = $siteEmail;
 
 		// Get some data from the model
 		$items		=& $this->get( 'data' );
diff -aruN --binary 10/components/com_weblinks/views/category/view.html.php 11/components/com_weblinks/views/category/view.html.php
--- 10/components/com_weblinks/views/category/view.html.php	2008-09-09 16:19:40.000000000 +0200
+++ 11/components/com_weblinks/views/category/view.html.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: view.html.php 10752 2008-08-23 01:53:31Z eddieajau $
+* @version		$Id: view.html.php 11917 2009-05-29 19:37:05Z ian $
 * @package		Joomla
 * @subpackage	Weblinks
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -117,7 +117,7 @@
 
 			$link = JRoute::_( 'index.php?view=weblink&catid='.$category->slug.'&id='. $item->slug);
 
-			$menuclass = 'category'.$params->get( 'pageclass_sfx' );
+			$menuclass = 'category'.$this->escape($params->get( 'pageclass_sfx' ));
 
 			$itemParams = new JParameter($item->params);
 			switch ($itemParams->get('target', $params->get('target')))
diff -aruN --binary 10/components/com_weblinks/views/weblink/tmpl/form.php 11/components/com_weblinks/views/weblink/tmpl/form.php
--- 10/components/com_weblinks/views/weblink/tmpl/form.php	2008-07-06 23:39:06.000000000 +0200
+++ 11/components/com_weblinks/views/weblink/tmpl/form.php	2009-06-02 23:51:36.000000000 +0200
@@ -23,7 +23,7 @@
 
 <form action="<?php echo $this->action ?>" method="post" name="adminForm" id="adminForm">
 <?php if ( $this->params->def( 'show_page_title', 1 ) ) : ?>
-	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php echo $this->escape($this->params->get('page_title')); ?>
 	</div>
 <?php endif; ?>
@@ -55,7 +55,7 @@
 		</label>
 	</td>
 	<td>
-		<input class="inputbox" type="text" id="jformurl" name="jform[url]" value="<?php echo $this->weblink->url; ?>" size="50" maxlength="250" />
+		<input class="inputbox" type="text" id="jformurl" name="jform[url]" value="<?php echo $this->escape($this->weblink->url); ?>" size="50" maxlength="250" />
 	</td>
 </tr>
 <tr>
diff -aruN --binary 10/components/com_wrapper/views/wrapper/tmpl/default.php 11/components/com_wrapper/views/wrapper/tmpl/default.php
--- 10/components/com_wrapper/views/wrapper/tmpl/default.php	2008-07-06 23:39:04.000000000 +0200
+++ 11/components/com_wrapper/views/wrapper/tmpl/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -12,10 +12,10 @@
 	}
 }
 </script>
-<div class="contentpane<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<div class="contentpane<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 <?php if ( $this->params->get( 'show_page_title', 1 ) ) : ?>
-	<div class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
-	<?php echo $this->params->get( 'page_title' ); ?>
+	<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
+	<?php echo $this->escape($this->params->get( 'page_title' )); ?>
 	</div>
 <?php endif; ?>
 <iframe <?php echo $this->wrapper->load; ?>
@@ -27,7 +27,7 @@
 	scrolling="<?php echo $this->params->get( 'scrolling' ); ?>"
 	align="top"
 	frameborder="0"
-	class="wrapper<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	class="wrapper<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo JText::_( 'NO_IFRAMES' ); ?>
 </iframe>
 </div>
diff -aruN --binary 10/CREDITS.php 11/CREDITS.php
--- 10/CREDITS.php	2009-03-28 01:43:38.000000000 +0100
+++ 11/CREDITS.php	2009-06-02 23:51:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: CREDITS.php 11714 2009-03-27 10:27:44Z willebil $
+ * @version		$Id: CREDITS.php 11924 2009-05-30 08:11:59Z pasamio $
  * @package		Joomla
  * @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
@@ -81,7 +81,7 @@
 Czech (cs-CZ) - Czech Translation Team - Svatopluk Vit
 Danish (da-DK) - Danish Translation Team - Ronny Buelund, Mikael Winther, Ole Bang Ottosen
 Dutch (nl-NL) - Dutch Translation Team - Vancanneyt Sander, Marijke Stuivenberg
-English (en-US) - Joomla! Project - Jennifer Marriot
+English (en-US) -  US English Translation Team - Jennifer Marriott
 Esperanto (eo-XX) - Esperanto Translation Team - Cindy McKee, Fabien Tschudy
 Estonian (et-EE) - Estonian Translation Team - Rivo Zängov
 Finnish (fi-FI) - Finnish Translation Team - Markku Suominen
@@ -94,7 +94,7 @@
 Hungarian (hu-HU) - Magyar Joomla! Felhasznalok Nemzetkozi Egyesulete - Jozsef Tamas Herczeg, Annamaria Ban
 Icelandic (is-IS) - Joomlis! Icelandic Joomla Community [joomlis.net] - Magnús Guðlaugsson
 Italian (it-IT) - Italian Translation Team - Stefania Gaianigo, Alessandro Rossi
-Japanese (ja-JP) - Japanese Translation Team - Noriaki Koide
+Japanese (ja-JP) - Japanese Translation Team - Noriaki Koide, Hiroko Hirano
 Laotian (lo-LA) - Joomla LaiLao Team (LaoOpenSource) - Akarawuth Tamrareang , Viengsakhone phanthanousy , Outhai Saioudom
 Latvian (lv-LV) - Joomla Latvian Team - Edgars Piruška, Iveta Rītiņa-Namiķe, Ingars Stepkāns
 Lithuanian (lt-LT) - Lithuanian Translation Team - Stasys Svabas
diff -aruN --binary 10/includes/framework.php 11/includes/framework.php
--- 10/includes/framework.php	2009-03-28 01:43:48.000000000 +0100
+++ 11/includes/framework.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: framework.php 11704 2009-03-25 21:15:56Z willebil $
+* @version		$Id: framework.php 11987 2009-06-03 01:08:57Z ian $
 * @package		Joomla
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
diff -aruN --binary 10/includes/router.php 11/includes/router.php
--- 10/includes/router.php	2009-03-28 01:43:48.000000000 +0100
+++ 11/includes/router.php	2009-06-02 23:51:36.000000000 +0200
@@ -244,10 +244,17 @@
 
 			if (file_exists($path) && count($segments))
 			{
-				if ($component != "com_search") { // Cheep fix on searches
+				if ($component != "com_search") { // Cheap fix on searches
 					//decode the route segments
 					$segments = $this->_decodeSegments($segments);
 				}
+				else { // fix up search for URL
+					$total = count($segments);
+					for($i=0; $i<$total; $i++) {
+						// urldecode twice because it is encoded twice
+						$segments[$i] = urldecode(urldecode(stripcslashes($segments[$i])));
+					}
+				}
 
 				require_once $path;
 				$function =  substr($component, 4).'ParseRoute';
diff -aruN --binary 10/language/es-ES/es-ES.xml 11/language/es-ES/es-ES.xml
--- 10/language/es-ES/es-ES.xml	2009-03-28 20:34:28.000000000 +0100
+++ 11/language/es-ES/es-ES.xml	2009-05-21 07:55:10.000000000 +0200
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="1.5"  client="site" >
-	<name>Español (Spanish Formal Internacional)</name>
 	<tag>es-ES</tag>
-	<version>1.5.10</version>
-	<creationDate>2009-03-28</creationDate>
+	<name>Español (spanish formal Internacional)</name>
+	<description>Idioma creado por Joomla! Spanish para Joomla 1.5 zona frontal - Traductor oficial asociado</description>
+	<version>1.5.11</version>
+	<creationDate>2009-05-21</creationDate>
 	<author>Joomla! Spanish</author>
-	<authorEmail>extensiones@joomlaspanish.org</authorEmail>
 	<authorUrl>www.joomlaspanish.org</authorUrl>
+	<authorEmail>extensiones@joomlaspanish.org</authorEmail>
 	<copyright>(C) 2009 JoomlaSpanish.org  All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<description>Idioma creado por Joomla! Spanish para Joomla 1.5 zona frontal - Traductor oficial asociado</description>
 	<metadata>
 		<name>Español (spanish formal Internacional)</name>
 		<tag>es-ES</tag>
@@ -19,5 +19,5 @@
 		<backwardLang>spanish</backwardLang>
 		<pdfFontName>freesans</pdfFontName>
 	</metadata>
-	<params />
-</metafile>
\ No hay ningún carácter de nueva línea al final del fichero
+	<params></params>
+</metafile>
diff -aruN --binary 10/libraries/joomla/database/table/content.php 11/libraries/joomla/database/table/content.php
--- 10/libraries/joomla/database/table/content.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/libraries/joomla/database/table/content.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: content.php 11305 2008-11-23 19:14:25Z ian $
+* @version		$Id: content.php 11809 2009-05-13 16:09:23Z ian $
 * @package		Joomla.Framework
 * @subpackage	Table
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -60,10 +60,6 @@
 	/** @var time */
 	var $checked_out_time		= 0;
 	/** @var datetime */
-	var $frontpage_up		= null;
-	/** @var datetime */
-	var $frontpage_down		= null;
-	/** @var datetime */
 	var $publish_up			= null;
 	/** @var datetime */
 	var $publish_down		= null;
diff -aruN --binary 10/libraries/joomla/document/feed/renderer/rss.php 11/libraries/joomla/document/feed/renderer/rss.php
--- 10/libraries/joomla/document/feed/renderer/rss.php	2009-03-28 01:44:00.000000000 +0100
+++ 11/libraries/joomla/document/feed/renderer/rss.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: rss.php 11687 2009-03-11 17:49:23Z ian $
+ * @version		$Id: rss.php 11806 2009-05-10 00:28:51Z kdevine $
  * @package		Joomla.Framework
  * @subpackage	Document
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -50,7 +50,7 @@
 
 		$uri =& JFactory::getURI();
 		$url = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
-		$syndicationURL =& JRoute::_('&format=feed&type=atom');
+		$syndicationURL =& JRoute::_('&format=feed&type=rss');
 		
 		$feed = "<rss version=\"2.0\" xmlns:atom=\"http://www.w3.org/2005/Atom\">\n";
 		$feed.= "	<channel>\n";
@@ -59,7 +59,6 @@
 		$feed.= "		<link>".str_replace(' ','%20',$url.$data->link)."</link>\n";
 		$feed.= "		<lastBuildDate>".htmlspecialchars($now->toRFC822(), ENT_COMPAT, 'UTF-8')."</lastBuildDate>\n";
 		$feed.= "		<generator>".$data->getGenerator()."</generator>\n";
-		$feed.= '       <atom:link rel="self" type="application/atom+xml" href="'.str_replace(' ','%20',$url.$syndicationURL).'" />';
 	
 		if ($data->image!=null)
 		{
@@ -84,8 +83,9 @@
 		if ($data->copyright!="") {
 			$feed.= "		<copyright>".htmlspecialchars($data->copyright,ENT_COMPAT, 'UTF-8')."</copyright>\n";
 		}
-		if ($data->editor!="") {
-			$feed.= "		<managingEditor>".htmlspecialchars($data->editor, ENT_COMPAT, 'UTF-8')."</managingEditor>\n";
+		if ($data->editorEmail!="") {
+			$feed.= "		<managingEditor>".htmlspecialchars($data->editorEmail, ENT_COMPAT, 'UTF-8').' ('.
+				htmlspecialchars($data->editor, ENT_COMPAT, 'UTF-8').")</managingEditor>\n";
 		}
 		if ($data->webmaster!="") {
 			$feed.= "		<webMaster>".htmlspecialchars($data->webmaster, ENT_COMPAT, 'UTF-8')."</webMaster>\n";
@@ -121,6 +121,7 @@
 			$feed.= "		<item>\n";
 			$feed.= "			<title>".htmlspecialchars(strip_tags($data->items[$i]->title), ENT_COMPAT, 'UTF-8')."</title>\n";
 			$feed.= "			<link>".str_replace(' ','%20',$data->items[$i]->link)."</link>\n";
+			$feed.= "			<guid>".str_replace(' ','%20',$data->items[$i]->link)."</guid>\n";
 			$feed.= "			<description><![CDATA[".$this->_relToAbs($data->items[$i]->description)."]]></description>\n";
 
 			if ($data->items[$i]->authorEmail!="") {
@@ -173,7 +174,7 @@
 	function _relToAbs($text)
 	{
 		$base = JURI::base();
-  		$text = preg_replace("/(href|src)=\"(?!http|ftp|https)([^\"]*)\"/", "$1=\"$base\$2\"", $text);
+  		$text = preg_replace("/(href|src)=\"(?!http|ftp|https|mailto)([^\"]*)\"/", "$1=\"$base\$2\"", $text);
 
 		return $text;
 	}
diff -aruN --binary 10/libraries/joomla/document/html/renderer/head.php 11/libraries/joomla/document/html/renderer/head.php
--- 10/libraries/joomla/document/html/renderer/head.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/libraries/joomla/document/html/renderer/head.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: head.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: head.php 11917 2009-05-29 19:37:05Z ian $
 * @package		Joomla.Framework
 * @subpackage	Document
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -74,7 +74,7 @@
 				if ($type == 'http-equiv') {
 					$strHtml .= $tab.'<meta http-equiv="'.$name.'" content="'.$content.'"'.$tagEnd.$lnEnd;
 				} elseif ($type == 'standard') {
-					$strHtml .= $tab.'<meta name="'.$name.'" content="'.$content.'"'.$tagEnd.$lnEnd;
+					$strHtml .= $tab.'<meta name="'.$name.'" content="'.str_replace('"',"'",$content).'"'.$tagEnd.$lnEnd;
 				}
 			}
 		}
@@ -155,4 +155,4 @@
 
 		return $strHtml;
 	}
-}
\ No hay ningún carácter de nueva línea al final del fichero
+}
diff -aruN --binary 10/libraries/joomla/document/html/renderer/module.php 11/libraries/joomla/document/html/renderer/module.php
--- 10/libraries/joomla/document/html/renderer/module.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/libraries/joomla/document/html/renderer/module.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: module.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: module.php 11810 2009-05-13 16:14:07Z ian $
 * @package		Joomla.Framework
 * @subpackage	Document
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -73,13 +73,13 @@
 
 		$contents = '';
 		if ($mod_params->get('cache', 0) && $conf->getValue( 'config.caching' ))
-		{
+		{	
 			$cache =& JFactory::getCache( $module->module );
 
 			$cache->setLifeTime( $mod_params->get( 'cache_time', $conf->getValue( 'config.cachetime' ) * 60 ) );
 			$cache->setCacheValidation(true);
 
-			$contents =  $cache->get( array('JModuleHelper', 'renderModule'), array( $module, $params ), $module->id. $user->get('aid', 0) );
+			$contents =  $cache->get( array('JModuleHelper', 'renderModule'), array( $module, $params ), $module->id. $user->get('aid', 0).md5(JRequest::getURI()) );
 		} else {
 			$contents = JModuleHelper::renderModule($module, $params);
 		}
diff -aruN --binary 10/libraries/joomla/factory.php 11/libraries/joomla/factory.php
--- 10/libraries/joomla/factory.php	2009-03-28 01:44:00.000000000 +0100
+++ 11/libraries/joomla/factory.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: factory.php 11680 2009-03-08 20:51:13Z willebil $
+ * @version		$Id: factory.php 11811 2009-05-13 16:16:52Z ian $
  * @package		Joomla.Framework
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
@@ -130,7 +130,7 @@
 	 * if it doesn't already exist.
 	 *
 	 * @access public
-	 * @return object JLanguage
+	 * @return object JDocument
 	 */
 	function &getDocument()
 	{
diff -aruN --binary 10/libraries/joomla/filesystem/file.php 11/libraries/joomla/filesystem/file.php
--- 10/libraries/joomla/filesystem/file.php	2009-03-28 01:44:00.000000000 +0100
+++ 11/libraries/joomla/filesystem/file.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: file.php 11656 2009-03-08 20:05:54Z willebil $
+ * @version		$Id: file.php 11807 2009-05-10 00:33:43Z kdevine $
  * @package		Joomla.Framework
  * @subpackage	FileSystem
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -374,7 +374,11 @@
 	 * @since 1.5
 	 */
 	function getName($file) {
-		$slash = strrpos($file, DS) + 1;
-		return substr($file, $slash);
+		$slash = strrpos($file, DS);
+		if ($slash !== false) {
+			return substr($file, $slash + 1);
+		} else {
+			return $file;
+		}
 	}
 }
diff -aruN --binary 10/libraries/joomla/installer/adapters/component.php 11/libraries/joomla/installer/adapters/component.php
--- 10/libraries/joomla/installer/adapters/component.php	2009-03-28 01:44:00.000000000 +0100
+++ 11/libraries/joomla/installer/adapters/component.php	2009-06-02 23:51:36.000000000 +0200
@@ -189,34 +189,55 @@
 		// If there is an install file, lets copy it.
 		$installScriptElement =& $this->manifest->getElementByPath('installfile');
 		if (is_a($installScriptElement, 'JSimpleXMLElement')) {
-			// Make sure it hasn't already been copied (this would be an error in the xml install file)
-			// Only copy over an existing file when upgrading components
-			if (!file_exists($this->parent->getPath('extension_administrator').DS.$installScriptElement->data()) || $this->parent->getOverwrite())
-			{
-				$path['src']	= $this->parent->getPath('source').DS.$installScriptElement->data();
-				$path['dest']	= $this->parent->getPath('extension_administrator').DS.$installScriptElement->data();
-				if (!$this->parent->copyFiles(array ($path))) {
-					// Install failed, rollback changes
-					$this->parent->abort(JText::_('Component').' '.JText::_('Install').': '.JText::_('Could not copy PHP install file.'));
-					return false;
+			// check if it actually has a value
+			$installScriptFilename = $installScriptElement->data();
+			if(empty($installScriptFilename)) {
+				if(JDEBUG) JError::raiseWarning(43, JText::sprintf('BLANKSCRIPTELEMENT', JText::_('install')));
+			} else {
+				// Make sure it hasn't already been copied (this would be an error in the xml install file)
+				// Only copy over an existing file when upgrading components
+				if (!file_exists($this->parent->getPath('extension_administrator').DS.$installScriptFilename) || $this->parent->getOverwrite())
+				{
+					$path['src']	= $this->parent->getPath('source').DS.$installScriptFilename;
+					$path['dest']	= $this->parent->getPath('extension_administrator').DS.$installScriptFilename;
+					if(file_exists($path['src']) && file_exists(dirname($path['dest']))) {
+						if (!$this->parent->copyFiles(array ($path))) {
+							// Install failed, rollback changes
+							$this->parent->abort(JText::_('Component').' '.JText::_('Install').': '.JText::_('Could not copy PHP install file.'));
+							return false;
+						}
+					} else if(JDEBUG) {
+						JError::raiseWarning(42, JText::sprintf('INVALIDINSTALLFILE', JText::_('install')));
+					}
 				}
+				$this->set('install.script', $installScriptFilename);
 			}
-			$this->set('install.script', $installScriptElement->data());
 		}
 
 		// If there is an uninstall file, lets copy it.
 		$uninstallScriptElement =& $this->manifest->getElementByPath('uninstallfile');
 		if (is_a($uninstallScriptElement, 'JSimpleXMLElement')) {
-			// Make sure it hasn't already been copied (this would be an error in the xml install file)
-			// Only copy over an existing file when upgrading components
-			if (!file_exists($this->parent->getPath('extension_administrator').DS.$uninstallScriptElement->data()) || $this->parent->getOverwrite())
-			{
-				$path['src']	= $this->parent->getPath('source').DS.$uninstallScriptElement->data();
-				$path['dest']	= $this->parent->getPath('extension_administrator').DS.$uninstallScriptElement->data();
-				if (!$this->parent->copyFiles(array ($path))) {
-					// Install failed, rollback changes
-					$this->parent->abort(JText::_('Component').' '.JText::_('Install').': '.JText::_('Could not copy PHP uninstall file.'));
-					return false;
+			// check it actually has a value
+			$uninstallScriptFilename = $uninstallScriptElement->data();
+			if(empty($uninstallScriptFilename)) {
+				// display a warning when we're in debug mode
+				if(JDEBUG) JError::raiseWarning(43, JText::sprintf('BLANKSCRIPTELEMENT', JText::_('uninstall')));
+			} else {
+				// Make sure it hasn't already been copied (this would be an error in the xml install file)
+				// Only copy over an existing file when upgrading components
+				if (!file_exists($this->parent->getPath('extension_administrator').DS.$uninstallScriptFilename) || $this->parent->getOverwrite())
+				{
+					$path['src']	= $this->parent->getPath('source').DS.$uninstallScriptFilename;
+					$path['dest']	= $this->parent->getPath('extension_administrator').DS.$uninstallScriptFilename;
+					if(file_exists($path['src']) && file_exists(dirname($path['dest']))) {
+						if (!$this->parent->copyFiles(array ($path))) {
+							// Install failed, rollback changes
+							$this->parent->abort(JText::_('Component').' '.JText::_('Install').': '.JText::_('Could not copy PHP install file.'));
+							return false;
+						}
+					} else if(JDEBUG) {
+						JError::raiseWarning(42, JText::sprintf('INVALIDINSTALLFILE', JText::_('uninstall')));
+					}
 				}
 			}
 		}
@@ -294,6 +315,11 @@
 			$this->parent->abort(JText::_('Component').' '.JText::_('Install').': '.JText::_('Could not copy setup file'));
 			return false;
 		}
+
+		// Load component lang file
+		$lang =& JFactory::getLanguage();
+		$lang->load(strtolower("com_".str_replace(" ", "", $this->get('name'))));
+
 		return true;
 	}
 
diff -aruN --binary 10/libraries/joomla/installer/adapters/module.php 11/libraries/joomla/installer/adapters/module.php
--- 10/libraries/joomla/installer/adapters/module.php	2009-03-28 01:44:00.000000000 +0100
+++ 11/libraries/joomla/installer/adapters/module.php	2009-06-02 23:51:36.000000000 +0200
@@ -159,10 +159,6 @@
 		$this->parent->parseMedia($this->manifest->getElementByPath('media'), $clientId);
 		$this->parent->parseLanguages($this->manifest->getElementByPath('languages'), $clientId);
 
-		// Load the language file
-		$lang		= & JFactory::getLanguage();
-		$lang->load($mname,$basePath);
-
 		// Parse deprecated tags
 		$this->parent->parseFiles($this->manifest->getElementByPath('images'), -1);
 
@@ -250,6 +246,11 @@
 			$this->parent->abort(JText::_('Module').' '.JText::_('Install').': '.JText::_('Could not copy setup file'));
 			return false;
 		}
+
+		// Load module language file
+		$lang =& JFactory::getLanguage();
+		$lang->load($row->module, JPATH_BASE.DS.'..');
+
 		return true;
 	}
 
diff -aruN --binary 10/libraries/joomla/installer/adapters/plugin.php 11/libraries/joomla/installer/adapters/plugin.php
--- 10/libraries/joomla/installer/adapters/plugin.php	2008-07-06 23:39:38.000000000 +0200
+++ 11/libraries/joomla/installer/adapters/plugin.php	2009-06-02 23:51:36.000000000 +0200
@@ -200,6 +200,11 @@
 			$this->parent->abort(JText::_('Plugin').' '.JText::_('Install').': '.JText::_('Could not copy setup file'));
 			return false;
 		}
+
+		// Load plugin language file
+		$lang =& JFactory::getLanguage();
+		$lang->load('plg_'.$group.'_'.$pname);
+
 		return true;
 	}
 
@@ -313,4 +318,4 @@
 		$db->setQuery($query);
 		return ($db->query() !== false);
 	}
-}
\ No hay ningún carácter de nueva línea al final del fichero
+}
diff -aruN --binary 10/libraries/joomla/installer/adapters/template.php 11/libraries/joomla/installer/adapters/template.php
--- 10/libraries/joomla/installer/adapters/template.php	2008-07-06 23:39:38.000000000 +0200
+++ 11/libraries/joomla/installer/adapters/template.php	2009-06-02 23:51:36.000000000 +0200
@@ -137,6 +137,11 @@
 			$this->parent->abort(JText::_('Template').' '.JText::_('Install').': '.JText::_('Could not copy setup file'));
 			return false;
 		}
+
+		// Load template language file
+		$lang =& JFactory::getLanguage();
+		$lang->load('tpl_'.$name);
+
 		return true;
 	}
 
@@ -192,4 +197,4 @@
 		}
 		return $retval;
 	}
-}
\ No hay ningún carácter de nueva línea al final del fichero
+}
diff -aruN --binary 10/libraries/joomla/user/authorization.php 11/libraries/joomla/user/authorization.php
--- 10/libraries/joomla/user/authorization.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/libraries/joomla/user/authorization.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: authorization.php 10834 2008-08-28 10:38:50Z eddieajau $
+* @version		$Id: authorization.php 11784 2009-04-24 17:34:11Z kdevine $
 * @package		Joomla.Framework
 * @subpackage	User
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -143,10 +143,6 @@
 		$this->addACL( 'com_media', 'popup', 'users', 'super administrator' );
 		$this->addACL( 'com_media', 'popup', 'users', 'administrator' );
 		$this->addACL( 'com_media', 'popup', 'users', 'manager' );
-		$this->addACL( 'com_media', 'popup', 'users', 'registered' );
-		$this->addACL( 'com_media', 'popup', 'users', 'author' );
-		$this->addACL( 'com_media', 'popup', 'users', 'editor' );
-		$this->addACL( 'com_media', 'popup', 'users', 'publisher' );
 
 		$this->addACL( 'com_menus', 'manage', 'users', 'administrator' );
 		$this->addACL( 'com_menus', 'manage', 'users', 'super administrator' );
@@ -532,4 +528,4 @@
 		$this->addACL($aco_section_value, $aco_value, $aro_section_value, $aro_value, $axo_section_value, $axo_value, $return_value);
 	}
 
-}
\ No hay ningún carácter de nueva línea al final del fichero
+}
diff -aruN --binary 10/libraries/joomla/version.php 11/libraries/joomla/version.php
--- 10/libraries/joomla/version.php	2009-03-28 01:44:02.000000000 +0100
+++ 11/libraries/joomla/version.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: version.php 11705 2009-03-25 22:06:15Z willebil $
+ * @version		$Id: version.php 11987 2009-06-03 01:08:57Z ian $
  * @package	Joomla.Framework
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
@@ -26,15 +26,15 @@
 	/** @var string Development Status */
 	var $DEV_STATUS = 'Production/Stable';
 	/** @var int Sub Release Level */
-	var $DEV_LEVEL 	= '10';
+	var $DEV_LEVEL 	= '11';
 	/** @var int build Number */
 	var $BUILD	= '';
 	/** @var string Codename */
-	var $CODENAME 	= 'Wohmamni';
+	var $CODENAME 	= 'Vea';
 	/** @var string Date */
-	var $RELDATE 	= '27-March-2009';
+	var $RELDATE 	= '03-June-2009';
 	/** @var string Time */
-	var $RELTIME 	= '23:00';
+	var $RELTIME 	= '03:30';
 	/** @var string Timezone */
 	var $RELTZ 	= 'GMT';
 	/** @var string Copyright Text */
diff -aruN --binary 10/modules/mod_login/tmpl/default.php 11/modules/mod_login/tmpl/default.php
--- 10/modules/mod_login/tmpl/default.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/modules/mod_login/tmpl/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -63,7 +63,7 @@
 		$usersConfig = &JComponentHelper::getParams( 'com_users' );
 		if ($usersConfig->get('allowUserRegistration')) : ?>
 		<li>
-			<a href="<?php echo JRoute::_( 'index.php?option=com_user&task=register' ); ?>">
+			<a href="<?php echo JRoute::_( 'index.php?option=com_user&view=register' ); ?>">
 				<?php echo JText::_('REGISTER'); ?></a>
 		</li>
 		<?php endif; ?>
diff -aruN --binary 10/modules/mod_mainmenu/helper.php 11/modules/mod_mainmenu/helper.php
--- 10/modules/mod_mainmenu/helper.php	2009-03-28 01:44:02.000000000 +0100
+++ 11/modules/mod_mainmenu/helper.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: helper.php 11674 2009-03-08 20:42:10Z willebil $
+* @version		$Id: helper.php 11799 2009-05-06 02:15:50Z ian $
 * @package		Joomla
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
@@ -300,8 +300,22 @@
 
 		$iParams = new JParameter($tmp->params);
 		if ($params->get('menu_images') && $iParams->get('menu_image') && $iParams->get('menu_image') != -1) {
-			$imgalign = $params->get('menu_images_align', 0) == 1 ? 'right' : 'left';
-			$image = '<img src="'.JURI::base(true).'/images/stories/'.$iParams->get('menu_image').'" align="'.$imgalign.'" alt="'.$item->alias.'" />';
+			switch ($params->get('menu_images_align', 0)){
+				case 0 : 
+				$imgalign='align="left"';
+				break;
+				
+				case 1 :
+				$imgalign='align="right"';
+				break;
+				
+				default :
+				$imgalign='';
+				break;
+			}
+				
+			
+			$image = '<img src="'.JURI::base(true).'/images/stories/'.$iParams->get('menu_image').'" '.$imgalign.' alt="'.$item->alias.'" />';
 			if($tmp->ionly){
 				 $tmp->name = null;
 			 }
diff -aruN --binary 10/modules/mod_mainmenu/mod_mainmenu.xml 11/modules/mod_mainmenu/mod_mainmenu.xml
--- 10/modules/mod_mainmenu/mod_mainmenu.xml	2008-07-06 23:39:44.000000000 +0200
+++ 11/modules/mod_mainmenu/mod_mainmenu.xml	2009-06-02 23:51:36.000000000 +0200
@@ -54,6 +54,7 @@
 		<param name="menu_images_align" type="radio" default="0" label="Menu Icon Alignment" description="Alignment of the Menu Icons">
 			<option value="0">Left</option>
 			<option value="1">Right</option>
+			<option value="2">None</option>
 		</param>
 		 <param name="menu_images_link" type="radio" default="0" label="Menu Icon Link" description="PARAMMENUICONLINK">
 		      	<option value="0">No</option>
diff -aruN --binary 10/plugins/content/pagenavigation.php 11/plugins/content/pagenavigation.php
--- 10/plugins/content/pagenavigation.php	2008-07-06 23:40:02.000000000 +0200
+++ 11/plugins/content/pagenavigation.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: pagenavigation.php 10381 2008-06-01 03:35:53Z pasamio $
+* @version		$Id: pagenavigation.php 11783 2009-04-24 17:28:10Z kdevine $
 * @package		Joomla
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
@@ -150,13 +150,13 @@
 		}
 
 		if ($row->prev) {
-			$row->prev = JRoute::_('index.php?option=com_content&view=article&catid='.$row->prev->catslug.'&id='.$row->prev->slug);
+			$row->prev = JRoute::_(ContentHelperRoute::getArticleRoute($row->prev->slug, $row->prev->catslug));
 		} else {
 			$row->prev = '';
 		}
 
 		if ($row->next) {
-			$row->next = JRoute::_('index.php?option=com_content&view=article&catid='.$row->next->catslug.'&id='.$row->next->slug);
+			$row->next = JRoute::_(ContentHelperRoute::getArticleRoute($row->next->slug, $row->next->catslug));
 		} else {
 			$row->next = '';
 		}
diff -aruN --binary 10/plugins/editors-xtd/image.php 11/plugins/editors-xtd/image.php
--- 10/plugins/editors-xtd/image.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/plugins/editors-xtd/image.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: image.php 10709 2008-08-21 09:58:52Z eddieajau $
+ * @version		$Id: image.php 11784 2009-04-24 17:34:11Z kdevine $
  * @package		Joomla
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
@@ -48,7 +48,18 @@
 	function onDisplay($name)
 	{
 		global $mainframe;
-
+		$params =& JComponentHelper::getParams('com_media');
+		$ranks = array('publisher', 'editor', 'author', 'registered');
+		$acl = & JFactory::getACL();
+		for($i = 0; $i < $params->get('allowed_media_usergroup', 3); $i++)
+		{
+			$acl->addACL( 'com_media', 'popup', 'users', $ranks[$i] );
+		}
+		//Make sure the user is authorized to view this page
+		$user = & JFactory::getUser();
+		if (!$user->authorize( 'com_media', 'popup' )) {
+			return;
+		}
 		$doc 		=& JFactory::getDocument();
 		$template 	= $mainframe->getTemplate();
 
@@ -65,4 +76,4 @@
 
 		return $button;
 	}
-}
\ No hay ningún carácter de nueva línea al final del fichero
+}
diff -aruN --binary 10/templates/beez/html/com_contact/category/default_items.php 11/templates/beez/html/com_contact/category/default_items.php
--- 10/templates/beez/html/com_contact/category/default_items.php	2008-07-06 23:40:12.000000000 +0200
+++ 11/templates/beez/html/com_contact/category/default_items.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,22 +1,22 @@
-<?php // @version $Id: default_items.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: default_items.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
 <?php foreach ($this->items as $item) : ?>
 <tr>
 	<td class="sectiontableentry" headers="Count">
-		<?php echo $item->count + 1; ?>
+		<?php echo (int)$item->count + 1; ?>
 	</td>
 
 	<?php if ($this->params->get('show_position')) : ?>
 	<td headers="Position" class="sectiontableentry<?php echo $item->odd; ?>">
-		<?php echo $item->con_position; ?>
+		<?php echo $this->escape($item->con_position); ?>
 	</td>
 	<?php endif; ?>
 
 	<td height="20" class="sectiontableentry" headers="Name">
-		<a href="<?php echo $item->link; ?>" class="category<?php echo $this->params->get('pageclass_sfx'); ?>">
-			<?php echo $item->name; ?></a>
+		<a href="<?php echo $item->link; ?>" class="category<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
+			<?php echo $this->escape($item->name); ?></a>
 	</td>
 
 	<?php if ($this->params->get('show_email')) : ?>
@@ -27,20 +27,20 @@
 
 	<?php if ($this->params->get('show_telephone')) : ?>
 	<td headers="Phone" class="sectiontableentry">
-		<?php echo $item->telephone; ?>
+		<?php echo $this->escape($item->telephone); ?>
 	</td>
 	<?php endif; ?>
 
 	<?php if ($this->params->get('show_mobile')) : ?>
 	<td headers="Mobile" class="sectiontableentry<?php echo $item->odd; ?>">
-		<?php echo $item->mobile; ?>
+		<?php echo $this->escape($item->mobile); ?>
 	</td>
 	<?php endif; ?>
 
 	<?php if ($this->params->get('show_fax')) : ?>
 	<td headers="Fax" class="sectiontableentry">
-		<?php echo $item->fax; ?>
+		<?php echo $this->escape($item->fax); ?>
 	</td>
 	<?php endif; ?>
 </tr>
-<?php endforeach; ?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php endforeach; ?>
diff -aruN --binary 10/templates/beez/html/com_contact/category/default.php 11/templates/beez/html/com_contact/category/default.php
--- 10/templates/beez/html/com_contact/category/default.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_contact/category/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,16 +1,16 @@
-<?php // @version $Id: default.php 11307 2008-11-24 00:21:48Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 $cparams = JComponentHelper::getParams ('com_media');
 ?>
 
 <?php if ($this->params->get('show_page_title',1)) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
 <?php if ($this->category->image || $this->category->description) : ?>
-<div class="contentdescription<?php echo $this->params->get('pageclass_sfx'); ?>">
+<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 	<?php if ($this->params->get('image') != -1 && $this->params->get('image') != '') : ?>
 	<img src="<?php echo $this->baseurl .'/'. 'images/stories' . '/'. $this->params->get('image'); ?>" class="image_<?php echo $this->params->get('image_align'); ?>" alt="<?php echo JText::_( 'Contacts' ); ?>" />
@@ -46,50 +46,50 @@
 	</div>
 	<?php endif; ?>
 
-	<input type="hidden" name="catid" value="<?php echo $this->category->id; ?>" />
+	<input type="hidden" name="catid" value="<?php echo (int)$this->category->id; ?>" />
 	<input type="hidden" name="filter_order" value="<?php echo $this->lists['order']; ?>" />
 	<input type="hidden" name="filter_order_Dir" value="" />
 
 </form>
 
-<table class="category<?php echo $this->params->get('pageclass_sfx'); ?>">
+<table class="category<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 	<?php if ($this->params->get('show_headings')) : ?>
 	<tr>
-		<th id="Count" class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>">
+		<th id="Count" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php echo JText::_('Num'); ?>
 		</th>
 
 		<?php if ($this->params->get('show_position')) : ?>
-		<th id="Position" class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>">
+		<th id="Position" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php echo JHTML::_('grid.sort', 'Position', 'cd.con_position', $this->lists['order_Dir'], $this->lists['order'] ); ?>
 		</th>
 		<?php endif; ?>
 
-		<th id="Name" class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>">
+		<th id="Name" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php echo JHTML::_('grid.sort', 'Name', 'cd.name', $this->lists['order_Dir'], $this->lists['order'] ); ?>
 		</th>
 
 		<?php if ($this->params->get('show_email')) : ?>
-		<th id="Mail" class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>">
+		<th id="Mail" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php echo JText::_('Email'); ?>
 		</th>
 		<?php endif; ?>
 
 		<?php if ( $this->params->get('show_telephone')) : ?>
-		<th id="Phone" class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>">
+		<th id="Phone" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php echo JText::_('Phone'); ?>
 		</th>
 		<?php endif; ?>
 
 		<?php if ($this->params->get('show_mobile')) : ?>
-		<th id="mobile" class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>">
+		<th id="mobile" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php echo JText::_('Mobile'); ?>
 		</th>
 		<?php endif; ?>
 
 		<?php if ( $this->params->get('show_fax')) : ?>
-		<th id="Fax" class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>">
+		<th id="Fax" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php echo JText::_('Fax'); ?>
 		</th>
 		<?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_contact/contact/default_address.php 11/templates/beez/html/com_contact/contact/default_address.php
--- 10/templates/beez/html/com_contact/contact/default_address.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/templates/beez/html/com_contact/contact/default_address.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: default_address.php 11215 2008-10-26 02:25:51Z ian $
+<?php // @version $Id: default_address.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -14,23 +14,23 @@
 	<?php endif; ?>
 
 	<?php if ($this->contact->address && $this->contact->params->get('show_street_address')) : ?>
-	<?php echo nl2br($this->contact->address); ?><br />
+	<?php echo nl2br($this->escape($this->contact->address)); ?><br />
 	<?php endif; ?>
 
 	<?php if ($this->contact->suburb && $this->contact->params->get('show_suburb')) : ?>
-	<?php echo $this->contact->suburb; ?><br />
+	<?php echo $this->escape($this->contact->suburb); ?><br />
 	<?php endif; ?>
 
 	<?php if ($this->contact->state && $this->contact->params->get('show_state')) : ?>
-	<?php echo $this->contact->state; ?><br />
+	<?php echo $this->escape($this->contact->state); ?><br />
 	<?php endif; ?>
 
 	<?php if ($this->contact->country && $this->contact->params->get('show_country')) : ?>
-	<?php echo $this->contact->country; ?><br />
+	<?php echo $this->escape($this->contact->country); ?><br />
 	<?php endif; ?>
 
 	<?php if ($this->contact->postcode && $this->contact->params->get('show_postcode')) : ?>
-	<?php echo $this->contact->postcode; ?><br />
+	<?php echo $this->escape($this->contact->postcode); ?><br />
 	<?php endif; ?>
 
 
@@ -53,7 +53,7 @@
     <?php if (( $this->contact->params->get('contact_icons') ==0) || ( $this->contact->params->get('contact_icons') ==1)): ?>
 	<span class="marker"><?php echo $this->contact->params->get('marker_telephone'); ?></span>
 	<?php endif; ?>
-	<?php echo nl2br($this->contact->telephone); ?><br />
+	<?php echo nl2br($this->escape($this->contact->telephone)); ?><br />
 
 	<?php endif; ?>
 
@@ -63,19 +63,19 @@
         <?php if (( $this->contact->params->get('contact_icons') ==0) || ( $this->contact->params->get('contact_icons') ==1)): ?>
 	<span class="marker"><?php echo $this->contact->params->get('marker_fax'); ?></span>
 	<?php endif; ?>
-	<?php echo nl2br($this->contact->fax); ?><br />
+	<?php echo nl2br($this->escape($this->contact->fax)); ?><br />
 	<?php endif; ?>
 
 	<?php if ( $this->contact->mobile && $this->contact->params->get( 'show_mobile' ) ) :?>
 	 <?php if (( $this->contact->params->get('contact_icons') ==0) || ( $this->contact->params->get('contact_icons') ==1)): ?>
 	<span class="marker"><?php echo $this->contact->params->get( 'marker_mobile' ); ?></span>
 	<?php endif; ?>
-	<?php echo nl2br($this->contact->mobile); ?><br />
+	<?php echo nl2br($this->escape($this->contact->mobile)); ?><br />
 	<?php endif; ?>
 
 	<?php if ($this->contact->webpage && $this->contact->params->get('show_webpage')) : ?>
-	<a href="<?php echo $this->contact->webpage; ?>" target="_blank">
-	<?php echo $this->contact->webpage; ?></a><br />
+	<a href="<?php echo $this->escape($this->contact->webpage); ?>" target="_blank">
+	<?php echo $this->escape($this->contact->webpage); ?></a><br />
 	<?php endif; ?>
 
 <?php endif; ?>
@@ -84,7 +84,7 @@
 <p>
 <?php if (( $this->contact->params->get('contact_icons') ==0) || ( $this->contact->params->get('contact_icons') ==1)): ?>
 <span class="marker"><?php echo $this->contact->params->get('marker_misc'); ?></span>
-<?php echo $this->contact->misc; ?>
+<?php echo $this->escape($this->contact->misc); ?>
 <?php endif; ?>
 </p>
-<?php endif; ?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_contact/contact/default_form.php 11/templates/beez/html/com_contact/contact/default_form.php
--- 10/templates/beez/html/com_contact/contact/default_form.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/templates/beez/html/com_contact/contact/default_form.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: default_form.php 11215 2008-10-26 02:25:51Z ian $
+<?php // @version $Id: default_form.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -20,25 +20,25 @@
 </script>
 
 <form action="<?php echo JRoute::_('index.php'); ?>" class="form-validate" method="post" name="emailForm" id="emailForm">
-	<div class="contact_email<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="contact_email<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 		<label for="contact_name">
 		<?php echo JText::_( 'Enter your name' ); ?>:</label>
 		<input type="text" name="name" id="contact_name" size="30" class="inputbox" value="" />
 	</div>
-	<div class="contact_email<?php echo  $this->params->get( 'pageclass_sfx' ); ?>"><label id="contact_emailmsg" for="contact_email">
+	<div class="contact_email<?php echo  $this->escape($this->params->get( 'pageclass_sfx' )); ?>"><label id="contact_emailmsg" for="contact_email">
 		<?php echo JText::_( 'Email address' ); ?>*:</label>
 		<input type="text" id="contact_email" name="email" size="30" value="" class="inputbox required validate-email" maxlength="100" />
 	</div>
-	<div class="contact_email<?php echo  $this->params->get( 'pageclass_sfx' ); ?>"><label for="contact_subject">
+	<div class="contact_email<?php echo  $this->escape($this->params->get( 'pageclass_sfx' )); ?>"><label for="contact_subject">
 		<?php echo JText::_( 'Message subject' ); ?>:</label>
 		<input type="text" name="subject" id="contact_subject" size="30" class="inputbox" value="" />
 	</div>
-		<div class="contact_email<?php echo $this->params->get( 'pageclass_sfx' ); ?>"><label id="contact_textmsg" for="contact_text" class="textarea">
+		<div class="contact_email<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>"><label id="contact_textmsg" for="contact_text" class="textarea">
 		<?php echo JText::_( 'Enter your message' ); ?>*:</label>
 		<textarea name="text" id="contact_text" class="inputbox required" rows="10" cols="40"></textarea>
 	</div>
 	<?php if ($this->contact->params->get( 'show_email_copy' )): ?>
-	<div class="contact_email_checkbox<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="contact_email_checkbox<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 	<input type="checkbox" name="email_copy" id="contact_email_copy" value="1"  />
 	<label for="contact_email_copy" class="copy">
 	<?php echo JText::_( 'EMAIL_A_COPY' ); ?>
@@ -47,7 +47,7 @@
 	<?php endif; ?>
 	<button class="button validate" type="submit"><?php echo JText::_('Send'); ?></button>
 	<input type="hidden" name="view" value="contact" />
-	<input type="hidden" name="id" value="<?php echo $this->contact->id; ?>" />
+	<input type="hidden" name="id" value="<?php echo (int)$this->contact->id; ?>" />
 	<input type="hidden" name="task" value="submit" />
 	<?php echo JHTML::_( 'form.token' ); ?>
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/templates/beez/html/com_contact/contact/default.php 11/templates/beez/html/com_contact/contact/default.php
--- 10/templates/beez/html/com_contact/contact/default.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_contact/contact/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,15 +1,15 @@
-<?php // @version $Id: default.php 11307 2008-11-24 00:21:48Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 $cparams = JComponentHelper::getParams ('com_media');
 ?>
 
 <?php if ($this->params->get('show_page_title',1) && $this->params->get('page_title') != $this->contact->name) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
-<div class="contact<?php echo $this->params->get('pageclass_sfx'); ?>">
+<div class="contact<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php if ($this->params->get('show_contact_list') && count($this->contacts) > 1) : ?>
 	<form method="post" name="selectForm" id="selectForm">
 		<?php echo JText::_('Select Contact'); ?>
@@ -21,19 +21,19 @@
 
 	<?php if ($this->contact->name && $this->contact->params->get('show_name')) : ?>
 	<p>
-		<?php echo $this->contact->name; ?>
+		<?php echo $this->escape($this->contact->name); ?>
 	</p>
 	<?php endif; ?>
 
 	<?php if ($this->contact->con_position && $this->contact->params->get('show_position')) : ?>
 	<p>
-		<?php echo $this->contact->con_position; ?>
+		<?php echo $this->escape($this->contact->con_position); ?>
 	</p>
 	<?php endif; ?>
 
 	<?php if ($this->contact->image && $this->contact->params->get('show_image')) : ?>
 	<div style="float: right;">
-		<?php echo JHTML::_('image', 'images/stories' . '/'.$this->contact->image, JText::_( 'Contact' ), array('align' => 'middle')); ?>
+		<?php echo JHTML::_('image', 'images/stories' . '/'.$this->escape($this->contact->image), JText::_( 'Contact' ), array('align' => 'middle')); ?>
 	</div>
 	<?php endif; ?>
 
@@ -42,7 +42,7 @@
 	<?php if ( $this->contact->params->get('allow_vcard')) : ?>
 	<p>
 		<?php echo JText::_('Download information as a'); ?>
-		<a href="index.php?option=com_contact&amp;task=vcard&amp;contact_id=<?php echo $this->contact->id; ?>&amp;format=raw">
+		<a href="index.php?option=com_contact&amp;task=vcard&amp;contact_id=<?php echo (int)$this->contact->id; ?>&amp;format=raw">
 			<?php echo JText::_('VCard'); ?></a>
 	</p>
 	<?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_content/article/default.php 11/templates/beez/html/com_content/article/default.php
--- 10/templates/beez/html/com_content/article/default.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_content/article/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: default.php 11386 2009-01-04 02:34:35Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -11,16 +11,16 @@
 <?php endif; ?>
 
 <?php if ($this->params->get('show_page_title',1) && $this->params->get('page_title') != $this->article->title) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
         <?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
 <?php if ($this->params->get('show_title')) : ?>
-<h2 class="contentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h2 class="contentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php if ($this->params->get('link_titles') && $this->article->readmore_link != '') : ?>
-	<a href="<?php echo $this->article->readmore_link; ?>" class="contentpagetitle<?php echo $this->params->get('pageclass_sfx'); ?>">
-		<?php echo $this->article->title; ?></a>
+	<a href="<?php echo $this->article->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
+		<?php echo $this->escape($this->article->title); ?></a>
 	<?php else :
 		echo $this->escape($this->article->title);
 	endif; ?>
@@ -37,7 +37,7 @@
 
 	<?php if (($this->params->get('show_author')) && ($this->article->author != "")) : ?>
 	<span class="createdby">
-		<?php JText::printf('Written by', ($this->article->created_by_alias ? $this->article->created_by_alias : $this->article->author)); ?>
+		<?php JText::printf('Written by', ($this->article->created_by_alias ? $this->escape($this->article->created_by_alias) : $this->escape($this->article->author))); ?>
 	</span>
 	<?php endif; ?>
 
@@ -77,7 +77,7 @@
 		<?php if ($this->params->get('link_section')) : ?>
 			<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->article->sectionid)).'">'; ?>
 		<?php endif; ?>
-		<?php echo $this->article->section; ?>
+		<?php echo $this->escape($this->article->section); ?>
 		<?php if ($this->params->get('link_section')) : ?>
 			<?php echo '</a>'; ?>
 		<?php endif; ?>
@@ -91,7 +91,7 @@
 		<?php if ($this->params->get('link_category')) : ?>
 			<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->article->catslug, $this->article->sectionid)).'">'; ?>
 		<?php endif; ?>
-		<?php echo $this->article->category; ?>
+		<?php echo $this->escape($this->article->category); ?>
 		<?php if ($this->params->get('link_category')) : ?>
 			<?php echo '</a>'; ?>
 		<?php endif; ?>
@@ -104,8 +104,8 @@
 
 <?php if ($this->params->get('show_url') && $this->article->urls) : ?>
 <span class="small">
-	<a href="<?php echo $this->article->urls; ?>" target="_blank">
-		<?php echo $this->article->urls; ?></a>
+	<a href="<?php echo $this->escape($this->article->urls); ?>" target="_blank">
+		<?php echo $this->escape($this->article->urls); ?></a>
 </span>
 <?php endif; ?>
 
diff -aruN --binary 10/templates/beez/html/com_content/article/form.php 11/templates/beez/html/com_content/article/form.php
--- 10/templates/beez/html/com_content/article/form.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/templates/beez/html/com_content/article/form.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version: $Id: form.php 10822 2008-08-27 17:16:00Z tcp $
+<?php // @version: $Id: form.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 <script language="javascript" type="text/javascript">
@@ -49,7 +49,7 @@
 //-->
 </script>
 <?php if ($this->params->get('show_page_title', 1)) : ?>
-<div class="componentheading<?php echo $this->params->get('pageclass_sfx')?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
 <?php endif; ?>
 <form action="<?php echo $this->action ?>" method="post" name="adminForm" onSubmit="setgood();" class="editor">
 <fieldset>
@@ -123,7 +123,7 @@
 			<?php echo JText::_( 'Author Alias' ); ?>:
 		</label>
 
-		<input type="text" id="created_by_alias" name="created_by_alias" size="50" maxlength="100" value="<?php echo $this->article->created_by_alias; ?>" class="inputbox" />
+		<input type="text" id="created_by_alias" name="created_by_alias" size="50" maxlength="100" value="<?php echo $this->escape($this->article->created_by_alias); ?>" class="inputbox" />
 
 	</div>
 	<div class="wrap">&nbsp;</div>
@@ -187,4 +187,4 @@
 	<input type="hidden" name="task" value="" />
 	<?php echo JHTML::_( 'form.token' ); ?>
 </form>
-<?php echo JHTML::_('behavior.keepalive'); ?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php echo JHTML::_('behavior.keepalive'); ?>
diff -aruN --binary 10/templates/beez/html/com_content/category/blog_item.php 11/templates/beez/html/com_content/category/blog_item.php
--- 10/templates/beez/html/com_content/category/blog_item.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_content/category/blog_item.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,17 +1,17 @@
-<?php // @version $Id: blog_item.php 11386 2009-01-04 02:34:35Z ian $
+<?php // @version $Id: blog_item.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
 <?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?>
-<div class="contentpaneopen_edit<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 	<?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?>
 </div>
 <?php endif; ?>
 
 <?php if ($this->item->params->get('show_title')) : ?>
-<h2 class="contentheading<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+<h2 class="contentheading<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 	<?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?>
-		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 			<?php echo $this->escape($this->item->title); ?></a>
 	<?php else :
 		echo $this->escape($this->item->title);
@@ -45,7 +45,7 @@
             <?php if ($this->item->params->get('link_section')) : ?>
                 <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?>
             <?php endif; ?>
-            <?php echo $this->item->section; ?>
+            <?php echo $this->escape($this->item->section); ?>
             <?php if ($this->item->params->get('link_section')) : ?>
                 <?php echo '</a>'; ?>
             <?php endif; ?>
@@ -59,7 +59,7 @@
             <?php if ($this->item->params->get('link_category')) : ?>
                 <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?>
             <?php endif; ?>
-            <?php echo $this->item->category; ?>
+            <?php echo $this->escape($this->item->category); ?>
             <?php if ($this->item->params->get('link_category')) : ?>
                 <?php echo '</a>'; ?>
             <?php endif; ?>
@@ -78,7 +78,7 @@
 
 	<?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?>
 	<span class="createdby">
-		<?php JText::printf('Written by', ($this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author)); ?>
+		<?php JText::printf('Written by', ($this->escape($this->item->created_by_alias) ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author))); ?>
 	</span>
 	<?php endif; ?>
 
@@ -95,7 +95,7 @@
 <?php if ($this->item->params->get('show_url') && $this->item->urls) : ?>
 <span class="small">
 	<a href="<?php echo $this->item->urls; ?>" target="_blank">
-		<?php echo $this->item->urls; ?></a>
+		<?php echo $this->escape($this->item->urls); ?></a>
 </span>
 <?php endif; ?>
 
@@ -107,13 +107,13 @@
 
 <?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?>
 <p>
-	<a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+	<a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 		<?php if ($this->item->readmore_register) :
 			echo JText::_('Register to read more...');
 		elseif ($readmore = $this->item->params->get('readmore')) :
 			echo $readmore;
 		else :
-			echo JText::sprintf('Read more', $this->item->title);
+			echo JText::sprintf('Read more', $this->escape($this->item->title));
 		endif; ?></a>
 </p>
 <?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_content/category/blog_links.php 11/templates/beez/html/com_content/category/blog_links.php
--- 10/templates/beez/html/com_content/category/blog_links.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/templates/beez/html/com_content/category/blog_links.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: blog_links.php 10770 2008-08-23 11:36:27Z willebil $
+<?php // @version $Id: blog_links.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -10,7 +10,7 @@
 	<?php foreach ($this->links as $link) : ?>
 	<li>
 		<a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>">
-			<?php echo $link->title; ?></a>
+			<?php echo $this->escape($link->title); ?></a>
 	</li>
 	<?php endforeach; ?>
 </ul>
diff -aruN --binary 10/templates/beez/html/com_content/category/blog.php 11/templates/beez/html/com_content/category/blog.php
--- 10/templates/beez/html/com_content/category/blog.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_content/category/blog.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,18 +1,18 @@
-<?php // @version $Id: blog.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: blog.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 $cparams = JComponentHelper::getParams ('com_media');
 ?>
 
 <?php if ($this->params->get('show_page_title')) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
-<div class="blog<?php echo $this->params->get('pageclass_sfx'); ?>">
+<div class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 	<?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
-	<div class="contentdescription<?php echo $this->params->get('pageclass_sfx'); ?>">
+	<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 		<?php if ($this->params->get('show_description_image') && $this->category->image) : ?>
 		<img src="<?php echo $this->baseurl . $cparams->get('image_path') . '/' . $this->category->image; ?>" class="image_<?php echo $this->category->image_position; ?>" />
@@ -32,23 +32,23 @@
 	<?php $i = $this->pagination->limitstart;
 	$rowcount = $this->params->def('num_leading_articles', 1);
 	for ($y = 0; $y < $rowcount && $i < $this->total; $y++, $i++) : ?>
-		<div class="leading<?php echo $this->params->get('pageclass_sfx'); ?>">
+		<div class="leading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php $this->item =& $this->getItem($i, $this->params);
 			echo $this->loadTemplate('item'); ?>
 		</div>
-		<span class="leading_separator<?php echo $this->params->get('pageclass_sfx'); ?>">&nbsp;</span>
+		<span class="leading_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">&nbsp;</span>
 	<?php endfor; ?>
 
 	<?php $introcount = $this->params->def('num_intro_articles', 4);
 	if ($introcount) :
-		$colcount = $this->params->def('num_columns', 2);
+		$colcount = (int)$this->params->def('num_columns', 2);
 		if ($colcount == 0) :
 			$colcount = 1;
 		endif;
 		$rowcount = (int) $introcount / $colcount;
 		$ii = 0;
 		for ($y = 0; $y < $rowcount && $i < $this->total; $y++) : ?>
-			<div class="article_row<?php echo $this->params->get('pageclass_sfx'); ?>">
+			<div class="article_row<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 				<?php for ($z = 0; $z < $colcount && $ii < $introcount && $i < $this->total; $z++, $i++, $ii++) : ?>
 					<div class="article_column column<?php echo $z + 1; ?> cols<?php echo $colcount; ?>" >
 						<?php $this->item =& $this->getItem($i, $this->params);
@@ -56,14 +56,14 @@
 					</div>
 					<span class="article_separator">&nbsp;</span>
 				<?php endfor; ?>
-				<span class="row_separator<?php echo $this->params->get('pageclass_sfx'); ?>">&nbsp;</span>
+				<span class="row_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">&nbsp;</span>
 			</div>
 		<?php endfor;
 	endif; ?>
 
 	<?php $numlinks = $this->params->def('num_links', 4);
 	if ($numlinks && $i < $this->total) : ?>
-	<div class="blog_more<?php echo $this->params->get('pageclass_sfx'); ?>">
+	<div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php $this->links = array_slice($this->items, $i - $this->pagination->limitstart, $i - $this->pagination->limitstart + $numlinks);
 		echo $this->loadTemplate('links'); ?>
 	</div>
diff -aruN --binary 10/templates/beez/html/com_content/category/default_items.php 11/templates/beez/html/com_content/category/default_items.php
--- 10/templates/beez/html/com_content/category/default_items.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_content/category/default_items.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version: $Id: default_items.php 11393 2009-01-05 02:11:06Z ian $
+<?php // @version: $Id: default_items.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -20,8 +20,8 @@
 <?php if ($this->params->get('filter')) : ?>
 <div class="filter">
 	<p>
-		<?php echo JText::_($this->params->get('filter_type') . ' ' . 'Filter').'&nbsp;'; ?>
-		<input type="text" name="filter" value="<?php echo $this->lists['filter']; ?>" class="inputbox" onchange="document.adminForm.submit();" />
+		<?php echo JText::_($this->escape($this->params->get('filter_type')) . ' ' . 'Filter').'&nbsp;'; ?>
+		<input type="text" name="filter" value="<?php echo $this->escape($this->lists['filter']); ?>" class="inputbox" onchange="document.adminForm.submit();" />
 	</p>
 </div>
 <?php endif; ?>
@@ -37,30 +37,30 @@
 
 	<?php if ($this->params->get('show_headings')) : ?>
 	<tr>
-		<th class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>" id="count">
+		<th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="count">
 			<?php echo JText::_('Num'); ?>
 		</th>
 
 		<?php if ($this->params->get('show_title')) : ?>
-		<th class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>" id="tableOrdering">
+		<th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="tableOrdering">
 			<?php echo JHTML::_('grid.sort', 'Item Title', 'a.title', $this->lists['order_Dir'], $this->lists['order']); ?>
 		</th>
 		<?php endif; ?>
 
 		<?php if ($this->params->get('show_date')) : ?>
-		<th class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>" id="tableOrdering2">
+		<th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="tableOrdering2">
 			<?php echo JHTML::_('grid.sort', 'Date', 'a.created', $this->lists['order_Dir'], $this->lists['order']); ?>
 		</th>
 		<?php endif; ?>
 
 		<?php if ($this->params->get('show_author')) : ?>
-		<th class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>" id="author">
+		<th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="author">
 			<?php echo JHTML::_('grid.sort', 'Author', 'author', $this->lists['order_Dir'], $this->lists['order']); ?>
 		</th>
 		<?php endif; ?>
 
 		<?php if ($this->params->get('show_hits')) : ?>
-		<th align="center" class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>" width="5%" nowrap="nowrap" id="hits">
+		<th align="center" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" width="5%" nowrap="nowrap" id="hits">
 			<?php echo JHTML::_('grid.sort', 'Hits', 'a.hits', $this->lists['order_Dir'], $this->lists['order']); ?>
 		</th>
 		<?php endif; ?>
@@ -68,9 +68,9 @@
 	<?php endif; ?>
 
 	<?php foreach ($this->items as $item) : ?>
-	<tr class="sectiontableentry<?php echo ($item->odd + 1) . $this->params->get('pageclass_sfx'); ?>">
+	<tr class="sectiontableentry<?php echo ($item->odd + 1) . $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<td headers="count">
-			<?php echo $this->pagination->getRowOffset($item->count); ?>
+			<?php echo $this->pagination->getRowOffset((int)$item->count); ?>
 		</td>
 
 		<?php if ($this->params->get('show_title')) : ?>
@@ -89,19 +89,19 @@
 
 		<?php if ($this->params->get('show_date')) : ?>
 		<td  headers="tableOrdering2">
-			<?php echo $item->created; ?>
+			<?php echo $this->escape($item->created); ?>
 		</td>
 		<?php endif; ?>
 
 		<?php if ($this->params->get('show_author')) : ?>
 		<td headers="author">
-			<?php echo $item->created_by_alias ? $item->created_by_alias : $item->author; ?>
+			<?php echo $item->created_by_alias ? $this->escape($item->created_by_alias) : $this->escape($item->author); ?>
 		</td>
 		<?php endif; ?>
 
 		<?php if ($this->params->get('show_hits')) : ?>
 		<td headers="hits">
-			<?php echo $item->hits ? $item->hits : '-'; ?>
+			<?php echo $item->hits ? (int)$item->hits : '-'; ?>
 		</td>
 		<?php endif; ?>
 
@@ -117,8 +117,8 @@
 <?php echo $this->pagination->getPagesLinks();
 endif; ?>
 
-<input type="hidden" name="id" value="<?php echo $this->category->id; ?>" />
-<input type="hidden" name="sectionid" value="<?php echo $this->category->sectionid; ?>" />
+<input type="hidden" name="id" value="<?php echo (int)$this->category->id; ?>" />
+<input type="hidden" name="sectionid" value="<?php echo (int)$this->category->sectionid; ?>" />
 <input type="hidden" name="task" value="<?php echo $this->lists['task']; ?>" />
 <input type="hidden" name="filter_order" value="" />
 <input type="hidden" name="filter_order_Dir" value="" />
diff -aruN --binary 10/templates/beez/html/com_content/category/default.php 11/templates/beez/html/com_content/category/default.php
--- 10/templates/beez/html/com_content/category/default.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_content/category/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,16 +1,16 @@
-<?php // @version $Id: default.php 10498 2008-07-04 00:05:36Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 $cparams = JComponentHelper::getParams ('com_media');
 ?>
 
 <?php if ($this->params->get('show_page_title',1)) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
 <?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
-<div class="contentdescription<?php echo $this->params->get('pageclass_sfx'); ?>">
+<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php if ($this->params->get('show_description_image') && $this->category->image) : ?>
 	<img src="<?php echo $this->baseurl . $cparams->get('image_path').'/'.$this->category->image; ?>" class="image_<?php echo $this->category->image_position; ?>" />
 	<?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_content/frontpage/default_item.php 11/templates/beez/html/com_content/frontpage/default_item.php
--- 10/templates/beez/html/com_content/frontpage/default_item.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_content/frontpage/default_item.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,17 +1,17 @@
-<?php // @version $Id: default_item.php 11386 2009-01-04 02:34:35Z ian $
+<?php // @version $Id: default_item.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
 <?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?>
-<div class="contentpaneopen_edit<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 	<?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?>
 </div>
 <?php endif; ?>
 
 <?php if ($this->item->params->get('show_title')) : ?>
-<h2 class="contentheading<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+<h2 class="contentheading<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 	<?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?>
-		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 			<?php echo $this->escape($this->item->title); ?></a>
 	<?php else :
 		echo $this->escape($this->item->title);
@@ -45,7 +45,7 @@
 		<?php if ($this->item->params->get('link_section')) : ?>
 			<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?>
 		<?php endif; ?>
-		<?php echo $this->item->section; ?>
+		<?php echo $this->escape($this->item->section); ?>
 		<?php if ($this->item->params->get('link_section')) : ?>
 			<?php echo '</a>'; ?>
 		<?php endif; ?>
@@ -59,7 +59,7 @@
 		<?php if ($this->item->params->get('link_category')) : ?>
 			<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?>
 		<?php endif; ?>
-		<?php echo $this->item->category; ?>
+		<?php echo $this->escape($this->item->category); ?>
 		<?php if ($this->item->params->get('link_category')) : ?>
 			<?php echo '</a>'; ?>
 		<?php endif; ?>
@@ -94,8 +94,8 @@
 
 <?php if ($this->item->params->get('show_url') && $this->item->urls) : ?>
 <span class="small">
-	<a href="<?php echo $this->item->urls; ?>" target="_blank">
-		<?php echo $this->item->urls; ?></a>
+	<a href="<?php echo $this->escape($this->item->urls); ?>" target="_blank">
+		<?php echo $this->escape($this->item->urls); ?></a>
 </span>
 <?php endif; ?>
 
@@ -113,7 +113,7 @@
 		elseif ($readmore = $this->item->params->get('readmore')) :
 			echo $readmore;
 		else :
-			echo JText::sprintf('Read more', $this->item->title);
+			echo JText::sprintf('Read more', $this->escape($this->item->title));
 		endif; ?></a>
 </p>
 <?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_content/frontpage/default_links.php 11/templates/beez/html/com_content/frontpage/default_links.php
--- 10/templates/beez/html/com_content/frontpage/default_links.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_content/frontpage/default_links.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: default_links.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: default_links.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -10,7 +10,7 @@
 	<?php foreach ($this->links as $link) : ?>
 	<li>
 		<a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>">
-			<?php echo $link->title; ?></a>
+			<?php echo $this->escape($link->title); ?></a>
 	</li>
 	<?php endforeach; ?>
 </ul>
diff -aruN --binary 10/templates/beez/html/com_content/frontpage/default.php 11/templates/beez/html/com_content/frontpage/default.php
--- 10/templates/beez/html/com_content/frontpage/default.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_content/frontpage/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,14 +1,14 @@
-<?php // @version $Id: default.php 10498 2008-07-04 00:05:36Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
 <?php if ($this->params->get('show_page_title',1)) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
-<div class="blog<?php echo $this->params->get('pageclass_sfx'); ?>">
+<div class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 	<?php $i = $this->pagination->limitstart;
 	$rowcount = $this->params->def('num_leading_articles', 1);
@@ -17,7 +17,7 @@
 			<?php $this->item =& $this->getItem($i, $this->params);
 			echo $this->loadTemplate('item'); ?>
 		</div>
-		<span class="leading_separator<?php echo $this->params->get('pageclass_sfx'); ?>">&nbsp;</span>
+		<span class="leading_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">&nbsp;</span>
 	<?php endfor; ?>
 
 	<?php $introcount = $this->params->def('num_intro_articles', 4);
@@ -29,7 +29,7 @@
 		$rowcount = (int) $introcount / $colcount;
 		$ii = 0;
 		for ($y = 0; $y < $rowcount && $i < $this->total; $y++) : ?>
-			<div class="article_row<?php echo $this->params->get('pageclass_sfx'); ?>">
+			<div class="article_row<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 				<?php for ($z = 0; $z < $colcount && $ii < $introcount && $i < $this->total; $z++, $i++, $ii++) : ?>
 					<div class="article_column column<?php echo $z + 1; ?> cols<?php echo $colcount; ?>" >
 						<?php $this->item =& $this->getItem($i, $this->params);
@@ -37,14 +37,14 @@
 					</div>
 					<span class="article_separator">&nbsp;</span>
 				<?php endfor; ?>
-				<span class="row_separator<?php echo $this->params->get('pageclass_sfx'); ?>">&nbsp;</span>
+				<span class="row_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">&nbsp;</span>
 			</div>
 		<?php endfor;
 	endif; ?>
 
 	<?php $numlinks = $this->params->def('num_links', 4);
 	if ($numlinks && $i < $this->total) : ?>
-	<div class="blog_more<?php echo $this->params->get('pageclass_sfx'); ?>">
+	<div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php $this->links = array_slice($this->items, $i - $this->pagination->limitstart, $i - $this->pagination->limitstart + $numlinks);
 		echo $this->loadTemplate('links'); ?>
 	</div>
diff -aruN --binary 10/templates/beez/html/com_content/section/blog_item.php 11/templates/beez/html/com_content/section/blog_item.php
--- 10/templates/beez/html/com_content/section/blog_item.php	2009-03-28 01:44:02.000000000 +0100
+++ 11/templates/beez/html/com_content/section/blog_item.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,17 +1,17 @@
-<?php // @version $Id: blog_item.php 11552 2009-01-30 00:38:32Z kdevine $
+<?php // @version $Id: blog_item.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
 <?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?>
-<div class="contentpaneopen_edit<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 	<?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?>
 </div>
 <?php endif; ?>
 
 <?php if ($this->item->params->get('show_title')) : ?>
-<h2 class="contentheading<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+<h2 class="contentheading<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 	<?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?>
-		<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+		<a href="<?php echo $this->escape($this->item->readmore_link); ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 			<?php echo $this->escape($this->item->title); ?></a>
 	<?php else :
 		echo $this->escape($this->item->title);
@@ -40,12 +40,12 @@
 
 <?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?>
 <p class="pageinfo">
-       <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->item->section)) : ?>
+       <?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->section->title)) : ?>
         <span>
             <?php if ($this->item->params->get('link_section')) : ?>
                 <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?>
             <?php endif; ?>
-            <?php echo $this->item->section; ?>
+            <?php echo $this->escape($this->section->title); ?>
             <?php if ($this->item->params->get('link_section')) : ?>
                 <?php echo '</a>'; ?>
             <?php endif; ?>
@@ -59,7 +59,7 @@
             <?php if ($this->item->params->get('link_category')) : ?>
                 <?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?>
             <?php endif; ?>
-            <?php echo $this->item->category; ?>
+            <?php echo $this->escape($this->item->category); ?>
             <?php if ($this->item->params->get('link_category')) : ?>
                 <?php echo '</a>'; ?>
             <?php endif; ?>
@@ -78,7 +78,7 @@
 
 	<?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?>
 	<span class="createdby">
-		<?php JText::printf('Written by', ($this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author)); ?>
+		<?php JText::printf('Written by', ($this->item->created_by_alias ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author))); ?>
 	</span>
 	<?php endif; ?>
 
@@ -94,8 +94,8 @@
 
 <?php if ($this->item->params->get('show_url') && $this->item->urls) : ?>
 <span class="small">
-	<a href="<?php echo $this->item->urls; ?>" target="_blank">
-		<?php echo $this->item->urls; ?></a>
+	<a href="<?php echo $this->escape($this->item->urls); ?>" target="_blank">
+		<?php echo $this->escape($this->item->urls); ?></a>
 </span>
 <?php endif; ?>
 
@@ -107,13 +107,13 @@
 
 <?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?>
 <p>
-	<a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+	<a href="<?php echo $this->item->readmore_link; ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 		<?php if ($this->item->readmore_register) :
 			echo JText::_('Register to read more...');
 		elseif ($readmore = $this->item->params->get('readmore')) :
 			echo $readmore;
 		else :
-			echo JText::sprintf('Read more', $this->item->title);
+			echo JText::sprintf('Read more', $this->escape($this->item->title));
 		endif; ?></a>
 </p>
 <?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_content/section/blog_links.php 11/templates/beez/html/com_content/section/blog_links.php
--- 10/templates/beez/html/com_content/section/blog_links.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/templates/beez/html/com_content/section/blog_links.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: blog_links.php 10770 2008-08-23 11:36:27Z willebil $
+<?php // @version $Id: blog_links.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -10,7 +10,7 @@
 	<?php foreach ($this->links as $link) : ?>
 	<li>
 		<a class="blogsection" href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($link->slug, $link->catslug, $link->sectionid)); ?>">
-			<?php echo $link->title; ?></a>
+			<?php echo $this->escape($link->title); ?></a>
 	</li>
 	<?php endforeach; ?>
 </ul>
diff -aruN --binary 10/templates/beez/html/com_content/section/blog.php 11/templates/beez/html/com_content/section/blog.php
--- 10/templates/beez/html/com_content/section/blog.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_content/section/blog.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,21 +1,21 @@
-<?php // @version $Id: blog.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: blog.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 $cparams = JComponentHelper::getParams ('com_media');
 ?>
 
 <?php if ($this->params->get('show_page_title')) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
-<div class="blog<?php echo $this->params->get('pageclass_sfx'); ?>">
+<div class="blog<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 	<?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
-	<div class="contentdescription<?php echo $this->params->get('pageclass_sfx'); ?>">
+	<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 		<?php if ($this->params->get('show_description_image') && $this->section->image) : ?>
-		<img src="<?php echo $this->baseurl . $cparams->get('image_path').'/'.$this->section->image; ?>" class="image_<?php echo $this->section->image_position; ?>" />
+		<img src="<?php echo $this->baseurl . $cparams->get('image_path').'/'.$this->escape($this->section->image); ?>" class="image_<?php echo $this->escape($this->section->image_position); ?>" />
 		<?php endif; ?>
 
 		<?php if ($this->params->get('show_description') && $this->section->description) :
@@ -32,23 +32,23 @@
 	<?php $i = $this->pagination->limitstart;
 	$rowcount = $this->params->def('num_leading_articles', 1);
 	for ($y = 0; $y < $rowcount && $i < $this->total; $y++, $i++) : ?>
-		<div class="leading<?php echo $this->params->get('pageclass_sfx'); ?>">
+		<div class="leading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 			<?php $this->item =& $this->getItem($i, $this->params);
 			echo $this->loadTemplate('item'); ?>
 		</div>
-		<span class="leading_separator<?php echo $this->params->get('pageclass_sfx'); ?>">&nbsp;</span>
+		<span class="leading_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">&nbsp;</span>
 	<?php endfor; ?>
 
-	<?php $introcount = $this->params->def('num_intro_articles', 4);
+	<?php $introcount = (int)$this->params->def('num_intro_articles', 4);
 	if ($introcount) :
-		$colcount = $this->params->def('num_columns', 2);
+		$colcount = (int)$this->params->def('num_columns', 2);
 		if ($colcount == 0) :
 			$colcount = 1;
 		endif;
 		$rowcount = (int) $introcount / $colcount;
 		$ii = 0;
 		for ($y = 0; $y < $rowcount && $i < $this->total; $y++) : ?>
-			<div class="article_row<?php echo $this->params->get('pageclass_sfx'); ?>">
+			<div class="article_row<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 				<?php for ($z = 0; $z < $colcount && $ii < $introcount && $i < $this->total; $z++, $i++, $ii++) : ?>
 					<div class="article_column column<?php echo $z + 1; ?> cols<?php echo $colcount; ?>" >
 						<?php $this->item =& $this->getItem($i, $this->params);
@@ -56,14 +56,14 @@
 					</div>
 					<span class="article_separator">&nbsp;</span>
 				<?php endfor; ?>
-				<span class="row_separator<?php echo $this->params->get('pageclass_sfx'); ?>">&nbsp;</span>
+				<span class="row_separator<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">&nbsp;</span>
 			</div>
 		<?php endfor;
 	endif; ?>
 
-	<?php $numlinks = $this->params->def('num_links', 4);
+	<?php $numlinks = (int)$this->params->def('num_links', 4);
 	if ($numlinks && $i < $this->total) : ?>
-	<div class="blog_more<?php echo $this->params->get('pageclass_sfx'); ?>">
+	<div class="blog_more<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 		<?php $this->links = array_slice($this->items, $i - $this->pagination->limitstart, $i - $this->pagination->limitstart + $numlinks);
 		echo $this->loadTemplate('links'); ?>
 	</div>
diff -aruN --binary 10/templates/beez/html/com_content/section/default.php 11/templates/beez/html/com_content/section/default.php
--- 10/templates/beez/html/com_content/section/default.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/templates/beez/html/com_content/section/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,18 +1,18 @@
-<?php // @version $Id: default.php 10947 2008-09-23 01:14:10Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 $cparams = JComponentHelper::getParams ('com_media');
 ?>
 
 <?php if ($this->params->get('show_page_title',1)) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
 <?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
-<div class="contentdescription<?php echo $this->params->get('pageclass_sfx'); ?>">
+<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php if ($this->params->get('show_description_image') && $this->section->image) : ?>
-	<img src="<?php echo $this->baseurl . '/' . $cparams->get('image_path').'/'.$this->section->image; ?>" class="image_<?php echo $this->section->image_position; ?>" />
+	<img src="<?php echo $this->baseurl . '/' . $this->escape($cparams->get('image_path')).'/'.$this->escape($this->section->image); ?>" class="image_<?php echo $this->escape($this->section->image_position); ?>" />
 	<?php endif; ?>
 
 	<?php if ($this->params->get('show_description') && $this->section->description) :
@@ -32,7 +32,7 @@
 			continue;
 		endif; ?>
 		<li>
-			<a href="<?php echo $category->link; ?>" class="category"><?php echo $category->title; ?></a>
+			<a href="<?php echo $category->link; ?>" class="category"><?php echo $this->escape($category->title); ?></a>
 
 			<?php if ($this->params->get('show_cat_num_articles')) : ?>
 			<span class="small">
diff -aruN --binary 10/templates/beez/html/com_newsfeeds/categories/default.php 11/templates/beez/html/com_newsfeeds/categories/default.php
--- 10/templates/beez/html/com_newsfeeds/categories/default.php	2008-07-06 23:40:12.000000000 +0200
+++ 11/templates/beez/html/com_newsfeeds/categories/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,19 +1,19 @@
-<?php // @version $Id: default.php 10498 2008-07-04 00:05:36Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 $cparams = JComponentHelper::getParams ('com_media');
 ?>
 
 <?php if ($this->params->get('show_page_title',1)) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
 <?php if ($this->params->def( 'show_comp_description', 1 ) || $this->params->get( 'image', -1 ) != -1) : ?>
-<div class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 	<?php if ($this->params->get( 'image', -1 ) != -1) : ?>
-	<img src="<?php echo $this->baseurl . '/' . $cparams->get('image_path').'/'.$this->params->get('image'); ?>" class="image_<?php echo $this->params->get( 'image_align' ); ?>" />
+	<img src="<?php echo $this->baseurl . '/' . $this->escape($cparams->get('image_path')).'/'.$this->escape($this->params->get('image')); ?>" class="image_<?php echo $this->escape($this->params->get( 'image_align' )); ?>" />
 	<?php endif; ?>
 
 	<?php echo $this->params->get( 'comp_description' ); ?>
@@ -30,9 +30,9 @@
 	<?php foreach ( $this->categories as $category ) : ?>
 	<li>
 		<a href="<?php echo $category->link; ?>" class="category">
-			<?php echo $category->title; ?></a>
+			<?php echo $this->escape($category->title); ?></a>
 		<?php if ( $this->params->get( 'show_cat_items' ) ) : ?>
-		&nbsp;<span class="small">(<?php echo $category->numlinks . ' ' . JText::_( 'items' ); ?>)</span>
+		&nbsp;<span class="small">(<?php echo (int)$category->numlinks . ' ' . JText::_( 'items' ); ?>)</span>
 		<?php endif; ?>
 		<?php if ( $this->params->def( 'show_cat_description', 1 ) && $category->description) : ?>
 		<br />
diff -aruN --binary 10/templates/beez/html/com_newsfeeds/category/default_items.php 11/templates/beez/html/com_newsfeeds/category/default_items.php
--- 10/templates/beez/html/com_newsfeeds/category/default_items.php	2008-07-06 23:40:12.000000000 +0200
+++ 11/templates/beez/html/com_newsfeeds/category/default_items.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: default_items.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: default_items.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -17,18 +17,18 @@
 	<?php if ( $this->params->get( 'show_headings' ) ) : ?>
 	<tr>
 
-		<th class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>" width="5" id="num">
+		<th class="sectiontableheader<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>" width="5" id="num">
 			<?php echo JText::_( 'Num' ); ?>
 		</th>
 
 		<?php if ( $this->params->get( 'show_name' ) ) : ?>
-		<th width="90%" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>" id="name">
+		<th width="90%" class="sectiontableheader<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>" id="name">
 			<?php echo JText::_( 'Feed Name' ); ?>
 		</th>
 		<?php endif; ?>
 
 		<?php if ( $this->params->get( 'show_articles' ) ) : ?>
-		<th width="10%" class="sectiontableheader<?php echo $this->params->get( 'pageclass_sfx' ); ?>" nowrap="nowrap" id="num_a">
+		<th width="10%" class="sectiontableheader<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>" nowrap="nowrap" id="num_a">
 			<?php echo JText::_('Num Articles'); ?>
 		</th>
 		<?php endif; ?>
@@ -44,8 +44,8 @@
 		</td>
 
 		<td width="90%" headers="name">
-			<a href="<?php echo $item->link; ?>" class="category<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
-				<?php echo $item->name; ?></a>
+			<a href="<?php echo $item->link; ?>" class="category<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
+				<?php echo $this->escape($item->name); ?></a>
 		</td>
 
 		<?php if ( $this->params->get( 'show_articles' ) ) : ?>
diff -aruN --binary 10/templates/beez/html/com_newsfeeds/category/default.php 11/templates/beez/html/com_newsfeeds/category/default.php
--- 10/templates/beez/html/com_newsfeeds/category/default.php	2008-07-06 23:40:12.000000000 +0200
+++ 11/templates/beez/html/com_newsfeeds/category/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,17 +1,17 @@
-<?php // @version $Id: default.php 10498 2008-07-04 00:05:36Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 $cparams = JComponentHelper::getParams ('com_media');
 ?>
 
 <?php if ( $this->params->get( 'show_page_title',1)): ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
-<div class="newsfeed<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<div class="newsfeed<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 	<?php if ( $this->category->image || $this->category->description ) : ?>
-	<div class="contentdescription<?php echo $this->params->get('pageclass_sfx'); ?>">
+	<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 		<?php if ( $this->category->image ) : ?>
 		<img src="<?php echo $this->baseurl . '/' . $cparams->get('image_path').'/'.$this->category->image; ?>" class="image_<?php echo $this->category->image_position; ?>" />
diff -aruN --binary 10/templates/beez/html/com_newsfeeds/newsfeed/default.php 11/templates/beez/html/com_newsfeeds/newsfeed/default.php
--- 10/templates/beez/html/com_newsfeeds/newsfeed/default.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_newsfeeds/newsfeed/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: default.php 11371 2008-12-30 01:31:50Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -31,14 +31,14 @@
 		   }
 ?>
 <?php if ( $this->params->get( 'show_page_title', 1 ) ) : ?>
-<h1 style="<?php echo $direction; ?><?php echo $align; ?>" class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 style="<?php echo $direction; ?><?php echo $align; ?>" class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
-<h2 style="<?php echo $direction; ?><?php echo $align; ?>" class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h2 style="<?php echo $direction; ?><?php echo $align; ?>" class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<a href="<?php echo $this->newsfeed->channel['link']; ?>" target="_blank">
-		<?php echo str_replace('&apos;', "'", $this->newsfeed->channel['title']); ?></a>
+		<?php echo str_replace('&apos;', "'", $this->escape($this->newsfeed->channel['title'])); ?></a>
 </h2>
 
 <?php if ( $this->params->get( 'show_feed_description' ) )  : ?>
@@ -49,7 +49,7 @@
 
 <?php if ( isset( $this->newsfeed->image['url'] ) && isset( $this->newsfeed->image['title'] ) && $this->params->get( 'show_feed_image' ) ) : ?>
 <p style="<?php echo $direction; ?><?php echo $align; ?>">
-<img src="<?php echo $this->newsfeed->image['url']; ?>" alt="<?php echo $this->newsfeed->image['title']; ?>" />
+<img src="<?php echo $this->escape($this->newsfeed->image['url']); ?>" alt="<?php echo $this->escape($this->newsfeed->image['title']); ?>" />
 </p>
 <?php endif; ?>
 
@@ -59,8 +59,8 @@
 	<?php foreach ( $this->newsfeed->items as $item ) : ?>
 	<li style="<?php echo $direction; ?><?php echo $align; ?>">
 		<?php if ( !is_null( $item->get_link() ) ) : ?>
-		<a href="<?php echo $item->get_link(); ?>" target="_blank">
-			<?php echo $item->get_title(); ?></a>
+		<a href="<?php echo $this->escape($item->get_link()); ?>" target="_blank">
+			<?php echo $this->escape($item->get_title()); ?></a>
 		<?php endif; ?>
 		<?php if ( $this->params->get( 'show_item_description' ) && $item->get_description() ) : ?>
 		<br />
diff -aruN --binary 10/templates/beez/html/com_poll/poll/default_graph.php 11/templates/beez/html/com_poll/poll/default_graph.php
--- 10/templates/beez/html/com_poll/poll/default_graph.php	2008-07-06 23:40:12.000000000 +0200
+++ 11/templates/beez/html/com_poll/poll/default_graph.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: default_graph.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: default_graph.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -12,7 +12,7 @@
 </dl>
 
 <h3>
-	<?php echo $this->poll->title; ?>
+	<?php echo $this->escape($this->poll->title); ?>
 </h3>
 
 <table class="pollstableborder">
diff -aruN --binary 10/templates/beez/html/com_poll/poll/default.php 11/templates/beez/html/com_poll/poll/default.php
--- 10/templates/beez/html/com_poll/poll/default.php	2008-07-06 23:40:12.000000000 +0200
+++ 11/templates/beez/html/com_poll/poll/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,16 +1,16 @@
-<?php // @version $Id: default.php 10498 2008-07-04 00:05:36Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
 <?php JHTML::_('stylesheet', 'poll_bars.css', 'components/com_poll/assets/'); ?>
 
 <?php if ($this->params->get('show_page_title',1)) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
-<div class="poll<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<div class="poll<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 	<form action="index.php" method="post" name="poll" id="poll">
 		<label for="id">
 			<?php echo JText::_( 'Select Poll' ); ?>&nbsp;<?php echo $this->lists['polls']; ?>
diff -aruN --binary 10/templates/beez/html/com_search/search/default_error.php 11/templates/beez/html/com_search/search/default_error.php
--- 10/templates/beez/html/com_search/search/default_error.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_search/search/default_error.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,10 +1,10 @@
-<?php // @version $Id: default_error.php 11299 2008-11-22 01:40:44Z ian $
+<?php // @version $Id: default_error.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
-<h2 class="error<?php $this->params->get( 'pageclass_sfx' ) ?>">
+<h2 class="error<?php $this->escape($this->params->get( 'pageclass_sfx' )) ?>">
 	<?php echo JText::_('Error') ?>
 </h2>
-<div class="error<?php echo $this->params->get( 'pageclass_sfx' ) ?>">
+<div class="error<?php echo $this->escape($this->params->get( 'pageclass_sfx' )) ?>">
 	<p><?php echo $this->escape($this->error); ?></p>
 </div>
diff -aruN --binary 10/templates/beez/html/com_search/search/default_form.php 11/templates/beez/html/com_search/search/default_form.php
--- 10/templates/beez/html/com_search/search/default_form.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_search/search/default_form.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,8 +1,8 @@
-<?php // @version $Id: default_form.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: default_form.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
-<form action="<?php echo JRoute::_( 'index.php?option=com_search#content' ) ?>" method="post" class="search_result<?php echo $this->params->get('pageclass_sfx') ?>">
+<form action="<?php echo JRoute::_( 'index.php?option=com_search#content' ) ?>" method="post" class="search_result<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
 <a name="form1"></a>
 <h3><?php echo JText::_('search_again'); ?></h3>
 <fieldset class="word">
@@ -30,7 +30,7 @@
 </fieldset>
 <?php endif; ?>
 <p>
-	<button name="Search" onClick="this.form.submit()" class="button"><?php echo JText::_( 'Search' );?></button>
+	<button name="Search" onclick="this.form.submit()" class="button"><?php echo JText::_( 'Search' );?></button>
 </p>
 
 
@@ -45,4 +45,4 @@
 <?php endif; ?>
 
 <input type="hidden" name="task"   value="search" />
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/templates/beez/html/com_search/search/default.php 11/templates/beez/html/com_search/search/default.php
--- 10/templates/beez/html/com_search/search/default.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_search/search/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,9 +1,9 @@
-<?php // @version $Id: default.php 10498 2008-07-04 00:05:36Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
 <?php if($this->params->get('show_page_title',1)) : ?>
-<h2 class="componentheading<?php echo $this->params->get('pageclass_sfx') ?>">
+<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
 	<?php echo $this->escape($this->params->get('page_title')) ?>
 </h2>
 <?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_search/search/default_results.php 11/templates/beez/html/com_search/search/default_results.php
--- 10/templates/beez/html/com_search/search/default_results.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_search/search/default_results.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,9 +1,9 @@
-	<?php // @version $Id: default_results.php 10381 2008-06-01 03:35:53Z pasamio $
+	<?php // @version $Id: default_results.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
 <?php if (!empty($this->searchword)) : ?>
-<div class="searchintro<?php echo $this->params->get('pageclass_sfx') ?>">
+<div class="searchintro<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
 	<p>
 		<?php echo JText::_('Search Keyword') ?> <strong><?php echo $this->escape($this->searchword) ?></strong>
 		<?php echo $this->result ?>
@@ -18,7 +18,7 @@
 <div class="results">
 	<h3><?php echo JText :: _('Search_result'); ?></h3>
 	<?php $start = $this->pagination->limitstart + 1; ?>
-	<ol class="list<?php echo $this->params->get('pageclass_sfx') ?>" start="<?php echo  $start ?>">
+	<ol class="list<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>" start="<?php echo (int)$start ?>">
 		<?php foreach ($this->results as $result) : ?>
 		<li>
 			<?php if ($result->href) : ?>
@@ -29,19 +29,19 @@
 			<?php endif; ?>
 			<?php if ($result->section) : ?>
 			<p><?php echo JText::_('Category') ?>:
-				<span class="small<?php echo $this->params->get('pageclass_sfx') ?>">
+				<span class="small<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
 					<?php echo $this->escape($result->section); ?>
 				</span>
 			</p>
 			<?php endif; ?>
 
 			<?php echo $result->text; ?>
-			<span class="small<?php echo $this->params->get('pageclass_sfx') ?>">
-				<?php echo $result->created; ?>
+			<span class="small<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
+				<?php echo $this->escape($result->created); ?>
 			</span>
 		</li>
 		<?php endforeach; ?>
 	</ol>
 	<?php echo $this->pagination->getPagesLinks(); ?>
 </div>
-<?php endif; ?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_user/login/default_login.php 11/templates/beez/html/com_user/login/default_login.php
--- 10/templates/beez/html/com_user/login/default_login.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_user/login/default_login.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: default_login.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: default_login.php 11796 2009-05-06 02:03:15Z ian $
 defined( '_JEXEC' ) or die( 'Restricted access' );
 ?>
 <form action="<?php echo JRoute::_( 'index.php', true, $this->params->get('usesecure')); ?>" method="post" name="login" id="login" class="login_form<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
@@ -38,11 +38,11 @@
 		</div>
 	</fieldset>
 	<p>
-		<a href="<?php echo JRoute::_( 'index.php?option=com_user&task=lostPassword' ); ?>">
+		<a href="<?php echo JRoute::_( 'index.php?option=com_user&view=reset#content' ); ?>">
 			<?php echo JText::_('Lost Password?'); ?></a>
 		<?php if ( $this->params->get( 'registration' ) ) : ?>
 		<?php echo JText::_('No account yet?'); ?>
-		<a href="<?php echo JRoute::_( 'index.php?option=com_user&task=register' ); ?>">
+		<a href="<?php echo JRoute::_( 'index.php?option=com_user&view=register#content' ); ?>">
 			<?php echo JText::_( 'Register' ); ?></a>
 		<?php endif; ?>
 	</p>
diff -aruN --binary 10/templates/beez/html/com_user/login/default_logout.php 11/templates/beez/html/com_user/login/default_logout.php
--- 10/templates/beez/html/com_user/login/default_logout.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_user/login/default_logout.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,16 +1,16 @@
-<?php // @version $Id: default_logout.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: default_logout.php 11917 2009-05-29 19:37:05Z ian $
 defined( '_JEXEC' ) or die( 'Restricted access' );
 ?>
 
-<form action="index.php" method="post" name="login" id="login" class="logout_form<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<form action="<?php echo JRoute::_( 'index.php' ); ?>" method="post" name="login" id="login" class="logout_form<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 	<?php if ( $this->params->get( 'page_title' ) ) : ?>
-	<h1 class="componentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<h1 class="componentheading<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 		<?php echo $this->params->get( 'header_logout' ); ?>
 	</h1>
 	<?php endif; ?>
 
 	<?php if ( $this->params->get( 'description_logout' ) || isset( $this->image ) ) : ?>
-	<div class="contentdescription<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<div class="contentdescription<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 		<?php if (isset ($this->image)) :
 			echo $this->image;
 		endif;
diff -aruN --binary 10/templates/beez/html/com_user/login/default.php 11/templates/beez/html/com_user/login/default.php
--- 10/templates/beez/html/com_user/login/default.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/templates/beez/html/com_user/login/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,8 +1,8 @@
-<?php // @version $Id: default.php 10822 2008-08-27 17:16:00Z tcp $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined( '_JEXEC' ) or die( 'Restricted access' );
  ?>
 <?php if($this->params->get('show_page_title',1)) : ?>
-<h2 class="componentheading<?php echo $this->params->get('pageclass_sfx') ?>">
+<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
 	<?php echo $this->escape($this->params->get('page_title')) ?>
 </h2>
 <?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_user/register/default_message.php 11/templates/beez/html/com_user/register/default_message.php
--- 10/templates/beez/html/com_user/register/default_message.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_user/register/default_message.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,11 +1,11 @@
-<?php // @version $Id: default_message.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: default_message.php 11917 2009-05-29 19:37:05Z ian $
 defined( '_JEXEC' ) or die( 'Restricted access' );
 ?>
 
 <h3>
-	<?php echo $this->message->title; ?>
+	<?php echo $this->escape($this->message->title); ?>
 </h3>
 
 <p class="message">
-	<?php echo $this->message->text; ?>
+	<?php echo $this->escape($this->message->text); ?>
 </p>
diff -aruN --binary 10/templates/beez/html/com_user/register/default.php 11/templates/beez/html/com_user/register/default.php
--- 10/templates/beez/html/com_user/register/default.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_user/register/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,8 +1,8 @@
-<?php // @version $Id: default.php 11305 2008-11-23 19:14:25Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined( '_JEXEC' ) or die( 'Restricted access' );
 ?>
 <?php if($this->params->get('show_page_title',1)) : ?>
-<h2 class="componentheading<?php echo $this->params->get('pageclass_sfx') ?>">
+<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
 	<?php echo $this->escape($this->params->get('page_title')) ?>
 </h2>
 <?php endif; ?>
@@ -21,15 +21,15 @@
 		<p><?php echo JText::_('REGISTER_REQUIRED'); ?></p>
 		<div class="name">
 			<label id="namemsg" for="name"><?php echo JText::_('Name'); ?>: *</label>
-			<input type="text" name="name" id="name" value="<?php echo $this->user->get('name'); ?>" class="inputbox validate required none namemsg" maxlength="50" />
+			<input type="text" name="name" id="name" value="<?php echo $this->escape($this->user->get('name')); ?>" class="inputbox validate required none namemsg" maxlength="50" />
 		</div>
 		<div class="user">
 			<label id="usernamemsg" for="username"><?php echo JText::_('Username'); ?>: *</label>
-			<input type="text" id="username" name="username"  value="<?php echo $this->user->get('username'); ?>" class="inputbox validate required username usernamemsg" maxlength="25" />
+			<input type="text" id="username" name="username"  value="<?php echo $this->escape($this->user->get('username')); ?>" class="inputbox validate required username usernamemsg" maxlength="25" />
 		</div>
 		<div class="email">
 			<label id="emailmsg" for="email"><?php echo JText::_('Email'); ?>: *</label>
-			<input type="text" id="email" name="email"  value="<?php echo $this->user->get('email'); ?>" class="inputbox validate required email emailmsg" maxlength="100" />
+			<input type="text" id="email" name="email"  value="<?php echo $this->escape($this->user->get('email')); ?>" class="inputbox validate required email emailmsg" maxlength="100" />
 		</div>
 	</fieldset>
 	<fieldset>
diff -aruN --binary 10/templates/beez/html/com_user/remind/default_message.php 11/templates/beez/html/com_user/remind/default_message.php
--- 10/templates/beez/html/com_user/remind/default_message.php	2008-07-06 23:40:10.000000000 +0200
+++ 11/templates/beez/html/com_user/remind/default_message.php	2009-06-02 23:51:36.000000000 +0200
@@ -3,9 +3,9 @@
 ?>
 
 <div class="componentheading">
-	<?php echo $this->message->title; ?>
+	<?php echo $this->escape($this->message->title); ?>
 </div>
 
 <div class="message">
-	<?php echo $this->message->text; ?>
+	<?php echo $this->escape($this->message->text); ?>
 </div>
diff -aruN --binary 10/templates/beez/html/com_user/remind/default.php 11/templates/beez/html/com_user/remind/default.php
--- 10/templates/beez/html/com_user/remind/default.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_user/remind/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -2,12 +2,12 @@
 defined('_JEXEC') or die('Restricted access');
 ?>
 <?php if($this->params->get('show_page_title',1)) : ?>
-<h2 class="componentheading<?php echo $this->params->get('pageclass_sfx') ?>">
+<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
 	<?php echo $this->escape($this->params->get('page_title')) ?>
 </h2>
 <?php endif; ?>
 
-<form action="index.php?option=com_user&amp;task=remindusername" method="post" class="josForm form-validate">
+<form action="<?php echo JRoute::_( 'index.php?option=com_user&task=remindusername' ); ?>" method="post" class="josForm form-validate">
 	<p><?php echo JText::_('REMIND_USERNAME_DESCRIPTION'); ?></p>
 
 	<label for="email" class="hasTip" title="<?php echo JText::_('REMIND_USERNAME_EMAIL_TIP_TITLE'); ?>::<?php echo JText::_('REMIND_USERNAME_EMAIL_TIP_TEXT'); ?>"><?php echo JText::_('Email Address'); ?>:</label>
diff -aruN --binary 10/templates/beez/html/com_user/reset/complete.php 11/templates/beez/html/com_user/reset/complete.php
--- 10/templates/beez/html/com_user/reset/complete.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/templates/beez/html/com_user/reset/complete.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: complete.php 10822 2008-08-27 17:16:00Z tcp $
+<?php // @version $Id: complete.php 11786 2009-04-24 17:48:08Z kdevine $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -6,7 +6,7 @@
 	<?php echo JText::_('Reset your Password'); ?>
 </div>
 
-<form action="index.php?option=com_user&amp;task=completereset" method="post" class="josForm form-validate">
+<form action="<?php echo JRoute::_( 'index.php?option=com_user&task=completereset' ); ?>" method="post" class="josForm form-validate">
 	<table cellpadding="0" cellspacing="0" border="0" width="100%" class="contentpane">
 		<tr>
 			<td colspan="2" height="40">
@@ -33,4 +33,4 @@
 
 	<button type="submit" class="validate"><?php echo JText::_('Submit'); ?></button>
 	<?php echo JHTML::_( 'form.token' ); ?>
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/templates/beez/html/com_user/reset/confirm.php 11/templates/beez/html/com_user/reset/confirm.php
--- 10/templates/beez/html/com_user/reset/confirm.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/templates/beez/html/com_user/reset/confirm.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: confirm.php 10822 2008-08-27 17:16:00Z tcp $
+<?php // @version $Id: confirm.php 11786 2009-04-24 17:48:08Z kdevine $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -6,7 +6,7 @@
 	<?php echo JText::_('Confirm your Account'); ?>
 </div>
 
-<form action="index.php?option=com_user&amp;task=confirmreset" method="post" class="josForm form-validate">
+<form action="<?php echo JRoute::_( 'index.php?option=com_user&task=confirmreset' ); ?>" method="post" class="josForm form-validate">
 	<table cellpadding="0" cellspacing="0" border="0" width="100%" class="contentpane">
 		<tr>
 			<td colspan="2" height="40">
@@ -25,4 +25,4 @@
 
 	<button type="submit" class="validate"><?php echo JText::_('Submit'); ?></button>
 	<?php echo JHTML::_( 'form.token' ); ?>
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/templates/beez/html/com_user/reset/default.php 11/templates/beez/html/com_user/reset/default.php
--- 10/templates/beez/html/com_user/reset/default.php	2009-01-10 03:58:08.000000000 +0100
+++ 11/templates/beez/html/com_user/reset/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,13 +1,13 @@
-<?php // @version $Id: default.php 11305 2008-11-23 19:14:25Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 <?php if($this->params->get('show_page_title',1)) : ?>
-<h2 class="componentheading<?php echo $this->params->get('pageclass_sfx') ?>">
+<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
 	<?php echo $this->escape($this->params->get('page_title')) ?>
 </h2>
 <?php endif; ?>
 
-<form action="index.php?option=com_user&amp;task=requestreset" method="post" class="josForm form-validate">
+<form action="<?php echo JRoute::_( 'index.php?option=com_user&task=requestreset' ); ?>" method="post" class="josForm form-validate">
 	<p><?php echo JText::_('RESET_PASSWORD_REQUEST_DESCRIPTION'); ?></p>
 
 	<label for="email" class="hasTip" title="<?php echo JText::_('RESET_PASSWORD_EMAIL_TIP_TITLE'); ?>::<?php echo JText::_('RESET_PASSWORD_EMAIL_TIP_TEXT'); ?>"><?php echo JText::_('Email Address'); ?>:</label>
diff -aruN --binary 10/templates/beez/html/com_user/user/default.php 11/templates/beez/html/com_user/user/default.php
--- 10/templates/beez/html/com_user/user/default.php	2009-03-28 01:44:02.000000000 +0100
+++ 11/templates/beez/html/com_user/user/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,8 +1,8 @@
-<?php // @version $Id: default.php 11623 2009-02-15 15:23:08Z kdevine $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 <?php if($this->params->get('show_page_title',1)) : ?>
-<h2 class="componentheading<?php echo $this->params->get('pageclass_sfx') ?>">
+<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
 	<?php echo $this->escape($this->params->get('page_title')) ?>
 </h2>
 <?php endif; ?>
diff -aruN --binary 10/templates/beez/html/com_user/user/form.php 11/templates/beez/html/com_user/user/form.php
--- 10/templates/beez/html/com_user/user/form.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/templates/beez/html/com_user/user/form.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,8 +1,8 @@
-<?php // @version $Id: form.php 11232 2008-10-30 19:23:59Z kdevine $
+<?php // @version $Id: form.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 <?php if($this->params->get('show_page_title',1)) : ?>
-<h2 class="componentheading<?php echo $this->params->get('pageclass_sfx') ?>">
+<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
 	<?php echo $this->escape($this->params->get('page_title')) ?>
 </h2>
 <?php endif; ?>
@@ -14,21 +14,21 @@
 // -->
 </script>
 
-<form action="index.php" method="post" name="userform" autocomplete="off" class="user">
+<form action="<?php echo JRoute::_( 'index.php' ); ?>" method="post" name="userform" autocomplete="off" class="user">
 
 	<div class="user_name">
 		<label for="username"><?php echo JText::_( 'User Name' ); ?>: </label>
-		<span><?php echo $this->user->get('username'); ?></span>
+		<span><?php echo $this->escape($this->user->get('username')); ?></span>
 	</div>
 
 	<div class="name">
 		<label for="name"><?php echo JText::_( 'Your Name' ); ?>: </label>
-		<input class="inputbox" type="text" id="name" name="name" value="<?php echo $this->user->get('name');?>" size="40" />
+		<input class="inputbox" type="text" id="name" name="name" value="<?php echo $this->escape($this->user->get('name')); ?>" size="40" />
 	</div>
 
 	<div class="email">
 		<label for="email"><?php echo JText::_( 'email' ); ?>: </label>
-		<input class="inputbox required validate-email" type="text" id="email" name="email" value="<?php echo $this->user->get('email');?>" size="40" />
+		<input class="inputbox required validate-email" type="text" id="email" name="email" value="<?php echo $this->escape($this->user->get('email'));?>" size="40" />
 	</div>
 
 	<?php if($this->user->get('password')) : ?>
@@ -48,9 +48,9 @@
 
 	<button class="button validate" type="submit" onclick="submitbutton( this.form );return false;"><?php echo JText::_( 'Save' ); ?></button>
 
-	<input type="hidden" name="username" value="<?php echo $this->user->get('username');?>" />
-	<input type="hidden" name="id" value="<?php echo $this->user->get('id');?>" />
-	<input type="hidden" name="gid" value="<?php echo $this->user->get('gid');?>" />
+	<input type="hidden" name="username" value="<?php echo $this->escape($this->user->get('username'));?>" />
+	<input type="hidden" name="id" value="<?php echo (int)$this->user->get('id');?>" />
+	<input type="hidden" name="gid" value="<?php echo (int)$this->user->get('gid');?>" />
 	<input type="hidden" name="option" value="com_user" />
 	<input type="hidden" name="task" value="save" />
 	<?php echo JHTML::_( 'form.token' ); ?>
diff -aruN --binary 10/templates/beez/html/com_weblinks/categories/default.php 11/templates/beez/html/com_weblinks/categories/default.php
--- 10/templates/beez/html/com_weblinks/categories/default.php	2008-07-06 23:40:12.000000000 +0200
+++ 11/templates/beez/html/com_weblinks/categories/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,22 +1,22 @@
-<?php // @version $Id: default.php 10498 2008-07-04 00:05:36Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 $cparams = JComponentHelper::getParams ('com_media');
 ?>
 
 <?php if ($this->params->get('show_page_title',1)) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
 
-<div class="weblinks<?php echo $this->params->get('pageclass_sfx'); ?>">
+<div class="weblinks<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 	<?php if ($this->params->def('show_comp_description', 1) || $this->params->def('image', -1) != -1) : ?>
-	<div class="contentdescription<?php echo $this->params->get('pageclass_sfx'); ?>">
+	<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 		<?php if ($this->params->def('image', -1) != -1) : ?>
-		<img src="<?php echo $this->baseurl . $cparams->get('image_path').'/'.$this->params->get('image'); ?>" alt="" class="image_<?php echo $this->params->get('image_align'); ?>" />
+		<img src="<?php echo $this->baseurl . $this->escape($cparams->get('image_path')).'/'.$this->escape($this->params->get('image')); ?>" alt="" class="image_<?php echo $this->escape($this->params->get('image_align')); ?>" />
 		<?php endif; ?>
 
 		<?php if ($this->params->get('show_comp_description')) :
@@ -37,9 +37,9 @@
 <ul>
 	<?php foreach ($this->categories as $category) : ?>
 	<li>
-		<a href="<?php echo $category->link; ?>" class="category<?php echo $this->params->get('pageclass_sfx'); ?>">
-			<?php echo $category->title; ?></a>
-		&nbsp;<span class="small">(<?php echo $category->numlinks ?>)</span>
+		<a href="<?php echo $category->link; ?>" class="category<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
+			<?php echo $this->escape($category->title); ?></a>
+		&nbsp;<span class="small">(<?php echo (int)$category->numlinks ?>)</span>
 	</li>
 	<?php endforeach; ?>
 </ul>
diff -aruN --binary 10/templates/beez/html/com_weblinks/category/default_items.php 11/templates/beez/html/com_weblinks/category/default_items.php
--- 10/templates/beez/html/com_weblinks/category/default_items.php	2008-07-06 23:40:12.000000000 +0200
+++ 11/templates/beez/html/com_weblinks/category/default_items.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: default_items.php 10381 2008-06-01 03:35:53Z pasamio $
+<?php // @version $Id: default_items.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -13,7 +13,7 @@
 </script>
 
 <div class="display">
-	<form action="<?php echo htmlspecialchars($this->action); ?>" method="post" name="adminForm">
+	<form action="<?php echo $this->escape($this->action); ?>" method="post" name="adminForm">
 		<?php echo JText :: _('Display Num'); ?>&nbsp;
 		<?php echo $this->pagination->getLimitBox(); ?>
 		<input type="hidden" name="filter_order" value="<?php echo $this->lists['order'] ?>" />
@@ -27,16 +27,16 @@
 	<?php if ($this->params->def('show_headings', 1)) : ?>
 	<tr>
 
-		<th class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>" width="5" id="num">
+		<th class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" width="5" id="num">
 			<?php echo JText::_('Num'); ?>
 		</th>
 
-		<th width="90%" class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>" id="title">
+		<th width="90%" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" id="title">
 			<?php echo JHTML::_('grid.sort', 'Web Link', 'title', $this->lists['order_Dir'], $this->lists['order']); ?>
 		</th>
 
 		<?php if ($this->params->get('show_link_hits')) : ?>
-		<th width="10%" class="sectiontableheader<?php echo $this->params->get('pageclass_sfx'); ?>" nowrap="nowrap" id="hits">
+		<th width="10%" class="sectiontableheader<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>" nowrap="nowrap" id="hits">
 			<?php echo JHTML::_('grid.sort', 'Hits', 'hits', $this->lists['order_Dir'], $this->lists['order']); ?>
 		</th>
 		<?php endif; ?>
@@ -64,7 +64,7 @@
 
 		<?php if ($this->params->get('show_link_hits')) : ?>
 		<td headers="hits">
-			<?php echo $item->hits; ?>
+			<?php echo (int)$item->hits; ?>
 		</td>
 		<?php endif; ?>
 
diff -aruN --binary 10/templates/beez/html/com_weblinks/category/default.php 11/templates/beez/html/com_weblinks/category/default.php
--- 10/templates/beez/html/com_weblinks/category/default.php	2008-07-06 23:40:12.000000000 +0200
+++ 11/templates/beez/html/com_weblinks/category/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,18 +1,18 @@
-<?php // @version $Id: default.php 10498 2008-07-04 00:05:36Z ian $
+<?php // @version $Id: default.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
 <?php if ($this->params->get('show_page_title', 1)) : ?>
-<h1 class="componentheading<?php echo $this->params->get('pageclass_sfx'); ?>">
+<h1 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 	<?php echo $this->escape($this->params->get('page_title')); ?>
 </h1>
 <?php endif; ?>
 
 
-<div class="weblinks<?php echo $this->params->get('pageclass_sfx'); ?>">
+<div class="weblinks<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 	<?php if ( $this->category->image || $this->category->description) : ?>
-	<div class="contentdescription<?php echo $this->params->get('pageclass_sfx'); ?>">
+	<div class="contentdescription<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>">
 
 		<?php if ($this->category->image) :
 			echo $this->category->image;
diff -aruN --binary 10/templates/beez/html/com_weblinks/weblink/form.php 11/templates/beez/html/com_weblinks/weblink/form.php
--- 10/templates/beez/html/com_weblinks/weblink/form.php	2008-11-11 01:34:00.000000000 +0100
+++ 11/templates/beez/html/com_weblinks/weblink/form.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,8 +1,8 @@
-<?php // @version $Id: form.php 11215 2008-10-26 02:25:51Z ian $
+<?php // @version $Id: form.php 11917 2009-05-29 19:37:05Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 <?php if($this->params->get('show_page_title',1)) : ?>
-<h2 class="componentheading<?php echo $this->params->get('pageclass_sfx') ?>">
+<h2 class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')) ?>">
         <?php echo $this->escape($this->params->get('page_title')) ?>
 </h2>
 <?php endif; ?>
@@ -44,7 +44,7 @@
     </div>
 	<div>
 	<label for="jformurl"><?php echo JText::_( 'URL' ); ?>:</label>
-	<input class="inputbox" type="text" id="jformurl" name="jform[url]" value="<?php echo $this->weblink->url; ?>" size="50" maxlength="250" />
+	<input class="inputbox" type="text" id="jformurl" name="jform[url]" value="<?php echo $this->escape($this->weblink->url); ?>" size="50" maxlength="250" />
 	</div>
 
 	<div>
@@ -78,11 +78,11 @@
         </button>
 </div>
 
-        <input type="hidden" name="jform[id]" value="<?php echo $this->weblink->id; ?>" />
-        <input type="hidden" name="jform[ordering]" value="<?php echo $this->weblink->ordering; ?>" />
+        <input type="hidden" name="jform[id]" value="<?php echo (int)$this->weblink->id; ?>" />
+        <input type="hidden" name="jform[ordering]" value="<?php echo (int)$this->weblink->ordering; ?>" />
         <input type="hidden" name="jform[approved]" value="<?php echo $this->weblink->approved; ?>" />
         <input type="hidden" name="option" value="com_weblinks" />
         <input type="hidden" name="controller" value="weblink" />
         <input type="hidden" name="task" value="" />
         <?php echo JHTML::_( 'form.token' ); ?>
-</form>
\ No hay ningún carácter de nueva línea al final del fichero
+</form>
diff -aruN --binary 10/templates/beez/html/mod_login/default.php 11/templates/beez/html/mod_login/default.php
--- 10/templates/beez/html/mod_login/default.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/templates/beez/html/mod_login/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?php // @version $Id: default.php 10864 2008-08-30 07:08:04Z willebil $
+<?php // @version $Id: default.php 11796 2009-05-06 02:03:15Z ian $
 defined('_JEXEC') or die('Restricted access');
 ?>
 
@@ -57,7 +57,7 @@
 	if ($usersConfig->get('allowUserRegistration')) : ?>
 	<p>
 		<?php echo JText::_('No account yet?'); ?>
-		<a href="<?php echo JRoute::_('index.php?option=com_user&task=register#content'); ?>">
+		<a href="<?php echo JRoute::_('index.php?option=com_user&view=register#content'); ?>">
 			<?php echo JText::_('Register'); ?></a>
 	</p>
 	<?php endif;
diff -aruN --binary 10/templates/ja_purity/html/com_content/article/default.php 11/templates/ja_purity/html/com_content/article/default.php
--- 10/templates/ja_purity/html/com_content/article/default.php	2009-03-28 01:44:02.000000000 +0100
+++ 11/templates/ja_purity/html/com_content/article/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -1,22 +1,22 @@
 <?php // no direct access
 defined('_JEXEC') or die('Restricted access'); ?>
 <?php if ($this->params->get('show_page_title', 1) && $this->params->get('page_title') != $this->article->title) : ?>
-<div class="componentheading<?php echo $this->params->get('pageclass_sfx')?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
+<div class="componentheading<?php echo $this->escape($this->params->get('pageclass_sfx')); ?>"><?php echo $this->escape($this->params->get('page_title')); ?></div>
 <?php endif; ?>
 <?php if (($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) && !$this->print) : ?>
-	<div class="contentpaneopen_edit<?php echo $this->params->get( 'pageclass_sfx' ); ?>" >
+	<div class="contentpaneopen_edit<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>" >
 		<?php echo JHTML::_('icon.edit', $this->article, $this->params, $this->access); ?>
 	</div>
 <?php endif; ?>
 
 <?php if ($this->params->get('show_title',1)) : ?>
-<h2 class="contentheading<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+<h2 class="contentheading<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 	<?php if ($this->params->get('link_titles') && $this->article->readmore_link != '') : ?>
-	<a href="<?php echo $this->article->readmore_link; ?>" class="contentpagetitle<?php echo $this->params->get( 'pageclass_sfx' ); ?>">
+	<a href="<?php echo $this->article->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->params->get( 'pageclass_sfx' )); ?>">
 		<?php echo $this->escape($this->article->title); ?>
 	</a>
 	<?php else : ?>
-		<?php echo $this->article->title; ?>
+		<?php echo $this->escape($this->article->title); ?>
 	<?php endif; ?>
 </h2>
 <?php endif; ?>
@@ -44,7 +44,7 @@
 
 	<?php if (($this->params->get('show_author')) && ($this->article->author != "")) : ?>
 		<span class="createby">
-			<?php JText::printf(($this->article->created_by_alias ? $this->article->created_by_alias : $this->article->author) ); ?>
+			<?php $this->escape(JText::printf(($this->escape($this->article->created_by_alias) ? $this->escape($this->article->created_by_alias) : $this->escape($this->article->author)) )); ?>
 		</span>
 	<?php endif; ?>
 
@@ -54,7 +54,7 @@
 			<?php if ($this->params->get('link_section')) : ?>
 				<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->article->sectionid)).'">'; ?>
 			<?php endif; ?>
-			<?php echo $this->article->section; ?>
+			<?php echo $this->escape($this->article->section); ?>
 			<?php if ($this->params->get('link_section')) : ?>
 				<?php echo '</a>'; ?>
 			<?php endif; ?>
@@ -68,7 +68,7 @@
 			<?php if ($this->params->get('link_category')) : ?>
 				<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->article->catslug, $this->article->sectionid)).'">'; ?>
 			<?php endif; ?>
-			<?php echo $this->article->category; ?>
+			<?php echo $this->escape($this->article->category); ?>
 			<?php if ($this->params->get('link_category')) : ?>
 				<?php echo '</a>'; ?>
 			<?php endif; ?>
@@ -107,8 +107,8 @@
 
 	<?php if ($this->params->get('show_url') && $this->article->urls) : ?>
 		<span class="article-url">
-			<a href="http://<?php echo $this->article->urls ; ?>" target="_blank">
-				<?php echo $this->article->urls; ?></a>
+			<a href="http://<?php echo $this->escape($this->article->urls) ; ?>" target="_blank">
+				<?php echo $this->escape($this->article->urls); ?></a>
 		</span>
 	<?php endif; ?>
 </div>
@@ -125,7 +125,7 @@
 
 <?php if ( intval($this->article->modified) !=0 && $this->params->get('show_modify_date')) : ?>
 	<span class="modifydate">
-		<?php echo JText::sprintf('LAST_UPDATED2', JHTML::_('date', $this->article->modified, JText::_('DATE_FORMAT_LC2'))); ?>
+		<?php JText::sprintf('LAST_UPDATED2', $this->escape(JHTML::_('date', $this->article->modified, JText::_('DATE_FORMAT_LC2')))); ?>
 	</span>
 <?php endif; ?>
 
diff -aruN --binary 10/templates/ja_purity/html/com_content/category/blog_item.php 11/templates/ja_purity/html/com_content/category/blog_item.php
--- 10/templates/ja_purity/html/com_content/category/blog_item.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/templates/ja_purity/html/com_content/category/blog_item.php	2009-06-02 23:51:36.000000000 +0200
@@ -2,16 +2,16 @@
 defined('_JEXEC') or die('Restricted access'); ?>
 
 <?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?>
-	<div class="contentpaneopen_edit<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>" style="float: left;">
+	<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>" style="float: left;">
 		<?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?>
 	</div>
 <?php endif; ?>
-<div class="contentpaneopen<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<div class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 
 <?php if ($this->item->params->get('show_title')) : ?>
-<h2 class="contentheading<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<h2 class="contentheading<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 	<?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?>
-	<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+	<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 		<?php echo $this->escape($this->item->title); ?>
 	</a>
 	<?php else : ?>
@@ -44,7 +44,9 @@
 
 <?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?>
 	<span class="createby">
-		<?php JText::printf(($this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author) ); ?>
+		<?php JText::printf(($this->item->created_by_alias 
+			? $this->escape($this->item->created_by_alias) 
+			: $this->escape($this->item->author)) ); ?>
 	</span>
 <?php endif; ?>
 
@@ -54,7 +56,7 @@
 		<?php if ($this->item->params->get('link_section')) : ?>
 			<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?>
 		<?php endif; ?>
-		<?php echo $this->item->section; ?>
+		<?php echo $this->escape($this->item->section); ?>
 		<?php if ($this->item->params->get('link_section')) : ?>
 			<?php echo '</a>'; ?>
 		<?php endif; ?>
@@ -68,7 +70,7 @@
 		<?php if ($this->item->params->get('link_category')) : ?>
 			<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?>
 		<?php endif; ?>
-		<?php echo $this->item->category; ?>
+		<?php echo $this->escape($this->item->category); ?>
 		<?php if ($this->item->params->get('link_category')) : ?>
 			<?php echo '</a>'; ?>
 		<?php endif; ?>
@@ -101,8 +103,8 @@
 
 <?php if ($this->item->params->get('show_url') && $this->item->urls) : ?>
 	<span class="article-url">
-		<a href="http://<?php echo $this->item->urls ; ?>" target="_blank">
-			<?php echo $this->item->urls; ?>
+		<a href="http://<?php echo $this->escape($this->item->urls) ; ?>" target="_blank">
+			<?php echo $this->escape($this->item->urls); ?>
 		</a>
 	</span>
 <?php endif; ?>
@@ -125,7 +127,7 @@
 <?php endif; ?>
 
 <?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?>
-	<a href="<?php echo $this->item->readmore_link; ?>" title="<?php echo $this->item->title; ?>" class="readon<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+	<a href="<?php echo $this->item->readmore_link; ?>" title="<?php echo $this->escape($this->item->title); ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 			<?php if ($this->item->readmore_register) : ?>
 				<?php echo JText::_('Register to read more...'); ?>
 			<?php else : ?>
diff -aruN --binary 10/templates/ja_purity/html/com_content/frontpage/default_item.php 11/templates/ja_purity/html/com_content/frontpage/default_item.php
--- 10/templates/ja_purity/html/com_content/frontpage/default_item.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/templates/ja_purity/html/com_content/frontpage/default_item.php	2009-06-02 23:51:36.000000000 +0200
@@ -2,16 +2,16 @@
 defined('_JEXEC') or die('Restricted access'); ?>
 
 <?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?>
-	<div class="contentpaneopen_edit<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>" style="float: left;">
+	<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>" style="float: left;">
 		<?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?>
 	</div>
 <?php endif; ?>
-<div class="contentpaneopen<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<div class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 
 <?php if ($this->item->params->get('show_title')) : ?>
-<h2 class="contentheading<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<h2 class="contentheading<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 	<?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?>
-	<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+	<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 		<?php echo $this->escape($this->item->title); ?>
 	</a>
 	<?php else : ?>
@@ -44,7 +44,7 @@
 
 <?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?>
 	<span class="createby">
-		<?php JText::printf(($this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author) ); ?>
+		<?php JText::printf(($this->item->created_by_alias ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author)) ); ?>
 	</span>
 <?php endif; ?>
 
@@ -54,7 +54,7 @@
 		<?php if ($this->item->params->get('link_section')) : ?>
 			<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?>
 		<?php endif; ?>
-		<?php echo $this->item->section; ?>
+		<?php echo $this->escape($this->item->section); ?>
 		<?php if ($this->item->params->get('link_section')) : ?>
 			<?php echo '</a>'; ?>
 		<?php endif; ?>
@@ -68,7 +68,7 @@
 		<?php if ($this->item->params->get('link_category')) : ?>
 			<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?>
 		<?php endif; ?>
-		<?php echo $this->item->category; ?>
+		<?php echo $this->escape($this->item->category); ?>
 		<?php if ($this->item->params->get('link_section')) : ?>
 			<?php echo '</a>'; ?>
 		<?php endif; ?>
@@ -101,8 +101,8 @@
 
 <?php if ($this->item->params->get('show_url') && $this->item->urls) : ?>
 	<span class="article-url">
-		<a href="http://<?php echo $this->item->urls ; ?>" target="_blank">
-			<?php echo $this->item->urls; ?></a>
+		<a href="http://<?php echo $this->escape($this->item->urls) ; ?>" target="_blank">
+			<?php echo $this->escape($this->item->urls); ?></a>
 	</span>
 <?php endif; ?>
 </div>
@@ -124,7 +124,7 @@
 <?php endif; ?>
 
 <?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?>
-	<a href="<?php echo $this->item->readmore_link; ?>" title="<?php echo $this->item->title; ?>" class="readon<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+	<a href="<?php echo $this->item->readmore_link; ?>" title="<?php echo $this->escape($this->item->title); ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 			<?php if ($this->item->readmore_register) : ?>
 				<?php echo JText::_('Register to read more...'); ?>
 			<?php else : ?>
diff -aruN --binary 10/templates/ja_purity/html/com_content/section/blog_item.php 11/templates/ja_purity/html/com_content/section/blog_item.php
--- 10/templates/ja_purity/html/com_content/section/blog_item.php	2008-11-11 01:30:12.000000000 +0100
+++ 11/templates/ja_purity/html/com_content/section/blog_item.php	2009-06-02 23:51:36.000000000 +0200
@@ -2,16 +2,16 @@
 defined('_JEXEC') or die('Restricted access'); ?>
 
 <?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?>
-	<div class="contentpaneopen_edit<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>" style="float: left;">
+	<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>" style="float: left;">
 		<?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?>
 	</div>
 <?php endif; ?>
-<div class="contentpaneopen<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<div class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 
 <?php if ($this->item->params->get('show_title')) : ?>
-<h2 class="contentheading<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+<h2 class="contentheading<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 	<?php if ($this->item->params->get('link_titles') && $this->item->readmore_link != '') : ?>
-	<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->item->params->get( 'pageclass_sfx' ); ?>">
+	<a href="<?php echo $this->item->readmore_link; ?>" class="contentpagetitle<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 		<?php echo $this->escape($this->item->title); ?>
 	</a>
 	<?php else : ?>
@@ -44,17 +44,17 @@
 
 <?php if (($this->item->params->get('show_author')) && ($this->item->author != "")) : ?>
 	<span class="createby">
-		<?php JText::printf(($this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author) ); ?>
+		<?php JText::printf(($this->item->created_by_alias ? $this->escape($this->item->created_by_alias) : $this->escape($this->item->author)) ); ?>
 	</span>
 <?php endif; ?>
 
 <?php if (($this->item->params->get('show_section') && $this->item->sectionid) || ($this->item->params->get('show_category') && $this->item->catid)) : ?>
-	<?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->item->section)) : ?>
+	<?php if ($this->item->params->get('show_section') && $this->item->sectionid && isset($this->section->title)) : ?>
 	<span class="article-section">
 		<?php if ($this->item->params->get('link_section')) : ?>
 			<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getSectionRoute($this->item->sectionid)).'">'; ?>
 		<?php endif; ?>
-		<?php echo $this->item->section; ?>
+		<?php echo $this->escape($this->section->title); ?>
 		<?php if ($this->item->params->get('link_section')) : ?>
 			<?php echo '</a>'; ?>
 		<?php endif; ?>
@@ -68,7 +68,7 @@
 		<?php if ($this->item->params->get('link_category')) : ?>
 			<?php echo '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug, $this->item->sectionid)).'">'; ?>
 		<?php endif; ?>
-		<?php echo $this->item->category; ?>
+		<?php echo $this->escape($this->item->category); ?>
 		<?php if ($this->item->params->get('link_category')) : ?>
 			<?php echo '</a>'; ?>
 		<?php endif; ?>
@@ -102,7 +102,7 @@
 <?php if ($this->item->params->get('show_url') && $this->item->urls) : ?>
 	<span class="article-url">
 		<a href="http://<?php echo $this->item->urls ; ?>" target="_blank">
-			<?php echo $this->item->urls; ?></a>
+			<?php echo $this->escape($this->item->urls); ?></a>
 	</span>
 <?php endif; ?>
 </div>
@@ -124,7 +124,7 @@
 <?php endif; ?>
 
 <?php if ($this->item->params->get('show_readmore') && $this->item->readmore) : ?>
-	<a href="<?php echo $this->item->readmore_link; ?>" title="<?php echo $this->item->title; ?>" class="readon<?php echo $this->item->params->get('pageclass_sfx'); ?>">
+	<a href="<?php echo $this->escape($this->item->readmore_link); ?>" title="<?php echo $this->escape($this->item->title); ?>" class="readon<?php echo $this->escape($this->item->params->get('pageclass_sfx')); ?>">
 			<?php if ($this->item->readmore_register) : ?>
 				<?php echo JText::_('Register to read more...'); ?>
 			<?php else : ?>
diff -aruN --binary 10/templates/ja_purity/html/mod_login/default.php 11/templates/ja_purity/html/mod_login/default.php
--- 10/templates/ja_purity/html/mod_login/default.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/templates/ja_purity/html/mod_login/default.php	2009-06-02 23:51:36.000000000 +0200
@@ -63,7 +63,7 @@
 		$usersConfig = &JComponentHelper::getParams( 'com_users' );
 		if ($usersConfig->get('allowUserRegistration')) : ?>
 		<li>
-			<a href="<?php echo JRoute::_( 'index.php?option=com_user&task=register' ); ?>">
+			<a href="<?php echo JRoute::_( 'index.php?option=com_user&view=register' ); ?>">
 				<?php echo JText::_('REGISTER'); ?>
 			</a>
 		</li>
diff -aruN --binary 10/templates/ja_purity/ja_templatetools.php 11/templates/ja_purity/ja_templatetools.php
--- 10/templates/ja_purity/ja_templatetools.php	2008-09-09 16:19:42.000000000 +0200
+++ 11/templates/ja_purity/ja_templatetools.php	2009-06-02 23:51:36.000000000 +0200
@@ -29,8 +29,8 @@
 		if (isset($_COOKIE[$this->template.'_tpl']) && $_COOKIE[$this->template.'_tpl'] == $this->template){
 			foreach($this->_params_cookie as $k=>$v) {
 				$kc = $this->template."_".$k;
-				if (isset($_GET[$k])){
-					$v = $_GET[$k];
+				if (JRequest::getVar($k, null, 'GET') !== null) {
+					$v = preg_replace('/[\x00-\x1F\x7F<>;\/\"\'%()]/', '', JRequest::getString($k, '', 'GET'));
 					setcookie ($kc, $v, $exp, '/');
 				}else{
 					if (isset($_COOKIE[$kc])){
@@ -48,9 +48,9 @@
 
 	function getParam ($param, $default='') {
 		if (isset($this->_params_cookie[$param])) {
-			return $this->_params_cookie[$param];
+			return preg_replace('/[\x00-\x1F\x7F<>;\/\"\'%()]/', '', $this->_params_cookie[$param]);
 		}
-		return $this->_tpl->params->get($param, $default);
+		return preg_replace('/[\x00-\x1F\x7F<>;\/\"\'%()]/', '', $this->_tpl->params->get($param, $default));
 	}
 
 	function setParam ($param, $value) {
diff -aruN --binary 10/templates/system/offline.php 11/templates/system/offline.php
--- 10/templates/system/offline.php	2008-07-06 23:40:02.000000000 +0200
+++ 11/templates/system/offline.php	2009-06-02 23:51:36.000000000 +0200
@@ -20,7 +20,7 @@
 	<?php if($this->direction == 'rtl') : ?>
 	<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/offline_rtl.css" type="text/css" />
 	<?php endif; ?>
-	<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/general.css" type="text/css" />
+	<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/system/css/system.css" type="text/css" />
 </head>
 <body>
 <jdoc:include type="message" />
