dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "LoginForm: Pass username as first parameter to error message if aborted"
[lhc/web/wiklou.git]
/
includes
/
db
/
ORMResult.php
diff --git
a/includes/db/ORMResult.php
b/includes/db/ORMResult.php
index
2a5837a
..
327d20d
100644
(file)
--- a/
includes/db/ORMResult.php
+++ b/
includes/db/ORMResult.php
@@
-25,19
+25,18
@@
* @file ORMResult.php
* @ingroup ORM
*
* @file ORMResult.php
* @ingroup ORM
*
- * @licen
c
e GNU GPL v2 or later
+ * @licen
s
e GNU GPL v2 or later
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
class ORMResult implements ORMIterator {
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
class ORMResult implements ORMIterator {
-
/**
* @var ResultWrapper
*/
protected $res;
/**
/**
* @var ResultWrapper
*/
protected $res;
/**
- * @var int
eger
+ * @var int
*/
protected $key;
*/
protected $key;
@@
-63,7
+62,7
@@
class ORMResult implements ORMIterator {
}
/**
}
/**
- * @param $row
+ * @param
bool|object
$row
*/
protected function setCurrent( $row ) {
if ( $row === false ) {
*/
protected function setCurrent( $row ) {
if ( $row === false ) {
@@
-74,14
+73,14
@@
class ORMResult implements ORMIterator {
}
/**
}
/**
- * @return int
eger
+ * @return int
*/
public function count() {
return $this->res->numRows();
}
/**
*/
public function count() {
return $this->res->numRows();
}
/**
- * @return bool
ean
+ * @return bool
*/
public function isEmpty() {
return $this->res->numRows() === 0;
*/
public function isEmpty() {
return $this->res->numRows() === 0;
@@
-95,7
+94,7
@@
class ORMResult implements ORMIterator {
}
/**
}
/**
- * @return int
eger
+ * @return int
*/
public function key() {
return $this->key;
*/
public function key() {
return $this->key;
@@
-114,10
+113,9
@@
class ORMResult implements ORMIterator {
}
/**
}
/**
- * @return bool
ean
+ * @return bool
*/
public function valid() {
return $this->current !== false;
}
*/
public function valid() {
return $this->current !== false;
}
-
}
}