diff --git a/panels.info b/panels.info index 271f3bbcc00768f7e2f4000a9ee911a9c4788936..48a1a95f6af94cc2134dc742027760693127991c 100644 --- a/panels.info +++ b/panels.info @@ -2,6 +2,7 @@ name = Panels description = Core Panels display functions; provides no external UI, at least one other Panels module should be enabled. core = 7.x package = "Panels" +version = PANELS_VERSION configure = admin/structure/panels dependencies[] = ctools (>1.5) files[] = panels.module diff --git a/panels.module b/panels.module index 9d7ef6f053a804e32fd517464896dcb03449eff3..ddd5db234340ac763dcb0e874fef4aeaf50029a2 100644 --- a/panels.module +++ b/panels.module @@ -6,7 +6,22 @@ * Core functionality for the Panels engine. */ -define('PANELS_REQUIRED_CTOOLS_API', '2.0-alpha'); +define('PANELS_REQUIRED_CTOOLS_API', '2.0.8'); + +/** + * The current working panels version. + * + * In a release, it should be 7.x-3.x, which should match what drush make will + * create. In a dev format, it should be 7.x-3.(x+1)-dev, which will allow + * modules depending on new features in panels to depend on panels > 7.x-3.x. + * + * To define a specific version of Panels as a dependency for another module, + * simply include a dependency line in that module's info file, e.g.: + * ; Requires Panels v7.x-3.4 or newer. + * dependencies[] = panels (>=3.4) + */ +define('PANELS_VERSION', '7.x-3.5-dev'); + define('PANELS_TITLE_FIXED', 0); // Hide title use to be true/false. So false remains old behavior. define('PANELS_TITLE_NONE', 1); // And true meant no title. @@ -1332,10 +1347,6 @@ function template_preprocess_panels_pane(&$vars) { $vars['more'] = l($content->more['title'], $content->more['href'], $content->more); } - if (!empty($content->attributes)) { - $vars['attributes_array'] = array_merge($vars['attributes_array'], $content->attributes); - } - $vars['content'] = !empty($content->content) ? $content->content : ''; } diff --git a/panels_ipe/panels_ipe.info b/panels_ipe/panels_ipe.info index b0172a7602617aef9754e73f0c87d7a8210b28ce..1056294a89ababfe1c3f3ebe715be92f8125fe8e 100644 --- a/panels_ipe/panels_ipe.info +++ b/panels_ipe/panels_ipe.info @@ -1,6 +1,7 @@ name = Panels In-Place Editor description = Provide a UI for managing some Panels directly on the frontend, instead of having to use the backend. package = "Panels" +version = PANELS_VERSION dependencies[] = panels core = 7.x configure = admin/structure/panels diff --git a/panels_mini/panels_mini.info b/panels_mini/panels_mini.info index 0eae9f58d2f46651b50b1a60b11d74a26354f6a5..470a1db646de46f772a62aedf52fc79aef373994 100644 --- a/panels_mini/panels_mini.info +++ b/panels_mini/panels_mini.info @@ -1,6 +1,7 @@ name = Mini panels description = Create mini panels that can be used as blocks by Drupal and panes by other panel modules. package = "Panels" +version = PANELS_VERSION dependencies[] = panels core = 7.x files[] = plugins/export_ui/panels_mini_ui.class.php \ No newline at end of file diff --git a/panels_node/panels_node.info b/panels_node/panels_node.info index 95ad2df609d27fd2ad705d1207e378e53151090a..73d215acee215c2f35291b55c7a13d13a08b2d15 100644 --- a/panels_node/panels_node.info +++ b/panels_node/panels_node.info @@ -1,6 +1,7 @@ name = Panel nodes description = Create nodes that are divided into areas with selectable content. package = "Panels" +version = PANELS_VERSION dependencies[] = panels configure = admin/structure/panels core = 7.x