| Index: trunk/phase3/includes/api/ApiQueryInfo.php |
| — | — | @@ -86,16 +86,19 @@ |
| 87 | 87 | $db = $this->getDB(); |
| 88 | 88 | if ($fld_protection && !empty($titles)) { |
| 89 | 89 | $this->addTables('page_restrictions'); |
| 90 | | - $this->addFields(array('pr_page', 'pr_type', 'pr_level', 'pr_expiry')); |
| | 90 | + $this->addFields(array('pr_page', 'pr_type', 'pr_level', 'pr_expiry', 'pr_cascade')); |
| 91 | 91 | $this->addWhereFld('pr_page', array_keys($titles)); |
| 92 | 92 | |
| 93 | 93 | $res = $this->select(__METHOD__); |
| 94 | 94 | while($row = $db->fetchObject($res)) { |
| 95 | | - $protections[$row->pr_page][] = array( |
| | 95 | + $a = array( |
| 96 | 96 | 'type' => $row->pr_type, |
| 97 | 97 | 'level' => $row->pr_level, |
| 98 | 98 | 'expiry' => Block::decodeExpiry( $row->pr_expiry, TS_ISO_8601 ) |
| 99 | 99 | ); |
| | 100 | + if($row->pr_cascade) |
| | 101 | + $a['cascade'] = ''; |
| | 102 | + $protections[$row->pr_page][] = $a; |
| 100 | 103 | } |
| 101 | 104 | $db->freeResult($res); |
| 102 | 105 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -433,6 +433,7 @@ |
| 434 | 434 | * (bug 12413) meta=userinfo missing <query> tag |
| 435 | 435 | * Add list of sections to action=parse output |
| 436 | 436 | * Added action=logout |
| | 437 | +* Added cascade flag to prop=info&inprop=protections |
| 437 | 438 | |
| 438 | 439 | === Languages updated in 1.12 === |
| 439 | 440 | |