3 files changed, 4 insertions, 4 deletions

diff --git a/frontend/modules/gentoo/step1.php b/frontend/modules/gentoo/step1.php
index 297f7c0..67ebd71 100644
--- a/frontend/modules/gentoo/step1.php
+++ b/frontend/modules/gentoo/step1.php
@@ -1,6 +1,6 @@
 <?php
 $opts=array();
-$r=$this->query('SELECT * FROM `gentoo_profiles` WHERE `flags` NOT LIKE "%d%"');
+$r=query('SELECT * FROM `gentoo_profiles` WHERE `flags` NOT LIKE "%d%"');
 while ($profile=$r->fetch(PDO::FETCH_ASSOC)) {
 	$profile=new sql_gentoo_profile($profile);
 	$display=$profile->name?$profile->name:($profile->pkgdir?$profile->pkgdir:'/');
diff --git a/frontend/modules/gentoo/step2.php b/frontend/modules/gentoo/step2.php
index 8eed939..1800255 100644
--- a/frontend/modules/gentoo/step2.php
+++ b/frontend/modules/gentoo/step2.php
@@ -4,7 +4,7 @@ $profile=new sql_gentoo_profile($this->get_opt('profile'));
 $this->checkbox_array('options', 'options', 'Configuration options', array('timezone' => 'Select timezone', 'dev-manager' => 'Select /dev manager', 'pruneinit' => 'Remove enabled-by-default init scripts'));
 $this->select('basesystem', 'basesystem', 'Base system', array('stage3' => 'Stage3 Tarball', 'autoprune' => 'Remove all non-vital packages', 'manual' => 'Manually select packages to remove from stage3'));
 $pkgsets=array();
-$r=$S['pdo']->query('SELECT * FROM `gentoo_pkgsets` WHERE `profile`='.$profile->id);
+$r=query('SELECT * FROM `gentoo_pkgsets` WHERE `profile`='.$profile->id);
 while ($pkgset=$r->fetch(PDO::FETCH_ASSOC)) {
 	$pkgset=new sql_gentoo_pkgset($pkgset);
 	$pkgsets[$pkgset->id]=$pkgset->name;
diff --git a/frontend/modules/gentoo/step3.php b/frontend/modules/gentoo/step3.php
index dd2d72c..7074049 100644
--- a/frontend/modules/gentoo/step3.php
+++ b/frontend/modules/gentoo/step3.php
@@ -20,7 +20,7 @@ if (strlen($pkgsets=$this->get_opt('pkgsets'))) {
 	}
 }
 if (in_array('pruneinit', $opts)) {
-	$r=$S['pdo']->query('SELECT * FROM `gentoo_baseinit` WHERE `profile`='.$profile->id.' ORDER BY `name`, `runlevel`');
+	$r=query('SELECT * FROM `gentoo_baseinit` WHERE `profile`='.$profile->id.' ORDER BY `name`, `runlevel`');
 	$scripts=array();
 	while ($script=$r->fetch(PDO::FETCH_ASSOC)) {
 		$script=new sql_gentoo_baseinit($script);
@@ -29,7 +29,7 @@ if (in_array('pruneinit', $opts)) {
 	$this->checkbox_array('pruneinit', 'pruneinit', 'Remove the following init scripts', $scripts);
 }
 if ($this->get_opt('basesystem') == 'manual') {
-	$r=$S['pdo']->query('SELECT * FROM `gentoo_basepkgs` WHERE `profile`='.$profile->id.' ORDER BY `pkg`');
+	$r=query('SELECT * FROM `gentoo_basepkgs` WHERE `profile`='.$profile->id.' ORDER BY `pkg`');
 	$pkgs=array();
 	while ($pkg=$r->fetch(PDO::FETCH_ASSOC)) {
 		$pkg=$pkg['pkg'];