Merge forward function privileges fix for pre 7.3 servers

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 308bf3cd7818e0c5c902b7439bc4f3d0a6c495ab..ccbc97ac6a56e4fc61ad06f7779dd774c2859186 100755 (executable)
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres.php,v 1.272 2005/08/12 01:39:26 chriskl Exp $
+ * $Id: Postgres.php,v 1.273 2005/08/15 17:15:36 xzilla Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -4489,6 +4489,7 @@ class Postgres extends ADODB_base {
        function hasUserAndDbVariables() { return false; }
        function hasCompositeTypes() { return false; }
        function hasReadOnlyQueries() { return false; }
+       function hasFuncPrivs() { return false; }
 
 }
 

diff --git a/classes/database/Postgres73.php b/classes/database/Postgres73.php
index 7ba5ac5b000cb746f16050d88266e9bf9e82ed86..e49cf518e5d9ff7185981a9e2a6c379baf79f7d6 100644 (file)
--- a/classes/database/Postgres73.php
+++ b/classes/database/Postgres73.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres73.php,v 1.149 2005/07/31 09:15:07 chriskl Exp $
+ * $Id: Postgres73.php,v 1.150 2005/08/15 17:15:36 xzilla Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -1818,6 +1818,8 @@ class Postgres73 extends Postgres72 {
        function hasViewColumnRename() { return true; }
        function hasUserAndDbVariables() { return true; }
        function hasCompositeTypes() { return true; }   
+       function hasFuncPrivs() { return true; }
+
 }
 
 ?>

diff --git a/functions.php b/functions.php
index d24e0fad44b6817d50aa5f85136a125d40bb248a..f83d2087c94c0cccdc1dc815b0ffea9888755ea9 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.48 2005/05/02 15:47:23 chriskl Exp $
+        * $Id: functions.php,v 1.49 2005/08/15 17:15:36 xzilla Exp $
         */
 
        // Include application functions
@@ -522,6 +522,10 @@
                                'vars'  => array('function' => 'proproto', 'function_oid' => 'prooid'),
                        ),
                );
+
+               if ( !$data->hasFuncPrivs() ) {
+                       unset($actions['privileges']);
+               }
                
                $misc->printTable($funcs, $columns, $actions, $lang['strnofunctions']);