Skip to content

Commit

Permalink
Merge branch 'staging' into deprecate-qq
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrepereiradasilva
andrepereiradasilva committed Jan 4, 2017
2 parents 71ea180 + 3c44236 commit 0743d41
Show file tree
Hide file tree
Showing 87 changed files with 2,307 additions and 2,651 deletions.
21 changes: 21 additions & 0 deletions administrator/components/com_admin/script.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1595,6 +1595,14 @@ public function deleteUnexistingFiles()
'/components/com_users/views/remind/metadata.xml',
'/components/com_users/views/reset/metadata.xml',
'/components/com_wrapper/metadata.xml',
'/administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php',
'/administrator/components/com_cache/layouts/joomla/searchtools/default.php',
'/administrator/components/com_languages/layouts/joomla/searchtools/default/bar.php',
'/administrator/components/com_languages/layouts/joomla/searchtools/default.php',
'/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php',
'/administrator/components/com_menus/layouts/joomla/searchtools/default.php',
'/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php',
'/administrator/components/com_modules/layouts/joomla/searchtools/default.php',
);

// TODO There is an issue while deleting folders using the ftp mode
Expand Down Expand Up @@ -1706,6 +1714,19 @@ public function deleteUnexistingFiles()
'/media/editors/codemirror/mode/jade',
// Joomla! 3.7.0
'/libraries/joomla/data',
'/administrator/components/com_cache/layouts/joomla/searchtools/default',
'/administrator/components/com_cache/layouts/joomla/searchtools',
'/administrator/components/com_cache/layouts/joomla',
'/administrator/components/com_cache/layouts',
'/administrator/components/com_languages/layouts/joomla/searchtools/default',
'/administrator/components/com_languages/layouts/joomla/searchtools',
'/administrator/components/com_languages/layouts/joomla',
'/administrator/components/com_languages/layouts',
'/administrator/components/com_menus/layouts/joomla/searchtools/default',
'/administrator/components/com_menus/layouts/joomla/searchtools',
'/administrator/components/com_modules/layouts/joomla/searchtools/default',
'/administrator/components/com_modules/layouts/joomla/searchtools',
'/administrator/components/com_modules/layouts/joomla',
);

jimport('joomla.filesystem.file');
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/sql/updates/mysql/2.5.0-2012-01-10.sql
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ALTER TABLE `#__updates` ADD COLUMN `infourl` text NOT NULL AFTER `detailsurl`;
ALTER TABLE `#__updates` ADD COLUMN `infourl` text NOT NULL AFTER `detailsurl`;
41 changes: 0 additions & 41 deletions administrator/components/com_cache/layouts/joomla/searchtools/default.php
View file

This file was deleted.

25 changes: 0 additions & 25 deletions administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php
View file

This file was deleted.

3 changes: 2 additions & 1 deletion administrator/components/com_cache/models/forms/filter_cache.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<field
name="client_id"
type="list"
label=""
onchange="jQuery('#filter_search, select[id^=filter_], #list_fullordering').val('');this.form.submit();"
filtermode="selector"
>
<option value="0">JSITE</option>
<option value="1">JADMINISTRATOR</option>
Expand All @@ -16,6 +16,7 @@
label="COM_CACHE_FILTER_SEARCH_LABEL"
description="COM_CACHE_FILTER_SEARCH_DESC"
hint="JSEARCH_FILTER"
noresults="JGLOBAL_NO_MATCHING_RESULTS"
/>
</fields>
<fields name="list">
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_cache/views/cache/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<?php else : ?>
<div id="j-main-container">
<?php endif; ?>
<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false, 'totalResults' => count($this->data)))); ?>
<?php if (count($this->data) > 0) : ?>
<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if ($this->total > 0) : ?>
<table class="table table-striped">
<thead>
<tr>
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_cache/views/cache/view.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public function display($tpl = null)
{
$this->data = $this->get('Data');
$this->pagination = $this->get('Pagination');
$this->total = $this->get('Total');
$this->state = $this->get('State');
$this->filterForm = $this->get('FilterForm');
$this->activeFilters = $this->get('ActiveFilters');
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_checkin/models/forms/filter_checkin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
label="COM_CHECKIN_FILTER_SEARCH_LABEL"
description="COM_CHECKIN_FILTER_SEARCH_DESC"
hint="JSEARCH_FILTER"
noresults="COM_CHECKIN_NO_ITEMS"
/>
</fields>
<fields name="list">
Expand Down
11 changes: 3 additions & 8 deletions administrator/components/com_checkin/views/checkin/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,9 @@
<div id="j-main-container" class="span10">
<?php else : ?>
<div id="j-main-container">
<?php endif; ?>
<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
<div class="clearfix"></div>
<?php if (empty($this->items)) : ?>
<div class="alert alert-no-items">
<?php echo JText::_('COM_CHECKIN_NO_ITEMS'); ?>
</div>
<?php else : ?>
<?php endif;?>
<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if ($this->total > 0) : ?>
<table id="global-checkin" class="table table-striped">
<thead>
<tr>
Expand Down
15 changes: 6 additions & 9 deletions administrator/components/com_checkin/views/checkin/view.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,12 @@ class CheckinViewCheckin extends JViewLegacy
*/
public function display($tpl = null)
{
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
$this->state = $this->get('State');

if ($this->getLayout() == 'default')
{
$this->filterForm = $this->get('FilterForm');
$this->activeFilters = $this->get('ActiveFilters');
}
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
$this->state = $this->get('State');
$this->total = $this->get('Total');
$this->filterForm = $this->get('FilterForm');
$this->activeFilters = $this->get('ActiveFilters');

// Check for errors.
if (count($errors = $this->get('Errors')))
Expand Down
12 changes: 8 additions & 4 deletions administrator/components/com_contenthistory/models/history.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,14 @@ public function __construct($config = array())
if (empty($config['filter_fields']))
{
$config['filter_fields'] = array(
'version_id', 'h.version_id',
'version_note', 'h.version_note',
'save_date', 'h.save_date',
'editor_user_id', 'h.editor_user_id',
'version_id',
'h.version_id',
'version_note',
'h.version_note',
'save_date',
'h.save_date',
'editor_user_id',
'h.editor_user_id',
);
}

Expand Down
5 changes: 5 additions & 0 deletions administrator/components/com_installer/controllers/install.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ public function install()
$app = JFactory::getApplication();
$redirect_url = $app->getUserState('com_installer.redirect_url');

if (!$redirect_url)
{
$redirect_url = base64_decode($app->input->get('return'));
}

// Don't redirect to an external URL.
if (!JUri::isInternal($redirect_url))
{
Expand Down
101 changes: 0 additions & 101 deletions administrator/components/com_installer/controllers/languages.php
View file

This file was deleted.

0 comments on commit 0743d41

Please sign in to comment.