Commits vergleichen
2 Commits
1419bbf701
...
df76ce462a
Autor | SHA1 | Datum |
---|---|---|
o.pinke | df76ce462a | |
o.pinke | 33e941aecf |
|
@ -185,7 +185,8 @@ class DB_Sql extends DB_Sql_Abstract {
|
||||||
/**
|
/**
|
||||||
* @see DB_Sql_Abstract::next_record()
|
* @see DB_Sql_Abstract::next_record()
|
||||||
*/
|
*/
|
||||||
public function next_record() {
|
public function next_record(): bool|int
|
||||||
|
{
|
||||||
if (!$this->Query_ID instanceof mysqli_result) {
|
if (!$this->Query_ID instanceof mysqli_result) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,16 +80,20 @@ class DB_ConLite extends DB_Sql {
|
||||||
/**
|
/**
|
||||||
* Fetches the next recordset from result set
|
* Fetches the next recordset from result set
|
||||||
*
|
*
|
||||||
* @param bool
|
* @deprecated since ConLite 2.3
|
||||||
*/
|
*/
|
||||||
public function next_record() {
|
public function next_record(): bool|int
|
||||||
global $cCurrentModule;
|
{
|
||||||
// FIXME For what reason is NoRecord used???
|
return $this->nextRecord();
|
||||||
$this->NoRecord = false;
|
}
|
||||||
|
|
||||||
|
public function nextRecord(): bool|int
|
||||||
|
{
|
||||||
|
$currentModule = cRegistry::getCurrentModule();
|
||||||
|
|
||||||
if (!$this->Query_ID) {
|
if (!$this->Query_ID) {
|
||||||
$this->NoRecord = true;
|
if ($currentModule > 0) {
|
||||||
if ($cCurrentModule > 0) {
|
$this->halt("next_record called with no query pending in Module ID $currentModule.");
|
||||||
$this->halt("next_record called with no query pending in Module ID $cCurrentModule.");
|
|
||||||
} else {
|
} else {
|
||||||
$this->halt("next_record called with no query pending.");
|
$this->halt("next_record called with no query pending.");
|
||||||
}
|
}
|
||||||
|
|
|
@ -219,6 +219,11 @@ class cRegistry {
|
||||||
return self::_fetchGlobalVariable('edit', FALSE);
|
return self::_fetchGlobalVariable('edit', FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function getCurrentModule()
|
||||||
|
{
|
||||||
|
return self::_fetchGlobalVariable('cCurrentModule', 0);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetches the global variable requested.
|
* Fetches the global variable requested.
|
||||||
* If variable is not set, the default value is returned.
|
* If variable is not set, the default value is returned.
|
||||||
|
@ -246,5 +251,4 @@ class cRegistry {
|
||||||
|
|
||||||
return new $apiClassName($objectId);
|
return new $apiClassName($objectId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
|
|
@ -601,8 +601,8 @@ function isAnimGif($sFile) {
|
||||||
*
|
*
|
||||||
* @return string Path to the resulting image
|
* @return string Path to the resulting image
|
||||||
*/
|
*/
|
||||||
function capiImgScale($img, $maxX, $maxY, $crop = false, $expand = false, $cacheTime = 10, $wantHQ = false, $quality = 75, $keepType = false) {
|
function capiImgScale($img, $maxX, $maxY, $crop = false, $expand = false, $cacheTime = 10, $wantHQ = false, $quality = 75, $keepType = true) {
|
||||||
global $client, $db, $cfg, $cfgClient;
|
global $client, $cfgClient;
|
||||||
|
|
||||||
$deleteAfter = false;
|
$deleteAfter = false;
|
||||||
|
|
||||||
|
|
Laden…
In neuem Issue referenzieren