set default for param

conlib/db_mysqli.inc

@@ -185,7 +185,8 @@ class DB_Sql extends DB_Sql_Abstract {
     /**
      * @see DB_Sql_Abstract::next_record()
      */
-    public function next_record() {
+    public function next_record(): bool|int
+    {
         if (!$this->Query_ID instanceof mysqli_result) {
             return false;
         }

conlib/local.php

@@ -80,16 +80,20 @@ class DB_ConLite extends DB_Sql {
     /**
      * Fetches the next recordset from result set
      *
-     * @param  bool
+     * @deprecated since ConLite 2.3
      */
-    public function next_record() {
-        global $cCurrentModule;
-        // FIXME  For what reason is NoRecord used???
-        $this->NoRecord = false;
+    public function next_record(): bool|int
+    {
+        return $this->nextRecord();
+    }
+
+    public function nextRecord(): bool|int
+    {
+        $currentModule = cRegistry::getCurrentModule();
+
         if (!$this->Query_ID) {
-            $this->NoRecord = true;
-            if ($cCurrentModule > 0) {
-                $this->halt("next_record called with no query pending in Module ID $cCurrentModule.");
+            if ($currentModule > 0) {
+                $this->halt("next_record called with no query pending in Module ID $currentModule.");
             } else {
                 $this->halt("next_record called with no query pending.");
             }

conlite/classes/con2con/class.registry.php

@@ -219,6 +219,11 @@ class cRegistry {
         return self::_fetchGlobalVariable('edit', FALSE);
     }
 
+    public static function getCurrentModule()
+    {
+        return self::_fetchGlobalVariable('cCurrentModule', 0);
+    }
+
     /**
      * Fetches the global variable requested.
      * If variable is not set, the default value is returned.
@@ -246,5 +251,4 @@ class cRegistry {
 
         return new $apiClassName($objectId);
     }
-}
-?>
+}

conlite/includes/functions.api.images.php

@@ -601,8 +601,8 @@ function isAnimGif($sFile) {
  *
  * @return string Path to the resulting image
  */
-function capiImgScale($img, $maxX, $maxY, $crop = false, $expand = false, $cacheTime = 10, $wantHQ = false, $quality = 75, $keepType = false) {
-    global $client, $db, $cfg, $cfgClient;
+function capiImgScale($img, $maxX, $maxY, $crop = false, $expand = false, $cacheTime = 10, $wantHQ = false, $quality = 75, $keepType = true) {
+    global $client, $cfgClient;
 
     $deleteAfter = false;