[geeklog-cvs] geeklog: Merge with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 8524:bb2fef001c35
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/bb2fef001c35
user: Rouslan Placella <rouslan at placella.com>
date: Mon Mar 12 16:08:12 2012 +0000
description:
Merge with upstream

diffstat:

 public_html/admin/database.php |   2 +-
 system/lib-user.php            |  20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diffs (47 lines):

diff -r f4c599db456f -r bb2fef001c35 public_html/admin/database.php
--- a/public_html/admin/database.php	Mon Mar 12 16:07:01 2012 +0000
+++ b/public_html/admin/database.php	Mon Mar 12 16:08:12 2012 +0000
@@ -411,7 +411,7 @@
     $retval = false;
 
     if ($_DB_dbms == 'mysql') {
-        $result = DB_query("SHOW TABLE TYPES");
+        $result = DB_query("SHOW STORAGE ENGINES");
         $numEngines = DB_numRows($result);
         for ($i = 0; $i < $numEngines; $i++) {
             $A = DB_fetchArray($result);
diff -r f4c599db456f -r bb2fef001c35 system/lib-user.php
--- a/system/lib-user.php	Mon Mar 12 16:07:01 2012 +0000
+++ b/system/lib-user.php	Mon Mar 12 16:08:12 2012 +0000
@@ -423,20 +423,22 @@
         }
 
         $img = '';
-        if (empty ($photo) || ($photo == 'none')) {
+        if (empty($photo) || ($photo == 'none')) {
             // no photo - try gravatar.com, if allowed
             if ($_CONF['use_gravatar']) {
-                $img = 'http://www.gravatar.com/avatar.php?gravatar_id='
-                     . md5 ($email);
+                $img = 'http://www.gravatar.com/avatar/' . md5($email);
+                $parms = array();
                 if ($width > 0) {
-                    $img .= '&size=' . $width;
+                    $parms[] = 's=' . $width;
                 }
-                if (!empty ($_CONF['gravatar_rating'])) {
-                    $img .= '&rating=' . $_CONF['gravatar_rating'];
+                if (! empty($_CONF['gravatar_rating'])) {
+                    $parms[] = 'r=' . $_CONF['gravatar_rating'];
                 }
-                if (!empty ($_CONF['default_photo'])) {
-                    $img .= '&default='
-                         . urlencode ($_CONF['default_photo']);
+                if (! empty($_CONF['default_photo'])) {
+                    $parms[] = 'd=' . urlencode($_CONF['default_photo']);
+                }
+                if (count($parms) > 0) {
+                    $img .= '?' . implode('&', $parms);
                 }
             }
         } else {