summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author@himerus2011-02-10 17:31:47 (GMT)
committer @himerus2011-02-10 17:31:47 (GMT)
commitff59cdb2c7777624661419bab8f885bbd5bedff3 (patch)
treedf07c8d842547b8ad3930a9198e329b34023d7dc
parent0e9bb527924940b2f1b89363e37e1f6143ddbaf0 (diff)
final adjustments prior to render tests
-rw-r--r--CHANGELOG.txt4
-rw-r--r--omega/template.php5
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4d1363a..9314340 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -39,6 +39,10 @@ CHANGELOG.txt to start tracking changes/upgrade data for 7.x-2.x
#0000000 - Fixing empty h1 in region--content.tpl.php
#0000000 - Removing unmodified core templates in omega/omega/templates
#0000000 - Syncing omega.info and omega_starterkit.info
+#0000000 - Starting work on turning zones into a renderable array
+ - This change makes this branch potentially unstable until complete
+ - Using github, you should only be using the master branch for now
+
##########################################################################################
##### Changes in: 7.x-2.0-alpha11
diff --git a/omega/template.php b/omega/template.php
index 6fe844b..72b3572 100644
--- a/omega/template.php
+++ b/omega/template.php
@@ -197,6 +197,7 @@ function omega_css_alter(&$css) {
* - zone.tpl.php (default)
*/
function omega_theme($existing, $type, $theme, $path) {
+ //krumo($path);
$hooks = array();
$variables = array(
'zid' => NULL,
@@ -220,6 +221,8 @@ function omega_theme($existing, $type, $theme, $path) {
'omega_process_zone'
);
$hooks['zone'] = array(
+ 'template' => 'zone',
+ 'path' => $path . '/templates',
'variables' => $variables,
'pattern' => 'zone__',
'preprocess functions' => $preprocess_functions,
@@ -234,7 +237,7 @@ function omega_theme($existing, $type, $theme, $path) {
* @see http://api.drupal.org/api/function/hook_theme_registry_alter/7
*/
function omega_theme_registry_alter($registry) {
-
+ //krumo($registry['zone']);
}
/**