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

comparison includes/common.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	acef7ccb09b5

comparison

equal deleted inserted replaced

-:2cfdc3c92142
+:fff6d4c8c043
 <?php
-// $Id: common.inc,v 1.756.2.9 2008/04/09 21:11:44 goba Exp $
+// $Id: common.inc,v 1.756.2.20 2008/07/09 21:48:27 goba Exp $
 /**
 * @file
 * Common functions that many Drupal modules will need to reference.
 *
 * This issues an on-site HTTP redirect. The function makes sure the redirected
 * URL is formatted correctly.
 *
 * Usually the redirected URL is constructed from this function's input
 * parameters. However you may override that behavior by setting a
-* <em>destination</em> in either the $_REQUEST-array (i.e. by using
+* destination in either the $_REQUEST-array (i.e. by using
 * the query string of an URI) or the $_REQUEST['edit']-array (i.e. by
 * using a hidden form field). This is used to direct the user back to
 * the proper page after completing a form. For example, after editing
 * a post on the 'admin/content/node'-page or after having logged on using the
 * 'user login'-block in a sidebar. The function drupal_get_destination()
 * Error levels:
 * - 0 = Log errors to database.
 * - 1 = Log errors to database and to screen.
 */
 function drupal_error_handler($errno, $message, $filename, $line, $context) {
-// If the @ error suppression operator was used, error_reporting is
+// If the @ error suppression operator was used, error_reporting will have
-// temporarily set to 0.
+// been temporarily set to 0.
 if (error_reporting() == 0) {
 return;
 }
 if ($errno & (E_ALL ^ E_NOTICE)) {
 *   The Drupal path being linked to, such as "admin/content/node", or an
 *   existing URL like "http://drupal.org/".  The special path
 *   '<front>' may also be given and will generate the site's base URL.
 * @param $options
 *   An associative array of additional options, with the following keys:
-*     'query'
+*   - 'query'
 *       A query string to append to the link, or an array of query key/value
 *       properties.
-*     'fragment'
+*   - 'fragment'
 *       A fragment identifier (or named anchor) to append to the link.
 *       Do not include the '#' character.
-*     'absolute' (default FALSE)
+*   - 'absolute' (default FALSE)
 *       Whether to force the output to be an absolute link (beginning with
 *       http:). Useful for links that will be displayed outside the site, such
 *       as in an RSS feed.
-*     'alias' (default FALSE)
+*   - 'alias' (default FALSE)
 *       Whether the given path is an alias already.
-*     'external'
+*   - 'external'
 *       Whether the given path is an external URL.
-*     'language'
+*   - 'language'
 *       An optional language object. Used to build the URL to link to and
 *       look up the proper alias for the link.
-*     'base_url'
+*   - 'base_url'
 *       Only used internally, to modify the base URL when a language dependent
 *       URL requires so.
-*     'prefix'
+*   - 'prefix'
 *       Only used internally, to modify the path when a language dependent URL
 *       requires so.
 * @return
 *   A string containing a URL to the given path.
 *
 *       base URL (again via the url() function).
 *     - If you provide a path, and 'alias' is set to TRUE (see below), it is
 *       used as is.
 * @param $options
 *   An associative array of additional options, with the following keys:
-*     'attributes'
+*     - 'attributes'
 *       An associative array of HTML attributes to apply to the anchor tag.
-*     'query'
+*     - 'query'
 *       A query string to append to the link, or an array of query key/value
 *       properties.
-*     'fragment'
+*     - 'fragment'
 *       A fragment identifier (named anchor) to append to the link.
 *       Do not include the '#' character.
-*     'absolute' (default FALSE)
+*     - 'absolute' (default FALSE)
 *       Whether to force the output to be an absolute link (beginning with
 *       http:). Useful for links that will be displayed outside the site, such
 *       as in an RSS feed.
-*     'html' (default FALSE)
+*     - 'html' (default FALSE)
 *       Whether the title is HTML, or just plain-text. For example for making
 *       an image a link, this must be set to TRUE, or else you will see the
 *       escaped HTML.
-*     'alias' (default FALSE)
+*     - 'alias' (default FALSE)
 *       Whether the given path is an alias already.
 * @return
 *   an HTML string containing a link to the given path.
 */
 function l($text, $path, $options = array()) {
 }
 foreach ($types[$type] as $file => $preprocess) {
 // If the theme supplies its own style using the name of the module style, skip its inclusion.
 // This includes any RTL styles associated with its main LTR counterpart.
 if ($type == 'module' && in_array(str_replace('-rtl.css', '.css', basename($file)), $theme_styles)) {
+// Unset the file to prevent its inclusion when CSS aggregation is enabled.
+unset($types[$type][$file]);
 continue;
 }
-if (!$preprocess || !($is_writable && $preprocess_css)) {
+// Only include the stylesheet if it exists.
-// If a CSS file is not to be preprocessed and it's a module CSS file, it needs to *always* appear at the *top*,
+if (file_exists($file)) {
-// regardless of whether preprocessing is on or off.
+if (!$preprocess || !($is_writable && $preprocess_css)) {
-if (!$preprocess && $type == 'module') {
+// If a CSS file is not to be preprocessed and it's a module CSS file, it needs to *always* appear at the *top*,
-$no_module_preprocess .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file . $query_string .'" />'."\n";
+// regardless of whether preprocessing is on or off.
-}
+if (!$preprocess && $type == 'module') {
-// If a CSS file is not to be preprocessed and it's a theme CSS file, it needs to *always* appear at the *bottom*,
+$no_module_preprocess .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file . $query_string .'" />'."\n";
-// regardless of whether preprocessing is on or off.
+}
-else if (!$preprocess && $type == 'theme') {
+// If a CSS file is not to be preprocessed and it's a theme CSS file, it needs to *always* appear at the *bottom*,
-$no_theme_preprocess .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file . $query_string .'" />'."\n";
+// regardless of whether preprocessing is on or off.
-}
+else if (!$preprocess && $type == 'theme') {
-else {
+$no_theme_preprocess .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file . $query_string .'" />'."\n";
-$output .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file . $query_string .'" />'."\n";
+}
+else {
+$output .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file . $query_string .'" />'."\n";
+}
 }
 }
 }
 }
 * References to JavaScript files are placed in a certain order: first, all
 * 'core' files, then all 'module' and finally all 'theme' JavaScript files
 * are added to the page. Then, all settings are output, followed by 'inline'
 * JavaScript code. If running update.php, all preprocessing is disabled.
 *
-* @parameter $scope
+* @param $scope
 *   (optional) The scope for which the JavaScript rules should be returned.
 *   Defaults to 'header'.
-* @parameter $javascript
+* @param $javascript
 *   (optional) An array with all JavaScript code. Defaults to the default
 *   JavaScript array for the given scope.
 * @return
 *   All JavaScript code segments and includes for the scope as HTML tags.
 */
 uasort($elements, "element_sort");
 }
 $elements += array('#title' => NULL, '#description' => NULL);
 if (!isset($elements['#children'])) {
 $children = element_children($elements);
-/* Render all the children that use a theme function */
+// Render all the children that use a theme function.
 if (isset($elements['#theme']) && empty($elements['#theme_used'])) {
 $elements['#theme_used'] = TRUE;
 $previous = array();
 foreach (array('#value', '#type', '#prefix', '#suffix') as $key) {
 foreach (array('#value', '#type', '#prefix', '#suffix') as $key) {
 $elements[$key] = isset($previous[$key]) ? $previous[$key] : NULL;
 }
 }
-/* render each of the children using drupal_render and concatenate them */
+// Render each of the children using drupal_render and concatenate them.
 if (!isset($content) || $content === '') {
 foreach ($children as $key) {
 $content .= drupal_render($elements[$key]);
 }
 }
 *
 * @param $module
 *   The module for which the tables will be created.
 * @return
 *   An array of arrays with the following key/value pairs:
-*      success: a boolean indicating whether the query succeeded
+*    - success: a boolean indicating whether the query succeeded.
-*      query: the SQL query(s) executed, passed through check_plain()
+*    - query: the SQL query(s) executed, passed through check_plain().
 */
 function drupal_install_schema($module) {
 $schema = drupal_get_schema_unprocessed($module);
 _drupal_initialize_schema($module, $schema);
 *
 * @param $module
 *   The module for which the tables will be removed.
 * @return
 *   An array of arrays with the following key/value pairs:
-*      success: a boolean indicating whether the query succeeded
+*    - success: a boolean indicating whether the query succeeded.
-*      query: the SQL query(s) executed, passed through check_plain()
+*    - query: the SQL query(s) executed, passed through check_plain().
 */
 function drupal_uninstall_schema($module) {
 $schema = drupal_get_schema_unprocessed($module);
 _drupal_initialize_schema($module, $schema);
 // Standardize $update to an array.
 if (is_string($update)) {
 $update = array($update);
 }
+$schema = drupal_get_schema($table);
+if (empty($schema)) {
+return FALSE;
+}
 // Convert to an object if needed.
 if (is_array($object)) {
 $object = (object) $object;
 $array = TRUE;
 }
 else {
 $array = FALSE;
-}
-$schema = drupal_get_schema($table);
-if (empty($schema)) {
-return FALSE;
 }
 $fields = $defs = $values = $serials = $placeholders = array();
 // Go through our schema, build SQL, and when inserting, fill in defaults for
 // Get last insert ids and fill them in.
 foreach ($serials as $field) {
 $object->$field = db_last_insert_id($table, $field);
 }
 }
+}
-// If we began with an array, convert back so we don't surprise the caller.
+else {
-if ($array) {
+$return = FALSE;
-$object = (array) $object;
+}
-}
+// If we began with an array, convert back so we don't surprise the caller.
-return $return;
+if ($array) {
-}
+$object = (array) $object;
+}
-return FALSE;
+return $return;
 }
 /**
 * @} End of "ingroup schemaapi".
 */
 /**
 * Flush all cached data on the site.
 *
 * Empties cache tables, rebuilds the menu cache and theme registries, and
-* exposes a hook for other modules to clear their own cache data as well.
+* invokes a hook so that other modules' cache data can be cleared as well.
 */
 function drupal_flush_all_caches() {
 // Change query-strings on css/js files to enforce reload for all users.
 _drupal_flush_css_js();
 drupal_clear_css_cache();
 drupal_clear_js_cache();
+system_theme_data();
 drupal_rebuild_theme_registry();
 menu_rebuild();
 node_types_rebuild();
 // Don't clear cache_form - in-progress form submissions may break.
 // Ordered so clearing the page cache will always be the last action.

Mercurial > defr > drupal > core

comparison includes/common.inc @ 7:fff6d4c8c043 6.3