diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql	2012-10-29 13:28:54.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql	2012-11-07 11:23:40.000000000 -0600
***************
*** 1,2 ****
  INSERT INTO `#__update_sites` (`name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES('Accredited Joomla! Translations','collection','http://update.joomla.org/language/translationlist.xml',1,0);
! INSERT INTO `#__update_sites_extensions` (`update_site_id`, `extension_id`) VALUES(LAST_INSERT_ID(),600);
\ No newline at end of file
--- 1,4 ----
  INSERT INTO `#__update_sites` (`name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES('Accredited Joomla! Translations','collection','http://update.joomla.org/language/translationlist.xml',1,0);
! INSERT INTO `#__update_sites_extensions` (`update_site_id`, `extension_id`) VALUES(LAST_INSERT_ID(),600);
! UPDATE  `#__assets` SET name=REPLACE( name, 'com_user.notes.category','com_users.category'  );
! UPDATE  `#__categories` SET extension=REPLACE( extension, 'com_user.notes.category','com_users.category'  );
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_admin/sql/updates/mysql/2.5.8.sql /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_admin/sql/updates/mysql/2.5.8.sql
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_admin/sql/updates/mysql/2.5.8.sql	1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_admin/sql/updates/mysql/2.5.8.sql	2012-11-07 11:23:40.000000000 -0600
***************
*** 0 ****
--- 1 ----
+ # Placeholder file for database changes for version 2.5.8
\ No newline at end of file
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql	2012-10-29 13:28:54.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql	2012-11-07 11:23:40.000000000 -0600
***************
*** 1,2 ****
  INSERT INTO #__update_sites (name, type, location, enabled, last_check_timestamp) VALUES ('Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist.xml', 1, 0);
! INSERT INTO #__update_sites_extensions (update_site_id, extension_id) VALUES (SCOPE_IDENTITY(), 600);
\ No newline at end of file
--- 1,4 ----
  INSERT INTO #__update_sites (name, type, location, enabled, last_check_timestamp) VALUES ('Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist.xml', 1, 0);
! INSERT INTO #__update_sites_extensions (update_site_id, extension_id) VALUES (SCOPE_IDENTITY(), 600);
! UPDATE  [#__assets] SET name=REPLACE( name, 'com_user.notes.category','com_users.category'  );
! UPDATE  [#__assets] SET name=REPLACE( name, 'com_user.notes.category','com_users.category'  );
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_admin/sql/updates/sqlazure/2.5.8.sql /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_admin/sql/updates/sqlazure/2.5.8.sql
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_admin/sql/updates/sqlazure/2.5.8.sql	1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_admin/sql/updates/sqlazure/2.5.8.sql	2012-11-07 11:23:40.000000000 -0600
***************
*** 0 ****
--- 1 ----
+ # Placeholder file for database changes for version 2.5.8
\ No newline at end of file
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_banners/models/clients.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_banners/models/clients.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_banners/models/clients.php	2012-10-29 13:28:52.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_banners/models/clients.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 132,140 ****
  		} elseif ($published === '') {
  			$query->where('(a.state IN (0, 1))');
  		}
! 
! 		$query->group('a.id, b.id,a.name, a.contact, a.checked_out, a.checked_out_time, a.state, a.metakey, a.purchase_type, uc.name, b.cid, uc.id');
! 
  		// Filter by search in title
  		$search = $this->getState('filter.search');
  		if (!empty($search)) {
--- 132,140 ----
  		} elseif ($published === '') {
  			$query->where('(a.state IN (0, 1))');
  		}
! 		
! 		$query->group('a.id, a.name, a.contact, a.checked_out, a.checked_out_time, a.state, a.metakey, a.purchase_type, editor');
! 		
  		// Filter by search in title
  		$search = $this->getState('filter.search');
  		if (!empty($search)) {
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_content/models/articles.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_content/models/articles.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_content/models/articles.php	2012-10-29 13:28:51.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_content/models/articles.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 40,45 ****
--- 40,46 ----
  				'access', 'a.access', 'access_level',
  				'created', 'a.created',
  				'created_by', 'a.created_by',
+ 				'created_by_alias', 'a.created_by_alias',
  				'ordering', 'a.ordering',
  				'featured', 'a.featured',
  				'language', 'a.language',
***************
*** 140,146 ****
  			$this->getState(
  				'list.select',
  				'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid' .
! 				', a.state, a.access, a.created, a.created_by, a.ordering, a.featured, a.language, a.hits' .
  				', a.publish_up, a.publish_down'
  			)
  		);
--- 141,147 ----
  			$this->getState(
  				'list.select',
  				'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid' .
! 				', a.state, a.access, a.created, a.created_by, a.created_by_alias, a.ordering, a.featured, a.language, a.hits' .
  				', a.publish_up, a.publish_down'
  			)
  		);
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_content/models/featured.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_content/models/featured.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_content/models/featured.php	2012-10-29 13:28:51.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_content/models/featured.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 38,43 ****
--- 38,44 ----
  				'access', 'a.access', 'access_level',
  				'created', 'a.created',
  				'created_by', 'a.created_by',
+ 				'created_by_alias', 'a.created_by_alias',
  				'ordering', 'a.ordering',
  				'featured', 'a.featured',
  				'language', 'a.language',
***************
*** 66,72 ****
  		$query->select(
  			$this->getState(
  				'list.select',
! 				'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid, a.state, a.access, a.created, a.hits,' .
  				'a.language, a.publish_up, a.publish_down'
  			)
  		);
--- 67,73 ----
  		$query->select(
  			$this->getState(
  				'list.select',
! 				'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid, a.state, a.access, a.created, a.created_by_alias, a.hits,' .
  				'a.language, a.publish_up, a.publish_down'
  			)
  		);
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_content/views/articles/tmpl/default.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_content/views/articles/tmpl/default.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_content/views/articles/tmpl/default.php	2012-10-29 13:28:51.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_content/views/articles/tmpl/default.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 89,95 ****
  				<th width="10%">
  					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
  				</th>
! 				<th width="10%">
  					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_CREATED_BY', 'a.created_by', $listDirn, $listOrder); ?>
  				</th>
  				<th width="5%">
--- 89,95 ----
  				<th width="10%">
  					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
  				</th>
! 				<th>
  					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_CREATED_BY', 'a.created_by', $listDirn, $listOrder); ?>
  				</th>
  				<th width="5%">
***************
*** 170,176 ****
  					<?php echo $this->escape($item->access_level); ?>
  				</td>
  				<td class="center">
! 					<?php echo $this->escape($item->author_name); ?>
  				</td>
  				<td class="center nowrap">
  					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
--- 170,181 ----
  					<?php echo $this->escape($item->access_level); ?>
  				</td>
  				<td class="center">
! 					<?php if ($item->created_by_alias) : ?>
! 						<?php echo $this->escape($item->author_name); ?>
! 						<p class="smallsub"> <?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></p>
! 					<?php else : ?>
! 						<?php echo $this->escape($item->author_name); ?>
! 					<?php endif; ?>
  				</td>
  				<td class="center nowrap">
  					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_content/views/featured/tmpl/default.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_content/views/featured/tmpl/default.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_content/views/featured/tmpl/default.php	2012-10-29 13:28:51.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_content/views/featured/tmpl/default.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 34,40 ****
  				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
  			</select>
  
!             <select name="filter_access" class="inputbox" onchange="this.form.submit()">
  				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
  				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
  			</select>
--- 34,40 ----
  				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
  			</select>
  
! 			<select name="filter_access" class="inputbox" onchange="this.form.submit()">
  				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
  				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
  			</select>
***************
*** 70,76 ****
  				<th width="10%">
  					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
  				</th>
! 				<th width="10%">
  					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_CREATED_BY', 'a.created_by', $listDirn, $listOrder); ?>
  				</th>
  				<th width="5%">
--- 70,76 ----
  				<th width="10%">
  					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
  				</th>
! 				<th>
  					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_CREATED_BY', 'a.created_by', $listDirn, $listOrder); ?>
  				</th>
  				<th width="5%">
***************
*** 149,155 ****
  					<?php echo $this->escape($item->access_level); ?>
  				</td>
  				<td class="center">
! 					<?php echo $this->escape($item->author_name); ?>
  				</td>
  				<td class="center nowrap">
  					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
--- 149,160 ----
  					<?php echo $this->escape($item->access_level); ?>
  				</td>
  				<td class="center">
! 					<?php if ($item->created_by_alias) : ?>
! 						<?php echo $this->escape($item->author_name); ?>
! 						<p class="smallsub"> <?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></p>
! 					<?php else : ?>
! 						<?php echo $this->escape($item->author_name); ?>
! 					<?php endif; ?>
  				</td>
  				<td class="center nowrap">
  					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_installer/views/languages/tmpl/default.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_installer/views/languages/tmpl/default.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_installer/views/languages/tmpl/default.php	2012-10-29 13:28:49.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_installer/views/languages/tmpl/default.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 70,76 ****
  								<?php echo $language->version; ?>
  							</td>
  							<td class="center">
! 								<?php echo $language->type; ?>
  							</td>
  							<td>
  								<?php echo $language->detailsurl; ?>
--- 70,76 ----
  								<?php echo $language->version; ?>
  							</td>
  							<td class="center">
! 								<?php echo JText::_('COM_INSTALLER_TYPE_' . strtoupper($language->type)); ?>
  							</td>
  							<td>
  								<?php echo $language->detailsurl; ?>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_languages/views/installed/tmpl/default_ftp.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_languages/views/installed/tmpl/default_ftp.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_languages/views/installed/tmpl/default_ftp.php	2012-10-29 13:28:47.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_languages/views/installed/tmpl/default_ftp.php	1969-12-31 17:00:00.000000000 -0700
***************
*** 1,40 ****
- <?php
- /**
-  * @package		Joomla.Administrator
-  * @subpackage	com_languages
-  * @copyright	Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
-  * @license		GNU General Public License version 2 or later; see LICENSE.txt
-  */
- 
- defined('_JEXEC') or die;
- ?>
- 	<fieldset title="<?php echo JText::_('COM_LANGUAGES_FTP_TITLE'); ?>">
- 		<legend><?php echo JText::_('COM_LANGUAGES_FTP_TITLE'); ?></legend>
- 
- 		<?php echo JText::_('COM_LANGUAGES_FTP_DESC'); ?>
- 
- 		<?php if ($ftp instanceof Exception): ?>
- 			<p class="warning"><?php echo JText::_($ftp->message); ?></p>
- 		<?php endif; ?>
- 
- 		<table class="adminform">
- 			<tbody>
- 				<tr>
- 					<td width="120">
- 						<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
- 					</td>
- 					<td>
- 						<input type="text" id="username" name="username" class="inputbox" size="70" value="" />
- 					</td>
- 				</tr>
- 				<tr>
- 					<td width="120">
- 						<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
- 					</td>
- 					<td>
- 						<input type="password" id="password" name="password" class="inputbox" size="70" value="" />
- 					</td>
- 				</tr>
- 			</tbody>
- 		</table>
- 	</fieldset>
--- 0 ----
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_languages/views/installed/tmpl/default.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_languages/views/installed/tmpl/default.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_languages/views/installed/tmpl/default.php	2012-10-29 13:28:47.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_languages/views/installed/tmpl/default.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 17,26 ****
  ?>
  <form action="<?php echo JRoute::_('index.php?option=com_languages&view=installed&client='.$clientId); ?>" method="post" id="adminForm" name="adminForm">
  
- 	<?php if ($this->ftp): ?>
- 		<?php echo $this->loadTemplate('ftp');?>
- 	<?php endif; ?>
- 
  	<table class="adminlist">
  		<thead>
  			<tr>
--- 17,22 ----
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_languages/views/languages/tmpl/default.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_languages/views/languages/tmpl/default.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_languages/views/languages/tmpl/default.php	2012-10-29 13:28:47.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_languages/views/languages/tmpl/default.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 92,98 ****
  		</thead>
  		<tfoot>
  			<tr>
! 				<td colspan="11">
  					<?php echo $this->pagination->getListFooter(); ?>
  				</td>
  			</tr>
--- 92,98 ----
  		</thead>
  		<tfoot>
  			<tr>
! 				<td colspan="12">
  					<?php echo $this->pagination->getListFooter(); ?>
  				</td>
  			</tr>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_menus/models/item.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_menus/models/item.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_menus/models/item.php	2012-10-29 13:28:50.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_menus/models/item.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 1373,1379 ****
  		$table = $this->getTable();
  		while ($table->load(array('alias' => $alias, 'parent_id' => $parent_id)))
  		{
! 			$title = JString::increment($title);
  			$alias = JString::increment($alias, 'dash');
  		}
  
--- 1373,1382 ----
  		$table = $this->getTable();
  		while ($table->load(array('alias' => $alias, 'parent_id' => $parent_id)))
  		{
! 			if ($title == $table->title)
! 			{
! 				$title = JString::increment($title);
! 			}
  			$alias = JString::increment($alias, 'dash');
  		}
  
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_users/access.xml /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_users/access.xml
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_users/access.xml	2012-10-29 13:28:50.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_users/access.xml	2012-11-07 11:23:40.000000000 -0600
***************
*** 8,11 ****
--- 8,18 ----
  		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
  		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
  	</section>
+ 	<section name="category">
+ 		<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC" />
+ 		<action name="core.delete" title="JACTION_DELETE" description="COM_CATEGORIES_ACCESS_DELETE_DESC" />
+ 		<action name="core.edit" title="JACTION_EDIT" description="COM_CATEGORIES_ACCESS_EDIT_DESC" />
+ 		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC" />
+ 		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_CATEGORIES_ACCESS_EDITOWN_DESC" />
+ 	</section>
  </access>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_users/controller.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_users/controller.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_users/controller.php	2012-10-29 13:28:50.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_users/controller.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 96,102 ****
  			// Somehow the person just went to the form - we don't allow that.
  			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
  			$this->setMessage($this->getError(), 'error');
! 			$this->setRedirect(JRoute::_('index.php?option=com_users&view=groups', false));
  
  			return false;
  		}
--- 96,102 ----
  			// Somehow the person just went to the form - we don't allow that.
  			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
  			$this->setMessage($this->getError(), 'error');
! 			$this->setRedirect(JRoute::_('index.php?option=com_users&view=notes', false));
  
  			return false;
  		}
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_users/helpers/users.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_users/helpers/users.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_users/helpers/users.php	2012-10-29 13:28:50.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_users/helpers/users.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 66,73 ****
  			$extension = JRequest::getString('extension');
  			JSubMenuHelper::addEntry(
  				JText::_('COM_USERS_SUBMENU_NOTE_CATEGORIES'),
! 				'index.php?option=com_categories&extension=com_users.notes',
! 				$vName == 'categories' || $extension == 'com_users.notes'
  			);
  		}
  	}
