diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-12-06 09:25:22 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-12-06 09:25:22 +0000 |
| commit | a19acb219e249693357daeb037165eaf19a70b33 (patch) | |
| tree | c7d04eacff376e51303c55e773153b8c898086a8 /includes | |
| parent | e31f7abd42b4905ec0aa4961c7d920e373c012d9 (diff) | |
| download | brdo-a19acb219e249693357daeb037165eaf19a70b33.tar.gz brdo-a19acb219e249693357daeb037165eaf19a70b33.tar.bz2 | |
- Patch #35924 by Neil: improved the update system.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/database.mysql.inc | 2 | ||||
| -rw-r--r-- | includes/database.mysqli.inc | 2 | ||||
| -rw-r--r-- | includes/database.pgsql.inc | 2 | ||||
| -rw-r--r-- | includes/theme.inc | 10 |
4 files changed, 13 insertions, 3 deletions
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc index a58c9f1d5..04af5ea0a 100644 --- a/includes/database.mysql.inc +++ b/includes/database.mysql.inc @@ -105,7 +105,7 @@ function _db_query($query, $debug = 0) { return $result; } else { - trigger_error(check_plain(mysql_error() ."\nquery: ". $query), E_USER_ERROR); + trigger_error(check_plain(mysql_error() ."\nquery: ". $query), E_USER_WARNING); return FALSE; } } diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc index ed80b70ca..8645b7378 100644 --- a/includes/database.mysqli.inc +++ b/includes/database.mysqli.inc @@ -113,7 +113,7 @@ function _db_query($query, $debug = 0) { return $result; } else { - trigger_error(check_plain(mysqli_error($active_db) ."\nquery: ". $query), E_USER_ERROR); + trigger_error(check_plain(mysqli_error($active_db) ."\nquery: ". $query), E_USER_WARNING); return FALSE; } } diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc index 3c2f8f710..28d5efd7a 100644 --- a/includes/database.pgsql.inc +++ b/includes/database.pgsql.inc @@ -92,7 +92,7 @@ function _db_query($query, $debug = 0) { return $last_result; } else { - trigger_error(check_plain(pg_last_error() ."\nquery: ". $query), E_USER_ERROR); + trigger_error(check_plain(pg_last_error() ."\nquery: ". $query), E_USER_WARNING); return FALSE; } } diff --git a/includes/theme.inc b/includes/theme.inc index c7f585853..279015b71 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -974,6 +974,16 @@ function theme_username($object) { return $output; } +function theme_progress_bar($percent, $message) { + $output = '<div id="progress" class="progress">'; + $output .= '<div class="percentage">'. $percent .'%</div>'; + $output .= '<div class="status">'. $message .'</div>'; + $output .= '<div class="bar"><div class="filled" style="width: '. $percent .'%"></div></div>'; + $output .= '</div>'; + + return $output; +} + /** * @} End of "defgroup themeable". */ |