defr/drupal/core: includes/theme.inc comparison

comparison includes/theme.inc @ 7:fff6d4c8c043 6.3

Drupal 6.3

author	Franck Deroche <webmaster@defr.org>
date	Tue, 23 Dec 2008 14:30:28 +0100
parents	2427550111ae
children	589fb7c02327

comparison

equal deleted inserted replaced

-:2cfdc3c92142
+:fff6d4c8c043
 <?php
-// $Id: theme.inc,v 1.415.2.2 2008/03/25 11:55:08 goba Exp $
+// $Id: theme.inc,v 1.415.2.9 2008/07/09 21:48:28 goba Exp $
 /**
 * @file
 * The theme system, which controls the output of Drupal.
 *
 foreach ($prefixes as $prefix) {
 if (function_exists($prefix .'_preprocess')) {
 $info['preprocess functions'][] = $prefix .'_preprocess';
 }
 if (function_exists($prefix .'_preprocess_'. $hook)) {
 $info['preprocess functions'][] = $prefix .'_preprocess_'. $hook;
+}
+if (!empty($info['original hook']) && function_exists($prefix .'_preprocess_'. $info['original hook'])) {
+$info['preprocess functions'][] = $prefix .'_preprocess_'. $info['original hook'];
 }
 }
 }
 // Check for the override flag and prevent the cached preprocess functions from being used.
 // This allows themes or theme engines to remove preprocessors set earlier in the registry build.
 // Flag not needed inside the registry.
 unset($result[$hook]['override preprocess functions']);
 }
 elseif (isset($cache[$hook]['preprocess functions']) && is_array($cache[$hook]['preprocess functions'])) {
 $info['preprocess functions'] = array_merge($cache[$hook]['preprocess functions'], $info['preprocess functions']);
+}
+elseif (isset($info['original hook']) && isset($cache[$info['original hook']]['preprocess functions']) && is_array($cache[$info['original hook']]['preprocess functions'])) {
+$info['preprocess functions'] = array_merge($cache[$info['original hook']]['preprocess functions'], $info['preprocess functions']);
 }
 $result[$hook]['preprocess functions'] = $info['preprocess functions'];
 }
 // Merge the newly created theme hooks into the existing cache.
 }
 foreach ($themes as $theme) {
 foreach ($theme->info['stylesheets'] as $media => $stylesheets) {
 foreach ($stylesheets as $stylesheet => $path) {
-if (file_exists($path)) {
+$theme->stylesheets[$media][$stylesheet] = $path;
-$theme->stylesheets[$media][$stylesheet] = $path;
-}
 }
 }
 foreach ($theme->info['scripts'] as $script => $path) {
 if (file_exists($path)) {
 $theme->scripts[$script] = $path;
 foreach ($matches as $match) {
 $new_hook = str_replace($prefix .'_', '', $match);
 $templates[$new_hook] = array(
 'function' => $match,
 'arguments' => $info['arguments'],
+'original hook' => $hook,
 );
 }
 }
 }
 if (function_exists($prefix .'_'. $hook)) {
 // Put the underscores back in for the hook name and register this pattern.
 $templates[strtr($file, '-', '_')] = array(
 'template' => $file,
 'path' => dirname($files[$match]->filename),
 'arguments' => $info['arguments'],
+'original hook' => $hook,
 );
 }
 }
 }
 }
 * array of arrays with information about the hook. It describes the
 * arguments the function or template will need, and provides
 * defaults for the template in case they are not filled in. If the default
 * implementation is a function, by convention it is named theme_HOOK().
 *
-* Each module should provide a default implementation for themes that
+* Each module should provide a default implementation for theme_hooks that
 * it registers. This implementation may be either a function or a template;
 * if it is a function it must be specified via hook_theme(). By convention,
 * default implementations of theme hooks are named theme_HOOK. Default
 * template implementations are stored in the module directory.
 *
 $class .= ' last';
 }
 if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '<front>' && drupal_is_front_page()))) {
 $class .= ' active';
 }
-$output .= '<li class="'. $class .'">';
+$output .= '<li'. drupal_attributes(array('class' => $class)) .'>';
 if (isset($link['href'])) {
 // Pass in $link as $options, they share the same keys.
 $output .= l($link['title'], $link['href'], $link);
 }
 return '<div class="more-help-link">'. t('[<a href="@link">more help...</a>]', array('@link' => check_url($url))) .'</div>';
 }
 /**
 * Return code that emits an XML icon.
 *
 * For most use cases, this function has been superseded by theme_feed_icon().
 *
 * @see theme_feed_icon()
 * @param $url
 *   The url of the feed.
 */
 function theme_xml_icon($url) {
 // Sometimes modules display content composed by people who are
 // not registered members of the site (e.g. mailing list or news
 // aggregator modules). This clause enables modules to display
 // the true author of the content.
 if (!empty($object->homepage)) {
-$output = l($object->name, $object->homepage, array('rel' => 'nofollow'));
+$output = l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow')));
 }
 else {
 $output = check_plain($object->name);
 }

Mercurial > defr > drupal > core

comparison includes/theme.inc @ 7:fff6d4c8c043 6.3