bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security update core+modules

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sites/all/modules/context/context_layouts/context_layouts.info
View File

@@ -6,9 +6,9 @@ core = 7.x
files[] = plugins/context_layouts_reaction_block.inc
; Information added by drupal.org packaging script on 2012-12-19
version = "7.x-3.0-beta6"
; Information added by Drupal.org packaging script on 2015-01-06
version = "7.x-3.6"
core = "7.x"
project = "context"
datestamp = "1355879811"
datestamp = "1420573188"

4
sites/all/modules/context/context_layouts/context_layouts.module
View File

@@ -49,7 +49,7 @@ function context_layouts_theme() {
if (!empty($layout['template'])) {
$info["page__context_layouts_{$theme->name}_{$layout['layout']}"] = array(
'template' => $layout['template'],
'path' => drupal_get_path('theme', $theme->name),
'path' => $layout['path'],
);
}
}
@@ -107,10 +107,12 @@ function context_layouts_get_layouts($theme = NULL, $reset = FALSE) {
// Merge layout info into a single array.
foreach ($themes as $key => $info) {
$path = drupal_get_path('theme', $key);
if (!empty($info['layouts'])) {
foreach ($info['layouts'] as $layout => $layout_info) {
$layout_info['layout'] = str_replace('-', '_', $layout);
$layout_info['theme'] = $key;
$layout_info['path'] = $path;
$layouts[$theme][$layout] = $layout_info;
}
}