| Index: trunk/phase3/includes/search/SearchPostgres.php |
| — | — | @@ -67,11 +67,10 @@ |
| 68 | 68 | return new PostgresSearchResultSet( $resultSet, $this->searchTerms ); |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | | - |
| 72 | | - /* |
| | 71 | + /** |
| 73 | 72 | * Transform the user's search string into a better form for tsearch2 |
| 74 | 73 | * Returns an SQL fragment consisting of quoted text to search for. |
| 75 | | - */ |
| | 74 | + */ |
| 76 | 75 | function parseQuery( $term ) { |
| 77 | 76 | |
| 78 | 77 | wfDebug( "parseQuery received: $term \n" ); |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2703,7 +2703,7 @@ |
| 2704 | 2704 | } |
| 2705 | 2705 | |
| 2706 | 2706 | |
| 2707 | | - /* |
| | 2707 | + /** |
| 2708 | 2708 | * UI entry point for page deletion |
| 2709 | 2709 | */ |
| 2710 | 2710 | public function delete() { |
| Index: trunk/phase3/includes/MimeMagic.php |
| — | — | @@ -157,11 +157,11 @@ |
| 158 | 158 | private static $extensionLoaded = false; |
| 159 | 159 | |
| 160 | 160 | /** Initializes the MimeMagic object. This is called by MimeMagic::singleton(). |
| 161 | | - * |
| 162 | | - * This constructor parses the mime.types and mime.info files and build internal mappings. |
| 163 | | - */ |
| | 161 | + * |
| | 162 | + * This constructor parses the mime.types and mime.info files and build internal mappings. |
| | 163 | + */ |
| 164 | 164 | function __construct() { |
| 165 | | - /* |
| | 165 | + /** |
| 166 | 166 | * --- load mime.types --- |
| 167 | 167 | */ |
| 168 | 168 | |
| — | — | @@ -244,9 +244,9 @@ |
| 245 | 245 | } |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | | - /* |
| 249 | | - * --- load mime.info --- |
| 250 | | - */ |
| | 248 | + /** |
| | 249 | + * --- load mime.info --- |
| | 250 | + */ |
| 251 | 251 | |
| 252 | 252 | global $wgMimeInfoFile; |
| 253 | 253 | if ( $wgMimeInfoFile == 'includes/mime.info' ) { |
| — | — | @@ -628,7 +628,7 @@ |
| 629 | 629 | return "image/webp"; |
| 630 | 630 | } |
| 631 | 631 | |
| 632 | | - /* |
| | 632 | + /** |
| 633 | 633 | * Look for PHP. Check for this before HTML/XML... Warning: this is a |
| 634 | 634 | * heuristic, and won't match a file with a lot of non-PHP before. It |
| 635 | 635 | * will also match text files which could be PHP. :) |
| — | — | @@ -652,7 +652,7 @@ |
| 653 | 653 | return 'application/x-php'; |
| 654 | 654 | } |
| 655 | 655 | |
| 656 | | - /* |
| | 656 | + /** |
| 657 | 657 | * look for XML formats (XHTML and SVG) |
| 658 | 658 | */ |
| 659 | 659 | $xml = new XmlTypeCheck( $file ); |
| — | — | @@ -665,7 +665,7 @@ |
| 666 | 666 | } |
| 667 | 667 | } |
| 668 | 668 | |
| 669 | | - /* |
| | 669 | + /** |
| 670 | 670 | * look for shell scripts |
| 671 | 671 | */ |
| 672 | 672 | $script_type = null; |
| Index: trunk/phase3/includes/objectcache/BagOStuff.php |
| — | — | @@ -64,7 +64,7 @@ |
| 65 | 65 | */ |
| 66 | 66 | abstract public function set( $key, $value, $exptime = 0 ); |
| 67 | 67 | |
| 68 | | - /* |
| | 68 | + /** |
| 69 | 69 | * Delete an item. |
| 70 | 70 | * @param $key string |
| 71 | 71 | * @param $time int Amount of time to delay the operation (mostly memcached-specific) |
| Index: trunk/phase3/includes/parser/CoreParserFunctions.php |
| — | — | @@ -442,10 +442,11 @@ |
| 443 | 443 | return ''; |
| 444 | 444 | return wfUrlencode( $t->getSubjectNsText() ); |
| 445 | 445 | } |
| 446 | | - /* |
| | 446 | + |
| | 447 | + /** |
| 447 | 448 | * Functions to get and normalize pagenames, corresponding to the magic words |
| 448 | 449 | * of the same names |
| 449 | | - */ |
| | 450 | + */ |
| 450 | 451 | static function pagename( $parser, $title = null ) { |
| 451 | 452 | $t = Title::newFromText( $title ); |
| 452 | 453 | if ( is_null( $t ) ) |
| Index: trunk/phase3/includes/db/LBFactory.php |
| — | — | @@ -80,7 +80,7 @@ |
| 81 | 81 | */ |
| 82 | 82 | abstract function getMainLB( $wiki = false ); |
| 83 | 83 | |
| 84 | | - /* |
| | 84 | + /** |
| 85 | 85 | * Create a new load balancer for external storage. The resulting object will be |
| 86 | 86 | * untracked, not chronology-protected, and the caller is responsible for |
| 87 | 87 | * cleaning it up. |
| — | — | @@ -90,7 +90,7 @@ |
| 91 | 91 | */ |
| 92 | 92 | abstract function newExternalLB( $cluster, $wiki = false ); |
| 93 | 93 | |
| 94 | | - /* |
| | 94 | + /** |
| 95 | 95 | * Get a cached (tracked) load balancer for external storage |
| 96 | 96 | * |
| 97 | 97 | * @param $cluster String: external storage cluster, or false for core |
| Index: trunk/phase3/includes/db/DatabaseSqlite.php |
| — | — | @@ -620,7 +620,7 @@ |
| 621 | 621 | return $s; |
| 622 | 622 | } |
| 623 | 623 | |
| 624 | | - /* |
| | 624 | + /** |
| 625 | 625 | * Build a concatenation list to feed into a SQL query |
| 626 | 626 | * |
| 627 | 627 | * @return string |
| Index: trunk/phase3/includes/filerepo/FileRepo.php |
| — | — | @@ -150,7 +150,7 @@ |
| 151 | 151 | return false; |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | | - /* |
| | 154 | + /** |
| 155 | 155 | * Find many files at once. |
| 156 | 156 | * @param $items An array of titles, or an array of findFile() options with |
| 157 | 157 | * the "title" option giving the title. Example: |
| Index: trunk/phase3/includes/filerepo/ForeignAPIRepo.php |
| — | — | @@ -216,7 +216,7 @@ |
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | | - /* |
| | 220 | + /** |
| 221 | 221 | * Return the imageurl from cache if possible |
| 222 | 222 | * |
| 223 | 223 | * If the url has been requested today, get it from cache |
| Index: trunk/phase3/includes/filerepo/File.php |
| — | — | @@ -930,6 +930,7 @@ |
| 931 | 931 | function getRepoName() { |
| 932 | 932 | return $this->repo ? $this->repo->getName() : 'unknown'; |
| 933 | 933 | } |
| | 934 | + |
| 934 | 935 | /* |
| 935 | 936 | * Returns the repository |
| 936 | 937 | */ |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -287,7 +287,7 @@ |
| 288 | 288 | return ''; |
| 289 | 289 | } |
| 290 | 290 | |
| 291 | | - /* |
| | 291 | + /** |
| 292 | 292 | * Check if a page was deleted while the user was editing it, before submit. |
| 293 | 293 | * Note that we rely on the logging table, which hasn't been always there, |
| 294 | 294 | * but that doesn't matter, because this only applies to brand new |
| — | — | @@ -1882,7 +1882,7 @@ |
| 1883 | 1883 | $wgOut->addHTML( "</div><!-- editButtons -->\n</div><!-- editOptions -->\n" ); |
| 1884 | 1884 | } |
| 1885 | 1885 | |
| 1886 | | - /* |
| | 1886 | + /** |
| 1887 | 1887 | * Show an edit conflict. textbox1 is already shown in showEditForm(). |
| 1888 | 1888 | * If you want to use another entry point to this function, be careful. |
| 1889 | 1889 | */ |
| Index: trunk/phase3/includes/ChangesFeed.php |
| — | — | @@ -61,11 +61,11 @@ |
| 62 | 62 | |
| 63 | 63 | FeedUtils::checkPurge( $timekey, $key ); |
| 64 | 64 | |
| 65 | | - /* |
| 66 | | - * Bumping around loading up diffs can be pretty slow, so where |
| 67 | | - * possible we want to cache the feed output so the next visitor |
| 68 | | - * gets it quick too. |
| 69 | | - */ |
| | 65 | + /** |
| | 66 | + * Bumping around loading up diffs can be pretty slow, so where |
| | 67 | + * possible we want to cache the feed output so the next visitor |
| | 68 | + * gets it quick too. |
| | 69 | + */ |
| 70 | 70 | $cachedFeed = $this->loadFromCache( $lastmod, $timekey, $key ); |
| 71 | 71 | if( is_string( $cachedFeed ) ) { |
| 72 | 72 | wfDebug( "RC: Outputting cached feed\n" ); |
| — | — | @@ -110,12 +110,12 @@ |
| 111 | 111 | $feedLastmod = $messageMemc->get( $timekey ); |
| 112 | 112 | |
| 113 | 113 | if( ( $wgFeedCacheTimeout > 0 ) && $feedLastmod ) { |
| 114 | | - /* |
| 115 | | - * If the cached feed was rendered very recently, we may |
| 116 | | - * go ahead and use it even if there have been edits made |
| 117 | | - * since it was rendered. This keeps a swarm of requests |
| 118 | | - * from being too bad on a super-frequently edited wiki. |
| 119 | | - */ |
| | 114 | + /** |
| | 115 | + * If the cached feed was rendered very recently, we may |
| | 116 | + * go ahead and use it even if there have been edits made |
| | 117 | + * since it was rendered. This keeps a swarm of requests |
| | 118 | + * from being too bad on a super-frequently edited wiki. |
| | 119 | + */ |
| 120 | 120 | |
| 121 | 121 | $feedAge = time() - wfTimestamp( TS_UNIX, $feedLastmod ); |
| 122 | 122 | $feedLastmodUnix = wfTimestamp( TS_UNIX, $feedLastmod ); |
| Index: trunk/phase3/includes/installer/SqliteInstaller.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | $this->getTextBox( 'wgDBname', 'config-db-name', array(), $this->parent->getHelpBox( 'config-sqlite-name-help' ) ); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | | - /* |
| | 49 | + /** |
| 50 | 50 | * Safe wrapper for PHP's realpath() that fails gracefully if it's unable to canonicalize the path. |
| 51 | 51 | */ |
| 52 | 52 | private static function realpath( $path ) { |
| Index: trunk/phase3/includes/media/SVGMetadataExtractor.php |
| — | — | @@ -83,14 +83,14 @@ |
| 84 | 84 | wfRestoreWarnings(); |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | | - /* |
| | 87 | + /** |
| 88 | 88 | * @return Array with the known metadata |
| 89 | 89 | */ |
| 90 | 90 | public function getMetadata() { |
| 91 | 91 | return $this->metadata; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | | - /* |
| | 94 | + /** |
| 95 | 95 | * Read the SVG |
| 96 | 96 | */ |
| 97 | 97 | public function read() { |
| — | — | @@ -142,7 +142,7 @@ |
| 143 | 143 | return true; |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | | - /* |
| | 146 | + /** |
| 147 | 147 | * Read a textelement from an element |
| 148 | 148 | * |
| 149 | 149 | * @param String $name of the element that we are reading from |
| — | — | @@ -179,7 +179,7 @@ |
| 180 | 180 | $this->reader->next(); |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | | - /* |
| | 183 | + /** |
| 184 | 184 | * Filter all children, looking for animate elements |
| 185 | 185 | * |
| 186 | 186 | * @param String $name of the element that we are reading from |
| — | — | @@ -238,7 +238,7 @@ |
| 239 | 239 | wfDebug( "SVGReader WARN: $data\n" ); |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | | - /* |
| | 242 | + /** |
| 243 | 243 | * Parse the attributes of an SVG element |
| 244 | 244 | * |
| 245 | 245 | * The parser has to be in the start element of <svg> |
| Index: trunk/phase3/includes/media/SVG.php |
| — | — | @@ -105,7 +105,7 @@ |
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | | - /* |
| | 109 | + /** |
| 110 | 110 | * Transform an SVG file to PNG |
| 111 | 111 | * This function can be called outside of thumbnail contexts |
| 112 | 112 | * @param string $srcPath |
| Index: trunk/phase3/includes/media/XMP.php |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | |
| 42 | 42 | protected $items; |
| 43 | 43 | |
| 44 | | - /* |
| | 44 | + /** |
| 45 | 45 | * These are various mode constants. |
| 46 | 46 | * they are used to figure out what to do |
| 47 | 47 | * with an element when its encountered. |
| Index: trunk/phase3/includes/media/Generic.php |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | */ |
| 50 | 50 | abstract function getParamMap(); |
| 51 | 51 | |
| 52 | | - /* |
| | 52 | + /** |
| 53 | 53 | * Validate a thumbnail parameter at parse time. |
| 54 | 54 | * Return true to accept the parameter, and false to reject it. |
| 55 | 55 | * If you return false, the parser will do something quiet and forgiving. |
| Index: trunk/phase3/includes/media/BMP.php |
| — | — | @@ -23,7 +23,7 @@ |
| 24 | 24 | return array( 'png', 'image/png' ); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | | - /* |
| | 27 | + /** |
| 28 | 28 | * Get width and height from the bmp header. |
| 29 | 29 | */ |
| 30 | 30 | function getImageSize( $image, $filename ) { |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1770,7 +1770,7 @@ |
| 1771 | 1771 | # Not a public wiki, so no shortcut |
| 1772 | 1772 | $useShortcut = false; |
| 1773 | 1773 | } elseif ( !empty( $wgRevokePermissions ) ) { |
| 1774 | | - /* |
| | 1774 | + /** |
| 1775 | 1775 | * Iterate through each group with permissions being revoked (key not included since we don't care |
| 1776 | 1776 | * what the group name is), then check if the read permission is being revoked. If it is, then |
| 1777 | 1777 | * we don't use the shortcut below since the user might not be able to read, even though anon |
| Index: trunk/phase3/includes/ConfEditor.php |
| — | — | @@ -472,7 +472,7 @@ |
| 473 | 473 | return $extraPath; |
| 474 | 474 | } |
| 475 | 475 | |
| 476 | | - /* |
| | 476 | + /** |
| 477 | 477 | * Find the path name of first element in the array. |
| 478 | 478 | * If the array is empty, this will return the \@extra interstitial element. |
| 479 | 479 | * If the specified path is not found or is not an array, it will return false. |