security updates

have to check views and entityreference for custom patches
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-19 20:45:16 +02:00
parent 802ec0c6f3
commit b3221c71e2
516 changed files with 14267 additions and 7349 deletions

View File

@@ -6,9 +6,9 @@ core = 7.x
configure = admin/config/regional/i18n/select
files[] = i18n_select.test
; Information added by drupal.org packaging script on 2013-08-21
version = "7.x-1.10"
; Information added by Drupal.org packaging script on 2015-01-26
version = "7.x-1.12"
core = "7.x"
project = "i18n"
datestamp = "1377069696"
datestamp = "1422286982"

View File

@@ -149,13 +149,8 @@ function i18n_select_query_node_access_alter(QueryAlterableInterface $query) {
* Rewrite taxonomy term queries so language selection options are enforced.
*/
function i18n_select_query_term_access_alter(QueryAlterableInterface $query) {
// dsm($query, 'i18n query alter');
if (module_exists('i18n_taxonomy')
&& i18n_select_mode('taxonomy')
&& i18n_select_check_query($query, 'tid')
&& ($table_alias = i18n_select_check_table($query, 'taxonomy_term_data', 'tid'))
) {
if (module_exists('i18n_taxonomy') && i18n_select_mode('taxonomy') && i18n_select_check_query($query, 'tid') &&
($table_alias = i18n_select_check_table($query, 'taxonomy_term_data', 'tid'))) {
$query->condition($table_alias . '.language', i18n_select_langcodes());
// Mark query as altered
$query->addTag('i18n_select');
@@ -228,7 +223,7 @@ function _i18n_select_table_alias($table) {
function i18n_select_check_conditions($query, $table_alias = NULL) {
$conditions =& $query->conditions();
foreach ($conditions as $index => $condition) {
if (is_array($condition) && isset($condition['field'])) {
if (is_array($condition) && !empty($condition['field'])) {
if (strpos($condition['field'], '.') === FALSE) {
if ($table_alias) {
// Change the condition to include a table alias.