| Index: branches/wmf/1.18wmf1/extensions/ShortUrl/ShortUrl.php |
| — | — | @@ -19,10 +19,10 @@ |
| 20 | 20 | * Configuration variables |
| 21 | 21 | * Prefix to use for the shortened URL. mod_rewrite (or equivalent) needs to be setup |
| 22 | 22 | * to produce a shorter URL |
| 23 | | - * Default is 'null' which just uses the (not so short) URL that all Special Pages get |
| | 23 | + * Default is false which just uses the (not so short) URL that all Special Pages get |
| 24 | 24 | * Eg: http://en.wikipedia.org/wiki/Special:ShortUrl/5234 |
| 25 | 25 | */ |
| 26 | | -$wgShortUrlPrefix = null; |
| | 26 | +$wgShortUrlPrefix = false; |
| 27 | 27 | |
| 28 | 28 | // Extension credits that will show up on Special:Version |
| 29 | 29 | $wgExtensionCredits['specialpage'][] = array( |
| Index: branches/wmf/1.18wmf1/extensions/ShortUrl/ShortUrl.hooks.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | public static function addToolboxLink( &$tpl ) { |
| 23 | 23 | global $wgOut, $wgShortUrlPrefix; |
| 24 | 24 | |
| 25 | | - if ( $wgShortUrlPrefix === null ) { |
| | 25 | + if ( !is_string( $wgShortUrlPrefix ) ) { |
| 26 | 26 | $urlPrefix = SpecialPage::getTitleFor( 'ShortUrl' )->getCanonicalUrl() . '/'; |
| 27 | 27 | } else { |
| 28 | 28 | $urlPrefix = $wgShortUrlPrefix; |
| Property changes on: branches/wmf/1.18wmf1/extensions/ShortUrl |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 29 | 29 | Merged /branches/REL1_15/phase3/extensions/ShortUrl:r51646 |
| 30 | 30 | Merged /branches/REL1_18/extensions/ShortUrl:r101758,103190 |
| 31 | 31 | Merged /branches/REL1_17/phase3/extensions/ShortUrl:r81445,81448 |
| 32 | 32 | Merged /trunk/extensions/ShortUrl:r95614,99592,99653,100092,100419,100516,100686,100692,100699,103260,103315,103378,103382,103669,104337,104736,104862-104863,104865,104971,105275,105902,105908,107043,107050,107337,107783,107816,107818,108679 |
| 33 | 33 | Merged /branches/sqlite/extensions/ShortUrl:r58211-58321 |
| 34 | 34 | Merged /trunk/phase3/extensions/ShortUrl:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656 |
| 35 | 35 | Merged /branches/new-installer/phase3/extensions/ShortUrl:r43664-66004 |