| Index: branches/wmf-deployment/includes/api/ApiQueryDeletedrevs.php |
| — | — | @@ -152,7 +152,7 @@ |
| 153 | 153 | "(ar_namespace = $ns AND " . |
| 154 | 154 | "(ar_title $op '$title' OR " . |
| 155 | 155 | "(ar_title = '$title' AND " . |
| 156 | | - "ar_timestamp = '$ts')))"); |
| | 156 | + "ar_timestamp $op= '$ts')))"); |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | $this->addOption('LIMIT', $limit + 1); |
| Property changes on: branches/wmf-deployment/includes/api/ApiQueryDeletedrevs.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 160 | 160 | + /branches/REL1_15/phase3/includes/api/ApiQueryDeletedrevs.php:51646 |
| /branches/wmf-deployment/includes/api/ApiQueryDeletedrevs.php:53381 |
| /trunk/phase3/includes/api/ApiQueryDeletedrevs.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57541,57602,57916,58086,58151,58219,58633,58816,60465,60587,60589,60704,61557,62540,62549 |
| Index: branches/wmf-deployment/includes/api/ApiQueryAllUsers.php |
| — | — | @@ -165,7 +165,8 @@ |
| 166 | 166 | if ($fld_editcount) |
| 167 | 167 | $lastUserData['editcount'] = intval($row->user_editcount); |
| 168 | 168 | if ($fld_registration) |
| 169 | | - $lastUserData['registration'] = wfTimestamp(TS_ISO_8601, $row->user_registration); |
| | 169 | + $lastUserData['registration'] = $row->user_registration ? |
| | 170 | + wfTimestamp(TS_ISO_8601, $row->user_registration) : ''; |
| 170 | 171 | |
| 171 | 172 | } |
| 172 | 173 | |
| Property changes on: branches/wmf-deployment/includes/api/ApiQueryAllUsers.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 173 | 174 | + /branches/REL1_15/phase3/includes/api/ApiQueryAllUsers.php:51646 |
| /branches/wmf-deployment/includes/api/ApiQueryAllUsers.php:53381 |
| /trunk/phase3/includes/api/ApiQueryAllUsers.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57541,57602,57916,58151,58219,58551,58633,58816,59656,60465,60587,60589,60704,61557,62540,62549 |