SF.net SVN: postfixadmin:[1391] trunk/upgrade.php

[<chr...@us...>]

Revision: 1391
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1391&view=rev
Author:   christian_boltz
Date:     2012-05-28 15:50:25 +0000 (Mon, 28 May 2012)
Log Message:
-----------
upgrade.php:
- _pgsql_field_exists(), _mysql_field_exists():
  Those functions are always called with the expanded table name - don't
  expand it twice. (The better solution would be to change all calling
  code to provide non-expanded tablenames, but that's more work.)

Modified Paths:
--------------
    trunk/upgrade.php

Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php	2012-05-27 19:06:37 UTC (rev 1390)
+++ trunk/upgrade.php	2012-05-28 15:50:25 UTC (rev 1391)
@@ -25,7 +25,7 @@
 }
 
 function _pgsql_field_exists($table, $field) {
-    $table = table_by_key($table);
+    # $table = table_by_key($table); # _pgsql_field_exists is always called with the expanded table name - don't expand it twice
     $sql = '
     SELECT
         a.attname,
@@ -52,7 +52,7 @@
 }
 
 function _mysql_field_exists($table, $field) {
-    $table = table_by_key($table);
+    # $table = table_by_key($table); # _mysql_field_exists is always called with the expanded table name - don't expand it twice
     $sql = "SHOW COLUMNS FROM $table LIKE '$field'";
     $r = db_query($sql);
     $row = db_row($r['result']);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.