dont use numRows when it's not needed since it can be expensive

diff --git a/lib/appconfig.php b/lib/appconfig.php
index c64a15b8938812bfd256fcd4056c5c8b1746e87a..392782b2586c99e131697291a56fe45dcee65779 100644 (file)
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -93,14 +93,12 @@ class OC_Appconfig{
                // At least some magic in here :-)
                $query = OC_DB::prepare( 'SELECT configvalue FROM *PREFIX*appconfig WHERE appid = ? AND configkey = ?' );
                $result = $query->execute( array( $app, $key ));
-
-               if( !$result->numRows()){
+               $row = $result->fetchRow();
+               if($row){
+                       return $row["configvalue"];
+               }else{
                        return $default;
                }
-
-               $row = $result->fetchRow();
-
-               return $row["configvalue"];
        }
 
        /**

diff --git a/lib/group/database.php b/lib/group/database.php
index 8a9fc53d39fa0e330532237506dfbe8426b1f43c..7bf9c8bb5cedfbaab71af25d0d5c684414ab505e 100644 (file)
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -56,7 +56,7 @@ class OC_Group_Database extends OC_Group_Backend {
                $query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*groups` WHERE gid = ?" );
                $result = $query->execute( array( $gid ));
 
-               if( $result->numRows() > 0 ){
+               if( !$result->fetchRow() ){
                        // Can not add an existing group
                        return false;
                }

diff --git a/lib/preferences.php b/lib/preferences.php
index d53cdd538e0c4dec0d872e54b066b77211a774d6..5af007f02238a74466b4ed67403017a0316317af 100644 (file)
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -116,14 +116,13 @@ class OC_Preferences{
                // Try to fetch the value, return default if not exists.
                $query = OC_DB::prepare( 'SELECT configvalue FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ?' );
                $result = $query->execute( array( $user, $app, $key ));
-
-               if( !$result->numRows()){
+               
+               $row = $result->fetchRow();
+               if($row){
+                       return $row["configvalue"];
+               }else{
                        return $default;
                }
-
-               $row = $result->fetchRow();
-
-               return $row["configvalue"];
        }
 
        /**

diff --git a/lib/user/database.php b/lib/user/database.php
index f29aaf00f05ec84926532029055360162af67a52..452709c1fb977aacbcdcc63aace597f4344ece1e 100644 (file)
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -106,8 +106,8 @@ class OC_User_Database extends OC_User_Backend {
                $query = OC_DB::prepare( "SELECT uid FROM *PREFIX*users WHERE uid LIKE ? AND password = ?" );
                $result = $query->execute( array( $uid, sha1( $password )));
 
-               if( $result->numRows() > 0 ){
-                       $row=$result->fetchRow();
+               $row=$result->fetchRow();
+               if($row){
                        return $row['uid'];
                }else{
                        return false;