--- 66,73 ----
  			$extension = JRequest::getString('extension');
  			JSubMenuHelper::addEntry(
  				JText::_('COM_USERS_SUBMENU_NOTE_CATEGORIES'),
! 				'index.php?option=com_categories&extension=com_users',
! 				$vName == 'categories' || $extension == 'com_users'
  			);
  		}
  	}
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_users/models/forms/note.xml /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_users/models/forms/note.xml
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/components/com_users/models/forms/note.xml	2012-10-29 13:28:50.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/components/com_users/models/forms/note.xml	2012-11-07 11:23:40.000000000 -0600
***************
*** 24,30 ****
  			name="catid"
  			type="category"
  			class="inputbox"
! 			extension="com_users.notes"
  			label="COM_USERS_FIELD_CATEGORY_ID_LABEL"
  			description="JFIELD_CATEGORY_DESC" >
  		</field>
--- 24,30 ----
  			name="catid"
  			type="category"
  			class="inputbox"
! 			extension="com_users"
  			label="COM_USERS_FIELD_CATEGORY_ID_LABEL"
  			description="JFIELD_CATEGORY_DESC" >
  		</field>
***************
*** 123,126 ****
  			class="inputbox" format="%Y-%m-%d %H:%M:%S" size="22"
  			filter="user_utc" />			
  	</fieldset>
! </form>
\ No newline at end of file
--- 123,126 ----
  			class="inputbox" format="%Y-%m-%d %H:%M:%S" size="22"
  			filter="user_utc" />			
  	</fieldset>
! </form>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/manifests/files/joomla.xml /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/manifests/files/joomla.xml
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/manifests/files/joomla.xml	2012-10-29 13:28:46.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/manifests/files/joomla.xml	2012-11-07 11:23:40.000000000 -0600
***************
*** 6,13 ****
  	<authorUrl>www.joomla.org</authorUrl>
  	<copyright>(C) 2005 - 2012 Open Source Matters. All rights reserved</copyright>
  	<license>GNU General Public License version 2 or later; see     LICENSE.txt</license>
! 	<version>2.5.7</version>
! 	<creationDate>September 2012</creationDate>
  	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
  
  	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
--- 6,13 ----
  	<authorUrl>www.joomla.org</authorUrl>
  	<copyright>(C) 2005 - 2012 Open Source Matters. All rights reserved</copyright>
  	<license>GNU General Public License version 2 or later; see     LICENSE.txt</license>
! 	<version>2.5.8</version>
! 	<creationDate>November 2012</creationDate>
  	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
  
  	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/modules/mod_menu/tmpl/default_enabled.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/modules/mod_menu/tmpl/default_enabled.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/modules/mod_menu/tmpl/default_enabled.php	2012-10-29 13:28:56.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/modules/mod_menu/tmpl/default_enabled.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 140,153 ****
  	}
  
  	$menu->addChild(
! 		new JMenuNode(JText::_('MOD_MENU_COM_USERS_NOTE_CATEGORIES'), 'index.php?option=com_categories&view=categories&extension=com_users.notes', 'class:category'),
  		$createUser
  	);
  
  	if ($createUser)
  	{
  		$menu->addChild(
! 			new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_NEW_CATEGORY'), 'index.php?option=com_categories&task=category.add&extension=com_users.notes', 'class:newarticle')
  		);
  		$menu->getParent();
  	}
