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 "resourceloader: Unbreak ResourceLoaderImageModule's rasterization"
[lhc/web/wiklou.git]
/
includes
/
Category.php
diff --git
a/includes/Category.php
b/includes/Category.php
index
7bab464
..
3a21e25
100644
(file)
--- a/
includes/Category.php
+++ b/
includes/Category.php
@@
-60,8
+60,6
@@
class Category {
return true;
}
return true;
}
- wfProfileIn( __METHOD__ );
-
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr->selectRow(
'category',
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr->selectRow(
'category',
@@
-70,8
+68,6
@@
class Category {
__METHOD__
);
__METHOD__
);
- wfProfileOut( __METHOD__ );
-
if ( !$row ) {
# Okay, there were no contents. Nothing to initialize.
if ( $this->mTitle ) {
if ( !$row ) {
# Okay, there were no contents. Nothing to initialize.
if ( $this->mTitle ) {
@@
-258,7
+254,6
@@
class Category {
* @return TitleArray TitleArray object for category members.
*/
public function getMembers( $limit = false, $offset = '' ) {
* @return TitleArray TitleArray object for category members.
*/
public function getMembers( $limit = false, $offset = '' ) {
- wfProfileIn( __METHOD__ );
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_SLAVE );
@@
-284,13
+279,12
@@
class Category {
)
);
)
);
- wfProfileOut( __METHOD__ );
-
return $result;
}
/**
* Generic accessor
return $result;
}
/**
* Generic accessor
+ * @param string $key
* @return bool
*/
private function getX( $key ) {
* @return bool
*/
private function getX( $key ) {
@@
-317,8
+311,6
@@
class Category {
}
}
}
}
- wfProfileIn( __METHOD__ );
-
$dbw = wfGetDB( DB_MASTER );
$dbw->startAtomic( __METHOD__ );
$dbw = wfGetDB( DB_MASTER );
$dbw->startAtomic( __METHOD__ );
@@
-362,8
+354,6
@@
class Category {
);
$dbw->endAtomic( __METHOD__ );
);
$dbw->endAtomic( __METHOD__ );
- wfProfileOut( __METHOD__ );
-
# Now we should update our local counts.
$this->mPages = $result->pages;
$this->mSubcats = $result->subcats;
# Now we should update our local counts.
$this->mPages = $result->pages;
$this->mSubcats = $result->subcats;