Changeset 20720

Timestamp:

Feb 12, 2013, 12:06:00 PM (11 years ago)

Author:

mistic100

Message:

feature:65 pwg_db_connect doesn't return anything now

Location:

trunk

Files:

• admin/include/functions_install.inc.php (modified) (1 diff)
• admin/include/functions_upgrade.php (modified) (1 diff)
• include/common.inc.php (modified) (1 diff)
• upgrade_feed.php (modified) (1 diff)

trunk/admin/include/functions_install.inc.php

@@ -144 +144 @@
 function install_db_connect(&$infos, &$errors)
 {
-  global $pwg_db_link;
-  
   try
   {
-    $pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'], $_POST['dbpasswd'], $_POST['dbname']);
-    if ($pwg_db_link)
-    {
-      pwg_db_check_version();
-    }
+    pwg_db_connect($_POST['dbhost'], $_POST['dbuser'],
+                   $_POST['dbpasswd'], $_POST['dbname']);
+    pwg_db_check_version();
   }
   catch (Exception $e)

trunk/admin/include/functions_upgrade.php

@@ -315 +315 @@
   try
   {
-    $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'], $conf['db_password'], $conf['db_base']);
-    if ($pwg_db_link)
-    {
-      pwg_db_check_version();
-    }
+    pwg_db_connect($conf['db_host'], $conf['db_user'],
+                   $conf['db_password'], $conf['db_base']);
+    pwg_db_check_version();
   }
   catch (Exception $e)

trunk/include/common.inc.php

@@ -112 +112 @@
 try
 {
-  $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
-                                $conf['db_password'], $conf['db_base']);
+  pwg_db_connect($conf['db_host'], $conf['db_user'],
+                 $conf['db_password'], $conf['db_base']);
 }
 catch (Exception $e)

trunk/upgrade_feed.php

@@ -61 +61 @@
 try
 {
-  $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
-                                $conf['db_password'], $conf['db_base']);
+  pwg_db_connect($conf['db_host'], $conf['db_user'],
+                 $conf['db_password'], $conf['db_base']);
 }
 catch (Exception $e)