--- 140,153 ----
  	}
  
  	$menu->addChild(
! 		new JMenuNode(JText::_('MOD_MENU_COM_USERS_NOTE_CATEGORIES'), 'index.php?option=com_categories&view=categories&extension=com_users', 'class:category'),
  		$createUser
  	);
  
  	if ($createUser)
  	{
  		$menu->addChild(
! 			new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_NEW_CATEGORY'), 'index.php?option=com_categories&task=category.add&extension=com_users', 'class:newarticle')
  		);
  		$menu->getParent();
  	}
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/templates/hathor/css/template.css /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/templates/hathor/css/template.css
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/templates/hathor/css/template.css	2012-10-29 13:28:43.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/templates/hathor/css/template.css	2012-11-07 11:23:40.000000000 -0600
***************
*** 1239,1245 ****
  }
  
  th.created-by-col {
! 	width: 5%;
  }
  
  th.date-col {
--- 1239,1245 ----
  }
  
  th.created-by-col {
! 	width: 10%;
  }
  
  th.date-col {
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/templates/hathor/html/com_content/articles/default.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/templates/hathor/html/com_content/articles/default.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/templates/hathor/html/com_content/articles/default.php	2012-10-29 13:28:45.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/templates/hathor/html/com_content/articles/default.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 176,182 ****
  					<?php echo $this->escape($item->access_level); ?>
  				</td>
  				<td class="center">
! 					<?php echo $this->escape($item->author_name); ?>
  				</td>
  				<td class="center nowrap">
  					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
--- 176,187 ----
  					<?php echo $this->escape($item->access_level); ?>
  				</td>
  				<td class="center">
! 					<?php if ($item->created_by_alias) : ?>
! 						<?php echo $this->escape($item->author_name); ?>
! 						<p class="smallsub"> <?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></p>
! 					<?php else : ?>
! 						<?php echo $this->escape($item->author_name); ?>
! 					<?php endif; ?>
  				</td>
  				<td class="center nowrap">
  					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/templates/hathor/html/com_content/featured/default.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/templates/hathor/html/com_content/featured/default.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/templates/hathor/html/com_content/featured/default.php	2012-10-29 13:28:45.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/templates/hathor/html/com_content/featured/default.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 39,45 ****
  				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
  			</select>
  
!             <label class="selectlabel" for="filter_access"><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></label>
  			<select name="filter_access" class="inputbox" id="filter_access">
  				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
  				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
--- 39,45 ----
  				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
  			</select>
  
! 			<label class="selectlabel" for="filter_access"><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></label>
  			<select name="filter_access" class="inputbox" id="filter_access">
  				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
  				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
***************
*** 154,160 ****
  					<?php echo $this->escape($item->access_level); ?>
  				</td>
  				<td class="center">
! 					<?php echo $this->escape($item->author_name); ?>
  				</td>
  				<td class="center nowrap">
  					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
--- 154,165 ----
  					<?php echo $this->escape($item->access_level); ?>
  				</td>
  				<td class="center">
! 					<?php if ($item->created_by_alias) : ?>
! 						<?php echo $this->escape($item->author_name); ?>
! 						<p class="smallsub"> <?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></p>
! 					<?php else : ?>
! 						<?php echo $this->escape($item->author_name); ?>
! 					<?php endif; ?>
  				</td>
  				<td class="center nowrap">
  					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/templates/hathor/html/com_languages/installed/default_ftp.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/templates/hathor/html/com_languages/installed/default_ftp.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/templates/hathor/html/com_languages/installed/default_ftp.php	2012-10-29 13:28:44.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/templates/hathor/html/com_languages/installed/default_ftp.php	1969-12-31 17:00:00.000000000 -0700
***************
*** 1,29 ****
- <?php
- /**
-  * @package		Joomla.Administrator
-  * @subpackage	Templates.hathor
-  * @copyright	Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
-  * @license		GNU General Public License version 2 or later; see LICENSE.txt
-  * @since		1.6
-  */
- 
- defined('_JEXEC') or die;
- ?>
- 	<fieldset class="adminform" title="<?php echo JText::_('COM_LANGUAGES_FTP_TITLE'); ?>">
- 		<legend><?php echo JText::_('COM_LANGUAGES_FTP_TITLE'); ?></legend>
- 
- 		<?php echo JText::_('COM_LANGUAGES_FTP_DESC'); ?>
- 
- 		<?php if ($ftp instanceof Exception): ?>
- 			<p class="warning"><?php echo JText::_($ftp->message); ?></p>
- 		<?php endif; ?>
- 
- 		<div>
- 			<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
- 			<input type="text" id="username" name="username" class="inputbox" value="" />
- 		</div>
- 		<div>
- 			<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
- 			<input type="password" id="password" name="password" class="inputbox" value="" />
- 		</div>
- 	</fieldset>
--- 0 ----
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/templates/hathor/html/com_languages/installed/default.php /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/templates/hathor/html/com_languages/installed/default.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/administrator/templates/hathor/html/com_languages/installed/default.php	2012-10-29 13:28:44.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/administrator/templates/hathor/html/com_languages/installed/default.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 18,27 ****
  ?>
  <form action="<?php echo JRoute::_('index.php?option=com_languages&view=installed&client='.$clientId); ?>" method="post" id="adminForm" name="adminForm">
  
- 	<?php if ($this->ftp): ?>
- 		<?php echo $this->loadTemplate('ftp');?>
- 	<?php endif; ?>
- 
  	<table class="adminlist">
  		<thead>
  			<tr>
--- 18,23 ----
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_content/views/category/view.feed.php /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_content/views/category/view.feed.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_content/views/category/view.feed.php	2012-10-29 13:28:41.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_content/views/category/view.feed.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 51,57 ****
  			// Get description, author and date
  			$description = ($params->get('feed_summary', 0) ? $row->introtext.$row->fulltext : $row->introtext);
  			$author = $row->created_by_alias ? $row->created_by_alias : $row->author;
! 			@$date = ($row->created ? date('r', strtotime($row->created)) : '');
  
  			// Load individual item creator class
  			$item 				= new JFeedItem();
--- 51,57 ----
  			// Get description, author and date
  			$description = ($params->get('feed_summary', 0) ? $row->introtext.$row->fulltext : $row->introtext);
  			$author = $row->created_by_alias ? $row->created_by_alias : $row->author;
! 			@$date = ($row->publish_up ? date('r', strtotime($row->publish_up)) : '');
  
  			// Load individual item creator class
  			$item 				= new JFeedItem();
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_content/views/featured/view.feed.php /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_content/views/featured/view.feed.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_content/views/featured/view.feed.php	2012-10-29 13:28:41.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_content/views/featured/view.feed.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 55,61 ****
  			$item				= new JFeedItem();
  			$item->title		= $title;
  			$item->link			= $link;
! 			$item->date			= $row->created;
  			$item_category		= $categories->get($row->catid);
  			$item->category		= array();
  			$item->category[]	= JText::_('JFEATURED'); // All featured articles are categorized as "Featured"
--- 55,61 ----
  			$item				= new JFeedItem();
  			$item->title		= $title;
  			$item->link			= $link;
! 			$item->date			= $row->publish_up;
  			$item_category		= $categories->get($row->catid);
  			$item->category		= array();
  			$item->category[]	= JText::_('JFEATURED'); // All featured articles are categorized as "Featured"
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_users/views/login/tmpl/default_login.php /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_users/views/login/tmpl/default_login.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_users/views/login/tmpl/default_login.php	2012-10-29 13:28:40.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_users/views/login/tmpl/default_login.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 9,14 ****
--- 9,15 ----
  
  defined('_JEXEC') or die;
  JHtml::_('behavior.keepalive');
+ JHtml::_('behavior.noframes');
  ?>
  <div class="login<?php echo $this->pageclass_sfx?>">
  	<?php if ($this->params->get('show_page_heading')) : ?>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_users/views/profile/tmpl/edit.php /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_users/views/profile/tmpl/edit.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_users/views/profile/tmpl/edit.php	2012-10-29 13:28:40.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_users/views/profile/tmpl/edit.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 12,17 ****
--- 12,18 ----
  JHtml::_('behavior.keepalive');
  JHtml::_('behavior.tooltip');
  JHtml::_('behavior.formvalidation');
+ JHtml::_('behavior.noframes');
  //load user_profile plugin language
  $lang = JFactory::getLanguage();
  $lang->load( 'plg_user_profile', JPATH_ADMINISTRATOR );
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_users/views/registration/tmpl/default.php /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_users/views/registration/tmpl/default.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_users/views/registration/tmpl/default.php	2012-10-29 13:28:40.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_users/views/registration/tmpl/default.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 12,17 ****
--- 12,18 ----
  JHtml::_('behavior.keepalive');
  JHtml::_('behavior.tooltip');
  JHtml::_('behavior.formvalidation');
+ JHtml::_('behavior.noframes');
  ?>
  <div class="registration<?php echo $this->pageclass_sfx?>">
  <?php if ($this->params->get('show_page_heading')) : ?>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_users/views/reset/tmpl/complete.php /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_users/views/reset/tmpl/complete.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/components/com_users/views/reset/tmpl/complete.php	2012-10-29 13:28:40.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/components/com_users/views/reset/tmpl/complete.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 11,16 ****
--- 11,17 ----
  
  JHtml::_('behavior.keepalive');
  JHtml::_('behavior.formvalidation');
+ JHtml::_('behavior.noframes');
  ?>
  <div class="reset-complete<?php echo $this->pageclass_sfx?>">
  	<?php if ($this->params->get('show_page_heading')) : ?>
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/htaccess.txt /home/packages/code/qi/SOURCES/joomla-2.5.8/htaccess.txt
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/htaccess.txt	1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/htaccess.txt	2012-11-07 11:23:40.000000000 -0600
***************
*** 0 ****
--- 1,76 ----
+ ##
+ # @package		Joomla
+ # @copyright	Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
+ # @license		GNU General Public License version 2 or later; see LICENSE.txt
+ ##
+ 
+ ##
+ # READ THIS COMPLETELY IF YOU CHOOSE TO USE THIS FILE!
+ #
+ # The line just below this section: 'Options +FollowSymLinks' may cause problems
+ # with some server configurations.  It is required for use of mod_rewrite, but may already
+ # be set by your server administrator in a way that dissallows changing it in
+ # your .htaccess file.  If using it causes your server to error out, comment it out (add # to
+ # beginning of line), reload your site in your browser and test your sef url's.  If they work,
+ # it has been set by your server administrator and you do not need it set here.
+ ##
+ 
+ ## Can be commented out if causes errors, see notes above.
+ Options +FollowSymLinks
+ 
+ ## Mod_rewrite in use.
+ 
+ RewriteEngine On
+ 
+ ## Begin - Rewrite rules to block out some common exploits.
+ # If you experience problems on your site block out the operations listed below
+ # This attempts to block the most common type of exploit `attempts` to Joomla!
+ #
+ # Block out any script trying to base64_encode data within the URL.
+ RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
+ # Block out any script that includes a <script> tag in URL.
+ RewriteCond %{QUERY_STRING} (<|%3C)([^s]*s)+cript.*(>|%3E) [NC,OR]
+ # Block out any script trying to set a PHP GLOBALS variable via URL.
+ RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
+ # Block out any script trying to modify a _REQUEST variable via URL.
+ RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
+ # Return 403 Forbidden header and show the content of the root homepage
+ RewriteRule .* index.php [F]
+ #
+ ## End - Rewrite rules to block out some common exploits.
+ 
+ ## Begin - Custom redirects
+ #
+ # If you need to redirect some pages, or set a canonical non-www to
+ # www redirect (or vice versa), place that code here. Ensure those
+ # redirects use the correct RewriteRule syntax and the [R=301,L] flags.
+ #
+ ## End - Custom redirects
+ 
+ ##
+ # Uncomment following line if your webserver's URL
+ # is not directly related to physical file paths.
+ # Update Your Joomla! Directory (just / for root).
+ ##
+ 
+ # RewriteBase /
+ 
+ ## Begin - Joomla! core SEF Section.
+ #
+ RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+ #
+ # If the requested path and file is not /index.php and the request
+ # has not already been internally rewritten to the index.php script
+ RewriteCond %{REQUEST_URI} !^/index\.php
+ # and the request is for something within the component folder,
+ # or for the site root, or for an extensionless URL, or the
+ # requested URL ends with one of the listed extensions
+ RewriteCond %{REQUEST_URI} /component/|(/[^.]*|\.(php|html?|feed|pdf|vcf|raw))$ [NC]
+ # and the requested path and file doesn't directly match a physical file
+ RewriteCond %{REQUEST_FILENAME} !-f
+ # and the requested path and file doesn't directly match a physical folder
+ RewriteCond %{REQUEST_FILENAME} !-d
+ # internally rewrite the request to the index.php script
+ RewriteRule .* index.php [L]
+ #
+ ## End - Joomla! core SEF Section.
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/j25_sample.sql /home/packages/code/qi/SOURCES/joomla-2.5.8/j25_sample.sql
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/j25_sample.sql	2012-10-29 13:28:56.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/j25_sample.sql	2012-12-17 16:40:33.000000000 -0600
***************
*** 1,11 ****
  #
  # IMPORTANT - THIS FILE MUST BE SAVED WITH UTF-8 ENCODING ONLY. BEWARE IF EDITING!
  #
! TRUNCATE `qto1k_assets`;
  --
! -- Dumping data for table `qto1k_assets`
  --
! INSERT INTO `qto1k_assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES
  (1, 0, 1, 424, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
  (2, 1, 2, 3, 1, 'com_admin', 'com_admin', '{}'),
  (3, 1, 4, 11, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'),
--- 1,11 ----
  #
  # IMPORTANT - THIS FILE MUST BE SAVED WITH UTF-8 ENCODING ONLY. BEWARE IF EDITING!
  #
! TRUNCATE `joom_assets`;
  --
! -- Dumping data for table `joom_assets`
  --
! INSERT INTO `joom_assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES
  (1, 0, 1, 424, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
  (2, 1, 2, 3, 1, 'com_admin', 'com_admin', '{}'),
  (3, 1, 4, 11, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'),
***************
*** 166,203 ****
  (166, 47, 183, 188, 6, 'com_content.category.75', 'Navigation Modules', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'),
  (167, 54, 291, 292, 4, 'com_content.category.76', 'Recipes', '{"core.create":{"12":1,"10":1},"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":{"12":1,"10":1}}'),
  (168, 34, 106, 107, 3, 'com_content.article.67', 'What''s New in 1.5?', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'),
! (169, 24, 337, 338, 2, 'com_users.notes.category.77', 'Uncategorised', ''),
  (170, 50, 219, 220, 6, 'com_content.article.68', 'Captcha', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'),
  (171, 50, 221, 222, 6, 'com_content.article.69', 'Quick Icons', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'),
  (172, 96, 178, 179, 7, 'com_content.article.70', 'Smart Search', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'),
  (173, 1, 422, 423, 1, 'com_joomlaupdate', 'com_joomlaupdate', '{"core.admin":[],"core.manage":[],"core.delete":[],"core.edit.state":[]}');
  
  --
! -- Dumping data for table `qto1k_banners`
  --
  
! INSERT IGNORE INTO `qto1k_banners` VALUES
  (2, 3, 0, 'Shop 1', 'shop-1', 0, 90, 2, 'http://shop.joomla.org/amazoncom-bookstores.html', 1, 15, 'Get books about Joomla! at the Joomla! Book Shop.', '', 0, 1, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":"Joomla! Books"}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2011-01-01 00:00:01', 'en-GB'),
  (3, 2, 0, 'Shop 2', 'shop-2', 0, 140, 2, 'http://shop.joomla.org', 1, 15, 'T Shirts, caps and more from the Joomla! Shop.', '', 0, 2, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":"Joomla! Shop"}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2011-01-01 00:00:01', 'en-GB'),
  (4, 1, 0, 'Support Joomla!', 'support-joomla', 0, 59, 1, 'http://contribute.joomla.org', 1, 15, 'Your contributions of time, talent and money make Joomla possible.', '', 0, 3, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":""}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 'en-GB');
  
  
  --
! -- Dumping data for table `qto1k_banner_clients`
  --
  
! INSERT IGNORE INTO `qto1k_banner_clients` VALUES
  (1, 'Joomla!', 'Administrator', 'email@email.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, -1, -1),
  (2, 'Shop', 'Example', 'example@example.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, 0, 0),
  (3, 'Bookstore', 'Bookstore Example', 'example@example.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, 0, 0);
  
  
! TRUNCATE `qto1k_categories`;
  --
! -- Dumping data for table `qto1k_categories` (remove existing rows first)
  --
  
! INSERT IGNORE INTO `qto1k_categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `extension`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`, `modified_user_id`, `modified_time`, `hits`, `language`) VALUES
  (1, 0, 0, 0, 135, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{}', '', '', '', 0, '2011-01-01 00:00:01', 0, '2011-01-01 00:00:01', 0, '*'),
  (9, 34, 1, 131, 132, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-01-01 00:00:01', 0, '*'),
  (10, 35, 1, 129, 130, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":"","foobar":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '2011-01-01 00:00:01', 0, '*'),
--- 166,203 ----
  (166, 47, 183, 188, 6, 'com_content.category.75', 'Navigation Modules', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'),
  (167, 54, 291, 292, 4, 'com_content.category.76', 'Recipes', '{"core.create":{"12":1,"10":1},"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":{"12":1,"10":1}}'),
  (168, 34, 106, 107, 3, 'com_content.article.67', 'What''s New in 1.5?', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'),
! (169, 24, 337, 338, 2, 'com_users.category.77', 'Uncategorised', ''),
  (170, 50, 219, 220, 6, 'com_content.article.68', 'Captcha', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'),
  (171, 50, 221, 222, 6, 'com_content.article.69', 'Quick Icons', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'),
  (172, 96, 178, 179, 7, 'com_content.article.70', 'Smart Search', '{"core.delete":[],"core.edit":[],"core.edit.state":[]}'),
  (173, 1, 422, 423, 1, 'com_joomlaupdate', 'com_joomlaupdate', '{"core.admin":[],"core.manage":[],"core.delete":[],"core.edit.state":[]}');
  
  --
! -- Dumping data for table `joom_banners`
  --
  
! INSERT IGNORE INTO `joom_banners` VALUES
  (2, 3, 0, 'Shop 1', 'shop-1', 0, 90, 2, 'http://shop.joomla.org/amazoncom-bookstores.html', 1, 15, 'Get books about Joomla! at the Joomla! Book Shop.', '', 0, 1, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":"Joomla! Books"}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2011-01-01 00:00:01', 'en-GB'),
  (3, 2, 0, 'Shop 2', 'shop-2', 0, 140, 2, 'http://shop.joomla.org', 1, 15, 'T Shirts, caps and more from the Joomla! Shop.', '', 0, 2, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":"Joomla! Shop"}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2011-01-01 00:00:01', 'en-GB'),
  (4, 1, 0, 'Support Joomla!', 'support-joomla', 0, 59, 1, 'http://contribute.joomla.org', 1, 15, 'Your contributions of time, talent and money make Joomla possible.', '', 0, 3, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":""}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 'en-GB');
  
  
  --
! -- Dumping data for table `joom_banner_clients`
  --
  
! INSERT IGNORE INTO `joom_banner_clients` VALUES
  (1, 'Joomla!', 'Administrator', 'email@email.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, -1, -1),
  (2, 'Shop', 'Example', 'example@example.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, 0, 0),
  (3, 'Bookstore', 'Bookstore Example', 'example@example.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, 0, 0);
  
  
! TRUNCATE `joom_categories`;
  --
! -- Dumping data for table `joom_categories` (remove existing rows first)
  --
  
! INSERT IGNORE INTO `joom_categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `extension`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`, `modified_user_id`, `modified_time`, `hits`, `language`) VALUES
  (1, 0, 0, 0, 135, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{}', '', '', '', 0, '2011-01-01 00:00:01', 0, '2011-01-01 00:00:01', 0, '*'),
  (9, 34, 1, 131, 132, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-01-01 00:00:01', 0, '*'),
  (10, 35, 1, 129, 130, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":"","foobar":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '2011-01-01 00:00:01', 0, '*'),
***************
*** 265,282 ****
  (73, 109, 28, 46, 47, 4, 'sample-data-articles/park-site/photo-gallery/scenery', 'com_content', 'Scenery', 'scenery', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-01-01 00:00:01', 0, 'en-GB'),
  (75, 166, 22, 23, 24, 5, 'sample-data-articles/joomla/extensions/modules/navigation-modules', 'com_content', 'Navigation Modules', 'navigation-modules', '', '<p>Navigation modules help your visitors move through your site and find what they need.</p>\r\n<p>Menus provide your site with structure and help your visitors navigate your site.  Although they are all based on the same menu module, the variety of ways menus are used in the sample data show how flexible this module is.</p>\r\n<p>A menu can range from extremely simple (for example the top menu or the menu for the Australian Parks sample site) to extremely complex (for example the About Joomla! menu with its many levels). They can also be used for other types of presentation such as the site map linked from the "This Site" menu.</p>\r\n<p>Breadcrumbs provide users with information about where they are in a site.</p>', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-01-01 00:00:01', 0, '*'),
  (76, 167, 29, 53, 54, 3, 'sample-data-articles/fruit-shop-site/recipes', 'com_content', 'Recipes', 'recipes', '', '<p>Customers and suppliers can post their favorite recipes for fruit here.</p>\r\n<p>A good idea is to promote the use of metadata keywords to make finding other recipes for the same fruit easier.</p>\r\n<p><em>To see this in action, create a user assigned to the customer group and a user assigned to the suppliers group. These users will be able to create their own recipe pages and edit those pages. They will not be able to edit other users'' pages.</em><br /><br /></p>', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-12-27 12:18:25', 0, '*'),
! (77, 169, 1, 133, 134, 1, 'uncategorised', 'com_users.notes', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '2011-01-01 00:00:01', 0, '*');
  --
  -- Update rgt value of root category row
  --
! SET @max_rgt = (SELECT MAX(rgt)+1 FROM `qto1k_categories` WHERE `id` <> 1);
! UPDATE `qto1k_categories` SET rgt = @max_rgt WHERE id = 1;
  
  --
! -- Dumping data for table `qto1k_contact_details`
  --
  
! INSERT IGNORE INTO `qto1k_contact_details` (`id`, `name`, `alias`, `con_position`, `address`, `suburb`, `state`, `country`, `postcode`, `telephone`, `fax`, `misc`, `image`, `imagepos`, `email_to`, `default_con`, `published`, `checked_out`, `checked_out_time`, `ordering`, `params`, `user_id`, `catid`, `access`, `mobile`, `webpage`, `sortname1`, `sortname2`, `sortname3`, `language`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `metakey`, `metadesc`, `metadata`, `featured`, `xreference`, `publish_up`, `publish_down`) VALUES
  (1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '<p>Information about or by the contact.</p>', 'images/powered_by.png', 'top', 'email@example.com', 1, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribed","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 0, '', '2011-12-27 12:23:32', 42, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (2, 'Webmaster', 'webmaster', '', '', '', '', '', '', '', '', '', '', NULL, 'webmaster@example.com', 0, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"1","show_email_copy":"1","banned_email":"","banned_subject":"","banned_text":"","validate_session":"1","custom_reply":"","redirect":""}', 0, 34, 1, '', '', '', '', '', 'en-GB', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (3, 'Owner', 'owner', '', '', '', '', '', '', '', '', '<p>I''m the owner of this store.</p>', '', NULL, '', 0, 1, 0, '0000-00-00 00:00:00', 2, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 36, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
--- 265,282 ----
  (73, 109, 28, 46, 47, 4, 'sample-data-articles/park-site/photo-gallery/scenery', 'com_content', 'Scenery', 'scenery', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-01-01 00:00:01', 0, 'en-GB'),
  (75, 166, 22, 23, 24, 5, 'sample-data-articles/joomla/extensions/modules/navigation-modules', 'com_content', 'Navigation Modules', 'navigation-modules', '', '<p>Navigation modules help your visitors move through your site and find what they need.</p>\r\n<p>Menus provide your site with structure and help your visitors navigate your site.  Although they are all based on the same menu module, the variety of ways menus are used in the sample data show how flexible this module is.</p>\r\n<p>A menu can range from extremely simple (for example the top menu or the menu for the Australian Parks sample site) to extremely complex (for example the About Joomla! menu with its many levels). They can also be used for other types of presentation such as the site map linked from the "This Site" menu.</p>\r\n<p>Breadcrumbs provide users with information about where they are in a site.</p>', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-01-01 00:00:01', 0, '*'),
  (76, 167, 29, 53, 54, 3, 'sample-data-articles/fruit-shop-site/recipes', 'com_content', 'Recipes', 'recipes', '', '<p>Customers and suppliers can post their favorite recipes for fruit here.</p>\r\n<p>A good idea is to promote the use of metadata keywords to make finding other recipes for the same fruit easier.</p>\r\n<p><em>To see this in action, create a user assigned to the customer group and a user assigned to the suppliers group. These users will be able to create their own recipe pages and edit those pages. They will not be able to edit other users'' pages.</em><br /><br /></p>', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 42, '2011-12-27 12:18:25', 0, '*'),
! (77, 169, 1, 133, 134, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '2011-01-01 00:00:01', 0, '*');
  --
  -- Update rgt value of root category row
  --
! SET @max_rgt = (SELECT MAX(rgt)+1 FROM `joom_categories` WHERE `id` <> 1);
! UPDATE `joom_categories` SET rgt = @max_rgt WHERE id = 1;
  
  --
! -- Dumping data for table `joom_contact_details`
  --
  
! INSERT IGNORE INTO `joom_contact_details` (`id`, `name`, `alias`, `con_position`, `address`, `suburb`, `state`, `country`, `postcode`, `telephone`, `fax`, `misc`, `image`, `imagepos`, `email_to`, `default_con`, `published`, `checked_out`, `checked_out_time`, `ordering`, `params`, `user_id`, `catid`, `access`, `mobile`, `webpage`, `sortname1`, `sortname2`, `sortname3`, `language`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `metakey`, `metadesc`, `metadata`, `featured`, `xreference`, `publish_up`, `publish_down`) VALUES
  (1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '<p>Information about or by the contact.</p>', 'images/powered_by.png', 'top', 'email@example.com', 1, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribed","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 0, '', '2011-12-27 12:23:32', 42, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (2, 'Webmaster', 'webmaster', '', '', '', '', '', '', '', '', '', '', NULL, 'webmaster@example.com', 0, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"1","show_email_copy":"1","banned_email":"","banned_subject":"","banned_text":"","validate_session":"1","custom_reply":"","redirect":""}', 0, 34, 1, '', '', '', '', '', 'en-GB', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (3, 'Owner', 'owner', '', '', '', '', '', '', '', '', '<p>I''m the owner of this store.</p>', '', NULL, '', 0, 1, 0, '0000-00-00 00:00:00', 2, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 36, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
***************
*** 286,295 ****
  (7, 'Tamarind', 'tamarind', 'Scientific Name: Tamarindus indica', 'Image Credit: Franz Eugen Köhler, Köhler''s Medizinal-Pflanzen \r\nRights: Public Domain\r\nSource:http://commons.wikimedia.org/wiki/File:Koeh-134.jpg', '', 'Family: Fabaceae', 'Large Producers: India, United States', '', '', '', '<p>Tamarinds are a versatile fruit used around the world. In its young form it is used in hot sauces; ripened it is the basis for many refreshing drinks.</p>\r\n<p> </p>', 'images/sampledata/fruitshop/tamarind.jpg', NULL, '', 0, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"plain","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Wikipedia: Tamarind English","linka":"http:\\/\\/en.wikipedia.org\\/wiki\\/Tamarind","linkb_name":"Wikipedia: \\u09a4\\u09c7\\u0981\\u09a4\\u09c1\\u09b2  \\u09ac\\u09be\\u0982\\u09b2\\u09be  ","linkb":"http:\\/\\/bn.wikipedia.org\\/wiki\\/\\u09a4\\u09c7\\u0981\\u09a4\\u09c1\\u09b2 ","linkc_name":"Wikipedia: Tamarinier Fran\\u00e7ais","linkc":"http:\\/\\/fr.wikipedia.org\\/wiki\\/Tamarinier","linkd_name":"Wikipedia:Tamaline lea faka-Tonga","linkd":"http:\\/\\/to.wikipedia.org\\/wiki\\/Tamaline","linke_name":"","linke":"","contact_layout":"beez5:encyclopedia"}', 0, 57, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","rights":""}', 0, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (8, 'Shop Address', 'shop-address', '', '', 'Our City', 'Our Province', 'Our Country', '', '555-555-5555', '', '<p>Here are directions for how to get to our shop.</p>', '', NULL, '', 0, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 35, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00');
  --
! -- Dumping data for table `qto1k_content`
  --
  
! INSERT IGNORE INTO `qto1k_content` (`id`, `asset_id`, `title`, `alias`, `title_alias`, `introtext`, `fulltext`, `state`, `sectionid`, `mask`, `catid`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `images`, `urls`, `attribs`, `version`, `parentid`, `ordering`, `metakey`, `metadesc`, `access`, `hits`, `metadata`, `featured`, `language`, `xreference`) VALUES
  (1, 89, 'Administrator Components', 'administrator-components', '', '<p>All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are</p>\r\n<ul>\r\n<li>Media Manager</li>\r\n<li>Extensions Manager</li>\r\n<li>Menu Manager</li>\r\n<li>Global Configuration</li>\r\n<li>Banners</li>\r\n<li>Redirect</li>\r\n</ul>\r\n<hr title="Media Manager" alt="Media Manager" class="system-pagebreak" style="color: gray; border: 1px dashed gray;" />\r\n<p> </p>\r\n<h3>Media Manager</h3>\r\n<p>The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Content_Media_Manager">Help</a></p>\r\n<hr title="Extensions Manager" alt="Extensions Manager" class="system-pagebreak" style="color: gray; border: 1px dashed gray;" />\r\n<h3>Extensions Manager</h3>\r\n<p>The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Extensions_Extension_Manager_Install">Help</a></p>\r\n<hr title="Menu Manager" alt="Menu Manager" class="system-pagebreak" style="color: gray; border: 1px dashed gray;" />\r\n<h3>Menu Manager</h3>\r\n<p>The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Menus_Menu_Manager">Help</a></p>\r\n<hr title="Global Configuration" alt="Global Configuration" class="system-pagebreak" style="color: gray; border: 1px dashed gray;" />\r\n<h3>Global Configuration</h3>\r\n<p>The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Site_Global_Configuration">Help</a></p>\r\n<hr title="Banners" alt="Banners" class="system-pagebreak" style="color: gray; border: 1px dashed gray;" />\r\n<h3>Banners</h3>\r\n<p>The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Components_Banners_Banners_Edit">Help</a></p>\r\n<hr title="Redirect" class="system-pagebreak" />\r\n<h3><br />Redirect</h3>\r\n<p>The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Components_Redirect_Manager">Help</a></p>', '', 1, 0, 0, 21, '2011-01-01 00:00:01', 42, 'Joomla!', '2011-12-27 11:03:19', 42, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 9, 0, 7, '', '', 1, 2, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''),
  (2, 90, 'Archive Module', 'archive-module', '', '<p>This module shows a list of the calendar months containing archived articles. After you have changed the status of an article to archived, this list will be automatically generated. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Extensions_Module_Manager_Articles_Archive" title="Archive Module">Help</a></p>\r\n<div class="sample-module">{loadmodule articles_archive,Archived Articles}</div>', '', 1, 0, 0, 64, '2011-01-01 00:00:01', 42, 'Joomla!', '2011-09-17 22:18:05', 42, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 5, 0, 5, 'modules, content', '', 1, 5, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''),
  (3, 91, 'Article Categories Module', 'article-categories-module', '', '<p>This module displays a list of categories from one parent category. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Extensions_Module_Manager_Articles_Categories" title="Categories Module">Help</a></p>\r\n<div class="sample-module">{loadmodule articles_categories,Articles Categories}</div>\r\n<p> </p>', '', 1, 0, 0, 64, '2011-01-01 00:00:01', 42, '', '2011-09-17 22:13:31', 42, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 5, 0, 6, 'modules, content', '', 1, 6, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''),
--- 286,295 ----
  (7, 'Tamarind', 'tamarind', 'Scientific Name: Tamarindus indica', 'Image Credit: Franz Eugen Köhler, Köhler''s Medizinal-Pflanzen \r\nRights: Public Domain\r\nSource:http://commons.wikimedia.org/wiki/File:Koeh-134.jpg', '', 'Family: Fabaceae', 'Large Producers: India, United States', '', '', '', '<p>Tamarinds are a versatile fruit used around the world. In its young form it is used in hot sauces; ripened it is the basis for many refreshing drinks.</p>\r\n<p> </p>', 'images/sampledata/fruitshop/tamarind.jpg', NULL, '', 0, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"plain","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Wikipedia: Tamarind English","linka":"http:\\/\\/en.wikipedia.org\\/wiki\\/Tamarind","linkb_name":"Wikipedia: \\u09a4\\u09c7\\u0981\\u09a4\\u09c1\\u09b2  \\u09ac\\u09be\\u0982\\u09b2\\u09be  ","linkb":"http:\\/\\/bn.wikipedia.org\\/wiki\\/\\u09a4\\u09c7\\u0981\\u09a4\\u09c1\\u09b2 ","linkc_name":"Wikipedia: Tamarinier Fran\\u00e7ais","linkc":"http:\\/\\/fr.wikipedia.org\\/wiki\\/Tamarinier","linkd_name":"Wikipedia:Tamaline lea faka-Tonga","linkd":"http:\\/\\/to.wikipedia.org\\/wiki\\/Tamaline","linke_name":"","linke":"","contact_layout":"beez5:encyclopedia"}', 0, 57, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","rights":""}', 0, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (8, 'Shop Address', 'shop-address', '', '', 'Our City', 'Our Province', 'Our Country', '', '555-555-5555', '', '<p>Here are directions for how to get to our shop.</p>', '', NULL, '', 0, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 35, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00');
  --
! -- Dumping data for table `joom_content`
  --
  
! INSERT IGNORE INTO `joom_content` (`id`, `asset_id`, `title`, `alias`, `title_alias`, `introtext`, `fulltext`, `state`, `sectionid`, `mask`, `catid`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `images`, `urls`, `attribs`, `version`, `parentid`, `ordering`, `metakey`, `metadesc`, `access`, `hits`, `metadata`, `featured`, `language`, `xreference`) VALUES
  (1, 89, 'Administrator Components', 'administrator-components', '', '<p>All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are</p>\r\n<ul>\r\n<li>Media Manager</li>\r\n<li>Extensions Manager</li>\r\n<li>Menu Manager</li>\r\n<li>Global Configuration</li>\r\n<li>Banners</li>\r\n<li>Redirect</li>\r\n</ul>\r\n<hr title="Media Manager" alt="Media Manager" class="system-pagebreak" style="color: gray; border: 1px dashed gray;" />\r\n<p> </p>\r\n<h3>Media Manager</h3>\r\n<p>The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Content_Media_Manager">Help</a></p>\r\n<hr title="Extensions Manager" alt="Extensions Manager" class="system-pagebreak" style="color: gray; border: 1px dashed gray;" />\r\n<h3>Extensions Manager</h3>\r\n<p>The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Extensions_Extension_Manager_Install">Help</a></p>\r\n<hr title="Menu Manager" alt="Menu Manager" class="system-pagebreak" style="color: gray; border: 1px dashed gray;" />\r\n<h3>Menu Manager</h3>\r\n<p>The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Menus_Menu_Manager">Help</a></p>\r\n<hr title="Global Configuration" alt="Global Configuration" class="system-pagebreak" style="color: gray; border: 1px dashed gray;" />\r\n<h3>Global Configuration</h3>\r\n<p>The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Site_Global_Configuration">Help</a></p>\r\n<hr title="Banners" alt="Banners" class="system-pagebreak" style="color: gray; border: 1px dashed gray;" />\r\n<h3>Banners</h3>\r\n<p>The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Components_Banners_Banners_Edit">Help</a></p>\r\n<hr title="Redirect" class="system-pagebreak" />\r\n<h3><br />Redirect</h3>\r\n<p>The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Components_Redirect_Manager">Help</a></p>', '', 1, 0, 0, 21, '2011-01-01 00:00:01', 42, 'Joomla!', '2011-12-27 11:03:19', 42, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 9, 0, 7, '', '', 1, 2, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''),
  (2, 90, 'Archive Module', 'archive-module', '', '<p>This module shows a list of the calendar months containing archived articles. After you have changed the status of an article to archived, this list will be automatically generated. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Extensions_Module_Manager_Articles_Archive" title="Archive Module">Help</a></p>\r\n<div class="sample-module">{loadmodule articles_archive,Archived Articles}</div>', '', 1, 0, 0, 64, '2011-01-01 00:00:01', 42, 'Joomla!', '2011-09-17 22:18:05', 42, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 5, 0, 5, 'modules, content', '', 1, 5, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''),
  (3, 91, 'Article Categories Module', 'article-categories-module', '', '<p>This module displays a list of categories from one parent category. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help16:Extensions_Module_Manager_Articles_Categories" title="Categories Module">Help</a></p>\r\n<div class="sample-module">{loadmodule articles_categories,Articles Categories}</div>\r\n<p> </p>', '', 1, 0, 0, 64, '2011-01-01 00:00:01', 42, '', '2011-09-17 22:13:31', 42, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 5, 0, 6, 'modules, content', '', 1, 6, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''),
***************
*** 361,381 ****
  (70, 170, 'Smart Search', 'smart-search', '', '<p>This module provides search using the Smart Search component. You should only use it if you have indexed your content and either have enabled the Smart Search content plugin or are keeping the index of your site updated manually. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help25:Extensions_Module_Manager_Smart_Search">Help</a>.</p>\r\n<div class="sample-module">{loadmodule finder,Smart Search}</div>', '', 1, 0, 0, 67, '2012-01-17 03:42:36', 42, '', '2012-01-17 16:15:48', 42, 0, '0000-00-00 00:00:00', '2012-01-17 03:42:36', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 10, 0, 0, '', '', 1, 13, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', '');
  
  --
! -- Dumping data for table `qto1k_content_frontpage`
  --
  
! INSERT IGNORE INTO `qto1k_content_frontpage`  (`content_id`, `ordering`) VALUES
  (8, 2),
  (35, 4),
  (24, 1),
  (50, 3);
  
  --
! -- Dumping data for table `qto1k_menu` (remove existing rows first)
  --
! TRUNCATE `qto1k_menu`;
  
! INSERT IGNORE INTO `qto1k_menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `ordering`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES
  (1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 283, 0, '*', 0),
  (2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 13, 22, 0, '*', 1),
  (3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 14, 15, 0, '*', 1),
--- 361,381 ----
  (70, 170, 'Smart Search', 'smart-search', '', '<p>This module provides search using the Smart Search component. You should only use it if you have indexed your content and either have enabled the Smart Search content plugin or are keeping the index of your site updated manually. <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help25:Extensions_Module_Manager_Smart_Search">Help</a>.</p>\r\n<div class="sample-module">{loadmodule finder,Smart Search}</div>', '', 1, 0, 0, 67, '2012-01-17 03:42:36', 42, '', '2012-01-17 16:15:48', 42, 0, '0000-00-00 00:00:00', '2012-01-17 03:42:36', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 10, 0, 0, '', '', 1, 13, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', '');
  
  --
! -- Dumping data for table `joom_content_frontpage`
  --
  
! INSERT IGNORE INTO `joom_content_frontpage`  (`content_id`, `ordering`) VALUES
  (8, 2),
  (35, 4),
  (24, 1),
  (50, 3);
  
  --
! -- Dumping data for table `joom_menu` (remove existing rows first)
  --
! TRUNCATE `joom_menu`;
  
! INSERT IGNORE INTO `joom_menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `ordering`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES
  (1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 283, 0, '*', 0),
  (2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 13, 22, 0, '*', 1),
  (3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 14, 15, 0, '*', 1),
***************
*** 521,530 ****
  (467, 'aboutjoomla', 'Smart Search', 'smart-search', '', 'using-joomla/extensions/modules/utility-modules/smart-search', 'index.php?option=com_content&view=article&id=70', 'component', 1, 414, 5, 22, 0, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 179, 180, 0, '*', 0);
  
  --
! -- Dumping data for table `qto1k_menu_types`
  --
! TRUNCATE `qto1k_menu_types`;
! INSERT IGNORE INTO `qto1k_menu_types` VALUES
  (2, 'usermenu', 'User Menu', 'A Menu for logged-in Users'),
  (3, 'top', 'Top', 'Links for major types of users'),
  (4, 'aboutjoomla', 'About Joomla', 'All about Joomla!'),
--- 521,530 ----
  (467, 'aboutjoomla', 'Smart Search', 'smart-search', '', 'using-joomla/extensions/modules/utility-modules/smart-search', 'index.php?option=com_content&view=article&id=70', 'component', 1, 414, 5, 22, 0, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 179, 180, 0, '*', 0);
  
  --
! -- Dumping data for table `joom_menu_types`
  --
! TRUNCATE `joom_menu_types`;
! INSERT IGNORE INTO `joom_menu_types` VALUES
  (2, 'usermenu', 'User Menu', 'A Menu for logged-in Users'),
  (3, 'top', 'Top', 'Links for major types of users'),
  (4, 'aboutjoomla', 'About Joomla', 'All about Joomla!'),
***************
*** 533,541 ****
  (7, 'fruitshop', 'Fruit Shop', 'Menu for the sample shop site.');
  
  --
! -- Dumping data for table `qto1k_modules`
  --
! INSERT IGNORE INTO `qto1k_modules` VALUES
  (1, 'Main Menu', '', '', 1, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","startLevel":"0","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"_menu","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
  (2, 'Login', '', '', 1, 'login', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 1, '', 1, '*'),
  (3, 'Popular Articles', '', '', 3, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","automatic_title":"1"}', 1, '*'),
--- 533,541 ----
  (7, 'fruitshop', 'Fruit Shop', 'Menu for the sample shop site.');
  
  --
! -- Dumping data for table `joom_modules`
  --
! INSERT IGNORE INTO `joom_modules` VALUES
  (1, 'Main Menu', '', '', 1, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","startLevel":"0","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"_menu","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
  (2, 'Login', '', '', 1, 'login', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 1, '', 1, '*'),
  (3, 'Popular Articles', '', '', 3, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","automatic_title":"1"}', 1, '*'),
***************
*** 601,612 ****
  (86, 'Joomla Version', '', '', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*');
  
  --
! -- Dumping data for table `qto1k_modules_menu`
  --
  
! TRUNCATE `qto1k_modules_menu`;
  
! INSERT  INTO `qto1k_modules_menu` (`moduleid`, `menuid`) VALUES
  (1, 101),
  (2, 0),
  (3, 0),
--- 601,612 ----
  (86, 'Joomla Version', '', '', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*');
  
  --
! -- Dumping data for table `joom_modules_menu`
  --
  
! TRUNCATE `joom_modules_menu`;
  
! INSERT  INTO `joom_modules_menu` (`moduleid`, `menuid`) VALUES
  (1, 101),
  (2, 0),
  (3, 0),
***************
*** 770,798 ****
  (86, 0);
  
  --
! -- Dumping data for table `qto1k_newsfeeds`
  --
! INSERT IGNORE INTO `qto1k_newsfeeds` (`catid`, `id`, `name`, `alias`, `link`, `filename`, `published`, `numarticles`, `cache_time`, `checked_out`, `checked_out_time`, `ordering`, `rtl`, `access`, `language`, `params`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `metakey`, `metadesc`, `metadata`, `xreference`, `publish_up`, `publish_down`) VALUES
  (17, 1, 'Joomla! Announcements', 'joomla-announcements', 'http://www.joomla.org/announcements.feed?type=rss', NULL, 1, 5, 3600, 0, '0000-00-00 00:00:00', 1, 1, 1, 'en-GB', '{"show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","newsfeed_layout":"","feed_display_order":""}', '2011-01-01 00:00:01', 0, '', '2011-12-27 12:25:05', 42, '', '', '{"robots":"","rights":""}', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (17, 2, 'New Joomla! Extensions', 'new-joomla-extensions', 'http://feeds.joomla.org/JoomlaExtensions', NULL, 1, 5, 3600, 0, '0000-00-00 00:00:00', 4, 1, 1, 'en-GB', '{"show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","newsfeed_layout":"","feed_display_order":""}', '2011-01-01 00:00:01', 0, '', '2011-12-27 12:25:36', 42, '', '', '{"robots":"","rights":""}', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (17, 3, 'Joomla! Security News', 'joomla-security-news', 'http://feeds.joomla.org/JoomlaSecurityNews', NULL, 1, 5, 3600, 0, '0000-00-00 00:00:00', 2, 1, 1, 'en-GB', '{"show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","newsfeed_layout":"","feed_display_order":""}', '2011-01-01 00:00:01', 0, '', '2011-12-27 12:24:55', 42, '', '', '{"robots":"","rights":""}', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (17, 4, 'Joomla! Connect', 'joomla-connect', 'http://feeds.joomla.org/JoomlaConnect', NULL, 1, 5, 3600, 0, '0000-00-00 00:00:00', 3, 1, 1, 'en-GB', '{"show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","newsfeed_layout":"","feed_display_order":""}', '2011-01-01 00:00:01', 0, '', '2011-12-27 12:25:10', 42, '', '', '{"robots":"","rights":""}', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00');
  
  --
! -- Dumping data for table `qto1k_template_styles`
  --
  
! INSERT INTO `qto1k_template_styles` (`id`, `template`, `client_id`, `home`, `title`, `params`) VALUES
! (114, 'beez_20', 0, 0, 'Beez2 - Parks Site', '{"wrapperSmall":"53","wrapperLarge":"72","logo":"","sitetitle":"Australian Parks","sitedescription":"Parks Sample Site","navposition":"center","templatecolor":"nature"}');
! 
! 
! 
! DELETE FROM `qto1k_usergroups`;
  --
! -- Dumping data for table `qto1k_usergroups`
  --
  
! INSERT INTO `qto1k_usergroups` (`id`, `parent_id`, `lft`, `rgt`, `title`) VALUES
  (1, 0, 1, 20, 'Public'),
  (2, 1, 6, 17, 'Registered'),
  (3, 2, 7, 14, 'Author'),
--- 770,793 ----
  (86, 0);
  
  --
! -- Dumping data for table `joom_newsfeeds`
  --
! INSERT IGNORE INTO `joom_newsfeeds` (`catid`, `id`, `name`, `alias`, `link`, `filename`, `published`, `numarticles`, `cache_time`, `checked_out`, `checked_out_time`, `ordering`, `rtl`, `access`, `language`, `params`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `metakey`, `metadesc`, `metadata`, `xreference`, `publish_up`, `publish_down`) VALUES
  (17, 1, 'Joomla! Announcements', 'joomla-announcements', 'http://www.joomla.org/announcements.feed?type=rss', NULL, 1, 5, 3600, 0, '0000-00-00 00:00:00', 1, 1, 1, 'en-GB', '{"show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","newsfeed_layout":"","feed_display_order":""}', '2011-01-01 00:00:01', 0, '', '2011-12-27 12:25:05', 42, '', '', '{"robots":"","rights":""}', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (17, 2, 'New Joomla! Extensions', 'new-joomla-extensions', 'http://feeds.joomla.org/JoomlaExtensions', NULL, 1, 5, 3600, 0, '0000-00-00 00:00:00', 4, 1, 1, 'en-GB', '{"show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","newsfeed_layout":"","feed_display_order":""}', '2011-01-01 00:00:01', 0, '', '2011-12-27 12:25:36', 42, '', '', '{"robots":"","rights":""}', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (17, 3, 'Joomla! Security News', 'joomla-security-news', 'http://feeds.joomla.org/JoomlaSecurityNews', NULL, 1, 5, 3600, 0, '0000-00-00 00:00:00', 2, 1, 1, 'en-GB', '{"show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","newsfeed_layout":"","feed_display_order":""}', '2011-01-01 00:00:01', 0, '', '2011-12-27 12:24:55', 42, '', '', '{"robots":"","rights":""}', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (17, 4, 'Joomla! Connect', 'joomla-connect', 'http://feeds.joomla.org/JoomlaConnect', NULL, 1, 5, 3600, 0, '0000-00-00 00:00:00', 3, 1, 1, 'en-GB', '{"show_feed_image":"","show_feed_description":"","show_item_description":"","feed_character_count":"0","newsfeed_layout":"","feed_display_order":""}', '2011-01-01 00:00:01', 0, '', '2011-12-27 12:25:10', 42, '', '', '{"robots":"","rights":""}', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00');
  
  --
! -- Dumping data for table `joom_template_styles`
  --
  
! DELETE FROM `joom_usergroups`;
  --
! -- Dumping data for table `joom_usergroups`
  --
  
! INSERT INTO `joom_usergroups` (`id`, `parent_id`, `lft`, `rgt`, `title`) VALUES
  (1, 0, 1, 20, 'Public'),
  (2, 1, 6, 17, 'Registered'),
  (3, 2, 7, 14, 'Author'),
***************
*** 805,821 ****
  (10, 3, 12, 13, 'Shop Suppliers (Example)');
  
  --
! -- Dumping data for table `qto1k_viewlevels`
  --
  
! INSERT IGNORE INTO `qto1k_viewlevels` (`id`, `title`, `ordering`, `rules`) VALUES
  (4, 'Customer Access Level (Example)', 3, '[6,3,12]');
  
  --
! -- Dumping data for table `qto1k_weblinks`
  --
  
! INSERT IGNORE INTO `qto1k_weblinks` (`id`, `catid`, `sid`, `title`, `alias`, `url`, `description`, `date`, `hits`, `state`, `checked_out`, `checked_out_time`, `ordering`, `archived`, `approved`, `access`, `params`, `language`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `metakey`, `metadesc`, `metadata`, `featured`, `xreference`, `publish_up`, `publish_down`) VALUES
  (1, 32, 0, 'Joomla!', 'joomla', 'http://www.joomla.org', '<p>Home of Joomla!</p>', '0000-00-00 00:00:00', 3, 1, 0, '0000-00-00 00:00:00', 1, 0, 1, 1, '{"target":"0","count_clicks":""}', 'en-GB', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","author":"","rights":""}', 0, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (2, 33, 0, 'php.net', 'php', 'http://www.php.net', '<p>The language that Joomla! is developed in</p>', '0000-00-00 00:00:00', 6, 1, 0, '0000-00-00 00:00:00', 1, 0, 1, 1, '{"target":"","count_clicks":""}', 'en-GB', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","author":"","rights":""}', 0, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (3, 33, 0, 'MySQL', 'mysql', 'http://www.mysql.com', '<p>The most commonly used database for Joomla!.</p>', '0000-00-00 00:00:00', 1, 1, 0, '0000-00-00 00:00:00', 2, 0, 1, 1, '{"target":"","width":"","height":"","count_clicks":""}', 'en-GB', '2011-01-01 00:00:01', 0, '', '2012-01-17 16:19:43', 42, '', '', '{"robots":"","rights":""}', 0, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
--- 800,816 ----
  (10, 3, 12, 13, 'Shop Suppliers (Example)');
  
  --
! -- Dumping data for table `joom_viewlevels`
  --
  
! INSERT IGNORE INTO `joom_viewlevels` (`id`, `title`, `ordering`, `rules`) VALUES
  (4, 'Customer Access Level (Example)', 3, '[6,3,12]');
  
  --
! -- Dumping data for table `joom_weblinks`
  --
  
! INSERT IGNORE INTO `joom_weblinks` (`id`, `catid`, `sid`, `title`, `alias`, `url`, `description`, `date`, `hits`, `state`, `checked_out`, `checked_out_time`, `ordering`, `archived`, `approved`, `access`, `params`, `language`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `metakey`, `metadesc`, `metadata`, `featured`, `xreference`, `publish_up`, `publish_down`) VALUES
  (1, 32, 0, 'Joomla!', 'joomla', 'http://www.joomla.org', '<p>Home of Joomla!</p>', '0000-00-00 00:00:00', 3, 1, 0, '0000-00-00 00:00:00', 1, 0, 1, 1, '{"target":"0","count_clicks":""}', 'en-GB', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","author":"","rights":""}', 0, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (2, 33, 0, 'php.net', 'php', 'http://www.php.net', '<p>The language that Joomla! is developed in</p>', '0000-00-00 00:00:00', 6, 1, 0, '0000-00-00 00:00:00', 1, 0, 1, 1, '{"target":"","count_clicks":""}', 'en-GB', '2011-01-01 00:00:01', 0, '', '2011-01-01 00:00:01', 42, '', '', '{"robots":"","author":"","rights":""}', 0, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
  (3, 33, 0, 'MySQL', 'mysql', 'http://www.mysql.com', '<p>The most commonly used database for Joomla!.</p>', '0000-00-00 00:00:00', 1, 1, 0, '0000-00-00 00:00:00', 2, 0, 1, 1, '{"target":"","width":"","height":"","count_clicks":""}', 'en-GB', '2011-01-01 00:00:01', 0, '', '2012-01-17 16:19:43', 42, '', '', '{"robots":"","rights":""}', 0, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/libraries/cms/version/version.php /home/packages/code/qi/SOURCES/joomla-2.5.8/libraries/cms/version/version.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/libraries/cms/version/version.php	2012-10-29 13:28:58.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/libraries/cms/version/version.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 23,29 ****
  	public $RELEASE = '2.5';
  
  	/** @var  string  Maintenance version. */
! 	public $DEV_LEVEL = '7';
  
  	/** @var  string  Development STATUS. */
  	public $DEV_STATUS = 'Stable';
--- 23,29 ----
  	public $RELEASE = '2.5';
  
  	/** @var  string  Maintenance version. */
! 	public $DEV_LEVEL = '8';
  
  	/** @var  string  Development STATUS. */
  	public $DEV_STATUS = 'Stable';
***************
*** 35,41 ****
  	public $CODENAME = 'Ember';
  
  	/** @var  string  Release date. */
! 	public $RELDATE = '13-September-2012';
  
  	/** @var  string  Release time. */
  	public $RELTIME = '14:00';
--- 35,41 ----
  	public $CODENAME = 'Ember';
  
  	/** @var  string  Release date. */
! 	public $RELDATE = '8-November-2012';
  
  	/** @var  string  Release time. */
  	public $RELTIME = '14:00';
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/libraries/joomla/access/access.php /home/packages/code/qi/SOURCES/joomla-2.5.8/libraries/joomla/access/access.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/libraries/joomla/access/access.php	2012-10-29 13:28:56.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/libraries/joomla/access/access.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 98,104 ****
  		// Default to the root asset node.
  		if (empty($asset))
  		{
! 			$asset = 1;
  		}
  
  		// Get the rules for the asset recursively to root if not already retrieved.
--- 98,107 ----
  		// Default to the root asset node.
  		if (empty($asset))
  		{
! 			$db = JFactory::getDbo();
! 			$assets = JTable::getInstance('Asset', 'JTable', array('dbo' => $db));
! 			$rootId = $assets->getRootId();
! 			$asset = $rootId;
  		}
  
  		// Get the rules for the asset recursively to root if not already retrieved.
***************
*** 138,144 ****
  		// Default to the root asset node.
  		if (empty($asset))
  		{
! 			$asset = 1;
  		}
  
  		// Get the rules for the asset recursively to root if not already retrieved.
--- 141,149 ----
  		// Default to the root asset node.
  		if (empty($asset))
  		{
! 			$db = JFactory::getDbo();
! 			$assets = JTable::getInstance('Asset', 'JTable', array('dbo' => $db));
! 			$rootId = $assets->getRootId();
  		}
  
  		// Get the rules for the asset recursively to root if not already retrieved.
***************
*** 224,235 ****
  		// If the asset identifier is numeric assume it is a primary key, else lookup by name.
  		if (is_numeric($asset))
  		{
- 			// Get the root even if the asset is not found
  			$query->where('(a.id = ' . (int) $asset . ($recursive ? ' OR a.parent_id=0' : '') . ')');
  		}
  		else
  		{
- 			// Get the root even if the asset is not found
  			$query->where('(a.name = ' . $db->quote($asset) . ($recursive ? ' OR a.parent_id=0' : '') . ')');
  		}
  
--- 229,238 ----
***************
*** 245,260 ****
  		$result = $db->loadColumn();
  
  		// Get the root even if the asset is not found and in recursive mode
! 		if ($recursive && empty($result))
  		{
  			$query = $db->getQuery(true);
  			$query->select('rules');
  			$query->from('#__assets');
! 			$query->where('parent_id = 0');
  			$db->setQuery($query);
! 			$result = $db->loadColumn();
  		}
- 
  		// Instantiate and return the JAccessRules object for the asset rules.
  		$rules = new JAccessRules;
  		$rules->mergeCollection($result);
--- 248,266 ----
  		$result = $db->loadColumn();
  
  		// Get the root even if the asset is not found and in recursive mode
! 		if (empty($result))
  		{
+ 			$db = JFactory::getDbo();
+ 			$assets = JTable::getInstance('Asset', 'JTable', array('dbo' => $db));
+ 			$rootId = $assets->getRootId();
  			$query = $db->getQuery(true);
  			$query->select('rules');
  			$query->from('#__assets');
! 			$query->where('id = ' . $db->quote($rootId));
  			$db->setQuery($query);
! 			$result = $db->loadResult();
! 			$result = array($result);
  		}
  		// Instantiate and return the JAccessRules object for the asset rules.
  		$rules = new JAccessRules;
  		$rules->mergeCollection($result);
***************
*** 444,452 ****
  	 * @deprecated  12.3  Use JAccess::getActionsFromFile or JAccess::getActionsFromData instead.
  	 *
  	 * @codeCoverageIgnore
! 	 *
! 	 * @todo    Need to decouple this method from the CMS. Maybe check if $component is a
! 	 *          valid file (or create a getActionsFromFile method).
  	 */
  	public static function getActions($component, $section = 'component')
  	{
--- 450,456 ----
  	 * @deprecated  12.3  Use JAccess::getActionsFromFile or JAccess::getActionsFromData instead.
  	 *
  	 * @codeCoverageIgnore
! 	 * 
  	 */
  	public static function getActions($component, $section = 'component')
  	{
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/libraries/joomla/database/table.php /home/packages/code/qi/SOURCES/joomla-2.5.8/libraries/joomla/database/table.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/libraries/joomla/database/table.php	2012-10-29 13:28:56.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/libraries/joomla/database/table.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 272,278 ****
  
  	/**
  	 * Method to get the parent asset under which to register this one.
! 	 * By default, all assets are registered to the ROOT node with ID 1.
  	 * The extended class can define a table and id to lookup.  If the
  	 * asset does not exist it will be created.
  	 *
--- 272,279 ----
  
  	/**
  	 * Method to get the parent asset under which to register this one.
! 	 * By default, all assets are registered to the ROOT node with ID,
! 	 * which will default to 1 if none exists.
  	 * The extended class can define a table and id to lookup.  If the
  	 * asset does not exist it will be created.
  	 *
***************
*** 286,294 ****
  	protected function _getAssetParentId($table = null, $id = null)
  	{
  		// For simple cases, parent to the asset root.
! 		if (empty($table) || empty($id))
  		{
! 			return 1;
  		}
  
  		return 1;
--- 287,297 ----
  	protected function _getAssetParentId($table = null, $id = null)
  	{
  		// For simple cases, parent to the asset root.
! 		$assets = self::getInstance('Asset', 'JTable', array('dbo' => $this->getDbo()));
! 		$rootId = $assets->getRootId();
! 		if (!empty($rootId))
  		{
! 			return $rootId;
  		}
  
  		return 1;
***************
*** 591,596 ****
--- 594,603 ----
  	{
  		// Initialise variables.
  		$k = $this->_tbl_key;
+ 		if (!empty($this->asset_id))
+ 		{
+ 			$currentAssetId = $this->asset_id;
+ 		}
  
  		// The asset id field is managed privately by this class.
  		if ($this->_trackAssets)
***************
*** 670,676 ****
  			return false;
  		}
  
! 		if (empty($this->asset_id))
  		{
  			// Update the asset_id field in this table.
  			$this->asset_id = (int) $asset->id;
--- 677,684 ----
  			return false;
  		}
  
! 		// Create an asset_id or heal one that is corrupted.
! 		if (empty($this->asset_id) || ($currentAssetId != $this->asset_id && !empty($this->asset_id)))
  		{
  			// Update the asset_id field in this table.
  			$this->asset_id = (int) $asset->id;
Binary files /home/packages/code/qi/SOURCES/joomla-2.5.7/media/mod_languages/images/sw.gif and /home/packages/code/qi/SOURCES/joomla-2.5.8/media/mod_languages/images/sw.gif differ
diff -crBPN --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=configuration.php --exclude=joomla.sql --exclude=.htaccess-dist --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=joomla-2.5.8.pl /home/packages/code/qi/SOURCES/joomla-2.5.7/modules/mod_breadcrumbs/helper.php /home/packages/code/qi/SOURCES/joomla-2.5.8/modules/mod_breadcrumbs/helper.php
*** /home/packages/code/qi/SOURCES/joomla-2.5.7/modules/mod_breadcrumbs/helper.php	2012-10-29 13:28:42.000000000 -0500
--- /home/packages/code/qi/SOURCES/joomla-2.5.8/modules/mod_breadcrumbs/helper.php	2012-11-07 11:23:40.000000000 -0600
***************
*** 19,28 ****
  		$items		= $pathway->getPathWay();
  
  		$count = count($items);
  		for ($i = 0; $i < $count; $i ++)
  		{
! 			$items[$i]->name = stripslashes(htmlspecialchars($items[$i]->name, ENT_COMPAT, 'UTF-8'));
! 			$items[$i]->link = JRoute::_($items[$i]->link);
  		}
  
  		if ($params->get('showHome', 1))
--- 19,31 ----
  		$items		= $pathway->getPathWay();
  
  		$count = count($items);
+ 		// don't use $items here as it references JPathway properties directly
+ 		$crumbs	= array();
  		for ($i = 0; $i < $count; $i ++)
  		{
! 			$crumbs[$i] = new stdClass();
! 			$crumbs[$i]->name = stripslashes(htmlspecialchars($items[$i]->name, ENT_COMPAT, 'UTF-8'));
! 			$crumbs[$i]->link = JRoute::_($items[$i]->link);
  		}
  
  		if ($params->get('showHome', 1))
***************
*** 30,39 ****
  			$item = new stdClass();
  			$item->name = htmlspecialchars($params->get('homeText', JText::_('MOD_BREADCRUMBS_HOME')));
  			$item->link = JRoute::_('index.php?Itemid='.$app->getMenu()->getDefault()->id);
! 			array_unshift($items, $item);
  		}
  
! 		return $items;
  	}
  
  	/**
--- 33,42 ----
  			$item = new stdClass();
  			$item->name = htmlspecialchars($params->get('homeText', JText::_('MOD_BREADCRUMBS_HOME')));
  			$item->link = JRoute::_('index.php?Itemid='.$app->getMenu()->getDefault()->id);
! 			array_unshift($crumbs, $item);
  		}
  
! 		return $crumbs;
  	}
  
  	/**