[geeklog-cvs] geeklog: recommended

[geeklog-cvs at lists.geeklog.net]

changeset 7658:184394924e55
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/184394924e55
user: stan <yankees26an at gmail.com>
date: Mon Aug 31 17:37:53 2009 -0400
description:
recommended

diffstat:

 public_html/admin/install/index.php |  2 +-
 public_html/directory.php           |  2 +-
 public_html/users.php               |  2 --
 public_html/usersettings.php        |  2 --
 system/databases/pgsql.class.php    |  7 ++++---
 5 files changed, 6 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r 17dc91afcb72 -r 184394924e55 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Mon Aug 31 17:27:27 2009 -0400
+++ b/public_html/admin/install/index.php	Mon Aug 31 17:37:53 2009 -0400
@@ -102,7 +102,7 @@
                     $mssql_selected = ' selected="selected"';
                     break;
                 case 'pgsql':
-                    $mssql_selected = ' selected="selected"';
+                    $pgsql_selected = ' selected="selected"';
                     break;
                 default:
                     $mysql_selected = ' selected="selected"';
diff -r 17dc91afcb72 -r 184394924e55 public_html/directory.php
--- a/public_html/directory.php	Mon Aug 31 17:27:27 2009 -0400
+++ b/public_html/directory.php	Mon Aug 31 17:37:53 2009 -0400
@@ -189,7 +189,7 @@
         }
     }
 
-    $result = DB_query ("SELECT EXTRACT(Year from date) AS year FROM {$_TABLES['stories']}");
+    $result = DB_query ("SELECT MIN(EXTRACT(Year from date)) AS year FROM {$_TABLES['stories']}");
     $A = DB_fetchArray ($result);
     if ($prevyear < $A['year']) {
         $prevyear = 0;
diff -r 17dc91afcb72 -r 184394924e55 public_html/users.php
--- a/public_html/users.php	Mon Aug 31 17:27:27 2009 -0400
+++ b/public_html/users.php	Mon Aug 31 17:37:53 2009 -0400
@@ -255,8 +255,6 @@
             $sidArray[] = $S['sid'];
         }
     }
-    unset($sql);
-    $sql = array();
     $sidList = implode("', '",$sidArray);
     $sidList = "'$sidList'";
 
diff -r 17dc91afcb72 -r 184394924e55 public_html/usersettings.php
--- a/public_html/usersettings.php	Mon Aug 31 17:27:27 2009 -0400
+++ b/public_html/usersettings.php	Mon Aug 31 17:37:53 2009 -0400
@@ -1254,8 +1254,6 @@
             $sidArray[] = $S['sid'];
         }
     }
-     unset($sql);
-    $sql = array();
     $sidList = implode("', '",$sidArray);
     $sidList = "'$sidList'";
 
diff -r 17dc91afcb72 -r 184394924e55 system/databases/pgsql.class.php
--- a/system/databases/pgsql.class.php	Mon Aug 31 17:27:27 2009 -0400
+++ b/system/databases/pgsql.class.php	Mon Aug 31 17:37:53 2009 -0400
@@ -336,10 +336,10 @@
     */
     function dbQuery($sql,$ignore_errors=0)
     {
-        //if ($this->isVerbose()) {
+        if ($this->isVerbose()) {
             $this->_errorlog("\n***inside database->dbQuery***");
             $this->_errorlog("\n*** sql to execute is $sql ***");
-        //}
+        }
         /* Replace some non ANSI keywords */
         if(preg_match('#LIMIT ([0-9]+),([\\s])?([0-9]+)#',$sql,$matches))
         {
@@ -808,8 +808,9 @@
                 if ($this->_display_error) {$error = 'Error'.pg_result_error($result);} 
                 else{$error = "An SQL error has occurred in the following SQL : $sql.";}
             }
+        }
+        
         return $error;
-        }
     }
     
     /**