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 "Config: Add Config and GlobalConfig classes"
[lhc/web/wiklou.git]
/
includes
/
db
/
ORMTable.php
diff --git
a/includes/db/ORMTable.php
b/includes/db/ORMTable.php
index
e47bc67
..
3f91e0a
100644
(file)
--- a/
includes/db/ORMTable.php
+++ b/
includes/db/ORMTable.php
@@
-246,9
+246,9
@@
class ORMTable extends DBAccessBase implements IORMTable {
* @param array $conditions
* @param array $options
* @param null|string $functionName
* @param array $conditions
* @param array $options
* @param null|string $functionName
- *
* @return ResultWrapper
* @return ResultWrapper
- * @throws DBQueryError if the quey failed (even if the database was in ignoreErrors mode).
+ * @throws DBQueryError if the query failed (even if the database was in
+ * ignoreErrors mode).
*/
public function rawSelect( $fields = null, array $conditions = array(),
array $options = array(), $functionName = null
*/
public function rawSelect( $fields = null, array $conditions = array(),
array $options = array(), $functionName = null
@@
-378,7
+378,7
@@
class ORMTable extends DBAccessBase implements IORMTable {
* @param array $options
* @param string|null $functionName
*
* @param array $options
* @param string|null $functionName
*
- * @return
ResultWrapper
+ * @return
stdClass
*/
public function rawSelectRow( array $fields, array $conditions = array(),
array $options = array(), $functionName = null
*/
public function rawSelectRow( array $fields, array $conditions = array(),
array $options = array(), $functionName = null
@@
-825,7
+825,7
@@
class ORMTable extends DBAccessBase implements IORMTable {
* @since 1.20
*
* @param stdClass $result
* @since 1.20
*
* @param stdClass $result
- *
+ *
@throws MWException
* @return array
*/
public function getFieldsFromDBResult( stdClass $result ) {
* @return array
*/
public function getFieldsFromDBResult( stdClass $result ) {