| Index: trunk/extensions/NaturalLanguageList/nllParserTests.txt |
| — | — | @@ -262,7 +262,7 @@ |
| 263 | 263 | !! test |
| 264 | 264 | Intervals |
| 265 | 265 | !! input |
| 266 | | -{{#list:0..5}} |
| | 266 | +{{#intlist:0..5}} |
| 267 | 267 | !! result |
| 268 | 268 | <p>0, 1, 2, 3, 4 and 5 |
| 269 | 269 | </p> |
| — | — | @@ -271,7 +271,7 @@ |
| 272 | 272 | !! test |
| 273 | 273 | No intervals! |
| 274 | 274 | !! input |
| 275 | | -{{#list:intervals=false|0..5}} |
| | 275 | +{{#list:0..5}} |
| 276 | 276 | !! result |
| 277 | 277 | <p>0..5 |
| 278 | 278 | </p> |
| — | — | @@ -280,7 +280,7 @@ |
| 281 | 281 | !! test |
| 282 | 282 | Several intervals |
| 283 | 283 | !! input |
| 284 | | -{{#list:1..10|12..20}} |
| | 284 | +{{#intlist:1..10|12..20}} |
| 285 | 285 | !! result |
| 286 | 286 | <p>1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13, 14, 15, 16, 17, 18, 19 and 20 |
| 287 | 287 | </p> |
| — | — | @@ -289,7 +289,7 @@ |
| 290 | 290 | !! test |
| 291 | 291 | Forced length |
| 292 | 292 | !! input |
| 293 | | -{{#list:length=4|0..5}} |
| | 293 | +{{#intlist:length=4|0..5}} |
| 294 | 294 | !! result |
| 295 | 295 | <p>0, 1, 2 and 3 |
| 296 | 296 | </p> |
| — | — | @@ -298,7 +298,7 @@ |
| 299 | 299 | !! test |
| 300 | 300 | Don't reach higher than capped length |
| 301 | 301 | !! input |
| 302 | | -{{#list:0..2000}} |
| | 302 | +{{#intlist:0..2000}} |
| 303 | 303 | !! result |
| 304 | 304 | <p>0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, 993, 994, 995, 996, 997, 998 and 999 |
| 305 | 305 | </p> |
| — | — | @@ -307,7 +307,7 @@ |
| 308 | 308 | !! test |
| 309 | 309 | Don't reach higher than capped length, not even with forced length |
| 310 | 310 | !! input |
| 311 | | -{{#list:0..2000|length=2000}} |
| | 311 | +{{#intlist:0..2000|length=2000}} |
| 312 | 312 | !! result |
| 313 | 313 | <p>0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, 993, 994, 995, 996, 997, 998 and 999 |
| 314 | 314 | </p> |
| Index: trunk/extensions/NaturalLanguageList/NaturalLanguageList.i18n.magic.php |
| — | — | @@ -5,6 +5,7 @@ |
| 6 | 6 | $magicWords['en'] = array( |
| 7 | 7 | 'list' => array( 1, 'list' ), |
| 8 | 8 | 'rawlist' => array( 1, 'rawlist' ), |
| | 9 | + 'intlist' => array( 1, 'intlist' ), |
| 9 | 10 | 'nll_blanks' => array( 0, 'blanks' ), |
| 10 | 11 | 'nll_duplicates' => array( 0, 'duplicates' ), |
| 11 | 12 | 'nll_itemoutput' => array( 0, 'itemoutput', 'format', 'itemcover' ), |
| — | — | @@ -13,6 +14,5 @@ |
| 14 | 15 | 'nll_outputseparator' => array( 0, 'outputseparator', 'comma', 'separator' ), |
| 15 | 16 | 'nll_ignore' => array( 0, 'ignore' ), |
| 16 | 17 | 'nll_data' => array( 0, 'data' ), |
| 17 | | - 'nll_intervals' => array( 0, 'intervals' ), |
| 18 | 18 | 'nll_length' => array( 0, 'length' ), |
| 19 | 19 | ); |
| Index: trunk/extensions/NaturalLanguageList/NaturalLanguageList.php |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | 'url' => 'http://www.mediawiki.org/wiki/Extension:Natural_Language_List', |
| 45 | 45 | 'description' => 'Easy formatting of lists in natural languages.', |
| 46 | 46 | 'descriptionmsg' => 'nll-desc', |
| 47 | | - 'version' => '2.4' |
| | 47 | + 'version' => '2.4.5' |
| 48 | 48 | ); |
| 49 | 49 | |
| 50 | 50 | $dir = dirname(__FILE__); |
| — | — | @@ -71,6 +71,11 @@ |
| 72 | 72 | array ( __CLASS__, 'renderRaw' ), |
| 73 | 73 | SFH_OBJECT_ARGS |
| 74 | 74 | ); |
| | 75 | + $parser->setFunctionHook( |
| | 76 | + 'intlist', |
| | 77 | + array ( __CLASS__, 'renderIntervals' ), |
| | 78 | + SFH_OBJECT_ARGS |
| | 79 | + ); |
| 75 | 80 | return true; |
| 76 | 81 | } |
| 77 | 82 | |
| — | — | @@ -83,9 +88,8 @@ |
| 84 | 89 | * @return wikicode parsed |
| 85 | 90 | */ |
| 86 | 91 | public static function render( $parser, $frame, $args ) { |
| 87 | | - if ( count( $args ) == 0 ) { |
| | 92 | + if ( count( $args ) == 0 ) |
| 88 | 93 | return ''; |
| 89 | | - } |
| 90 | 94 | $obj = new self( $parser, $frame, $args ); |
| 91 | 95 | $obj->readOptions( false ); |
| 92 | 96 | $obj->readArgs(); |
| — | — | @@ -102,9 +106,8 @@ |
| 103 | 107 | * @return wikicode parsed |
| 104 | 108 | */ |
| 105 | 109 | public static function renderRaw ( $parser, $frame, $args ) { |
| 106 | | - if ( count( $args ) == 0 ) { |
| | 110 | + if ( count( $args ) == 0 ) |
| 107 | 111 | return ''; |
| 108 | | - } |
| 109 | 112 | $obj = new self( $parser, $frame, $args ); |
| 110 | 113 | # get separator between data |
| 111 | 114 | $separator = $obj->mArgs[0]; |
| — | — | @@ -114,15 +117,36 @@ |
| 115 | 118 | return $obj->outputList(); |
| 116 | 119 | } |
| 117 | 120 | |
| | 121 | + /** |
| | 122 | + * Render {{#intlist:}} |
| | 123 | + * |
| | 124 | + * @param $parser Parser |
| | 125 | + * @param $frame PPFrame_DOM |
| | 126 | + * @param $args Array |
| | 127 | + * @return wikicode parsed |
| | 128 | + */ |
| | 129 | + public static function renderIntervals ( $parser, $frame, $args ) { |
| | 130 | + if ( count( $args ) == 0 ) |
| | 131 | + return ''; |
| | 132 | + $obj = new self( $parser, $frame, $args ); |
| | 133 | + $obj->setIntervals( true ); |
| | 134 | + $obj->readOptions( false ); |
| | 135 | + $obj->readArgs(); |
| | 136 | + |
| | 137 | + return $obj->outputList(); |
| | 138 | + } |
| | 139 | + |
| 118 | 140 | private $mParser; |
| 119 | 141 | private $mFrame; |
| 120 | 142 | public $mArgs; |
| 121 | 143 | private $mSeparator = null; |
| | 144 | + private $mInterval = false; # whether to allow intervals |
| | 145 | + # it is not part of mOptions, as it cannot |
| | 146 | + # be set in a similar fashion |
| 122 | 147 | private $mOptions = array( |
| 123 | 148 | 'fieldsperitem' => -1, # size of pairs |
| 124 | 149 | 'duplicates' => true, # allow same elements to appear |
| 125 | 150 | 'blanks' => false, # allow blank elements to appear |
| 126 | | - 'intervals' => true, # let 'num..num' be parsed as intervals |
| 127 | 151 | 'length' => -1, # length, default no limit |
| 128 | 152 | 'itemoutput' => null, # the format for each element |
| 129 | 153 | 'outputseparator' => null, # the separator between output elements |
| — | — | @@ -143,6 +167,15 @@ |
| 144 | 168 | $this->mFrame = $frame; |
| 145 | 169 | $this->mArgs = $args; |
| 146 | 170 | } |
| | 171 | + |
| | 172 | + /** |
| | 173 | + * Set whether to allow intervals |
| | 174 | + * |
| | 175 | + * @param $intervals Boolean |
| | 176 | + */ |
| | 177 | + public function setIntervals ( $intervals ) { |
| | 178 | + $this->mIntervals = $intervals; |
| | 179 | + } |
| 147 | 180 | |
| 148 | 181 | /** |
| 149 | 182 | * Return $this->mParams formatted as a list according to $this->mOptions |
| — | — | @@ -189,7 +222,7 @@ |
| 190 | 223 | foreach ( $args as $arg ) { |
| 191 | 224 | if ( !$this->mOptions['blanks'] && $arg === '' ) |
| 192 | 225 | continue; |
| 193 | | - self::parseArrayItem( $items, $arg, $separator, $this->mOptions['intervals'] ); |
| | 226 | + self::parseArrayItem( $items, $arg, $separator, $this->mIntervals ); |
| 194 | 227 | } |
| 195 | 228 | |
| 196 | 229 | # Remove the ignored elements from the array |
| — | — | @@ -205,11 +238,15 @@ |
| 206 | 239 | |
| 207 | 240 | # Remove anything over the set length, if set |
| 208 | 241 | if ( $this->mOptions['length'] != -1 |
| 209 | | - && count( $this->mParams ) > $this->mOptions['length'] ) |
| 210 | | - $this->mParams = array_slice( $this->mParams, 0, $this->mOptions['length'] ); |
| | 242 | + && count( $this->mParams ) > $this->mOptions['length'] ) { |
| | 243 | + while ( count( $this->mParams ) > $this->mOptions['length'] ) |
| | 244 | + array_pop ( $this->mParams ); |
| | 245 | + } |
| 211 | 246 | |
| 212 | 247 | # Remove anything over the allowed limit |
| 213 | | - $this->mParams = array_slice( $this->mParams, 0, $wgNllMaxListLength ); |
| | 248 | + while ( count( $this->mParams ) > $wgNllMaxListLength ) { |
| | 249 | + array_pop( $this->mParams ); |
| | 250 | + } |
| 214 | 251 | } |
| 215 | 252 | |
| 216 | 253 | /** |
| — | — | @@ -325,7 +362,6 @@ |
| 326 | 363 | switch ( $name = self::parseOptionName( $var ) ) { |
| 327 | 364 | case 'duplicates': |
| 328 | 365 | case 'blanks': |
| 329 | | - case 'intervals': |
| 330 | 366 | $this->mOptions[$name] = self::parseBoolean( $value ); |
| 331 | 367 | break; |
| 332 | 368 | case 'outputseparator': |
| — | — | @@ -369,7 +405,6 @@ |
| 370 | 406 | 'nll_fieldsperitem', 'nll_itemoutput', |
| 371 | 407 | 'nll_lastseparator', 'nll_outputseparator', |
| 372 | 408 | 'nll_ignore', 'nll_data', 'nll_length', |
| 373 | | - 'nll_intervals', |
| 374 | 409 | ) ); |
| 375 | 410 | } |
| 376 | 411 | |
| — | — | @@ -386,10 +421,10 @@ |
| 387 | 422 | * if so, then insert them into the $array, otherwise bail. |
| 388 | 423 | * |
| 389 | 424 | * @param $array Array The array with values. |
| | 425 | + * @param $value Mixed The element to be verified. |
| 390 | 426 | * @param $intervals Boolean Whether intervals are allowed. |
| 391 | | - * @param $value Mixed The element to be verified. |
| 392 | 427 | */ |
| 393 | | - private static function handle_interval ( &$array, $intervals, $value ) { |
| | 428 | + private static function handle_interval ( &$array, $value, $intervals ) { |
| 394 | 429 | global $wgNllMaxListLength; |
| 395 | 430 | if ( !$intervals ) |
| 396 | 431 | return false; |
| — | — | @@ -426,14 +461,14 @@ |
| 427 | 462 | # if no separator, just assume the value can be appended, |
| 428 | 463 | # simple as that |
| 429 | 464 | if ( $separator === null ) { |
| 430 | | - if ( ! self::handle_interval( $array, $intervals, $value ) ) |
| | 465 | + if ( ! self::handle_interval( $array, $value, $intervals ) ) |
| 431 | 466 | $array[] = $value; |
| 432 | 467 | } else { |
| 433 | 468 | # else, let's break the value up and append |
| 434 | 469 | # each 'subvalue' to the array. |
| 435 | 470 | $tmp = explode ( $separator, $value ); |
| 436 | 471 | foreach ( $tmp as $v ) { |
| 437 | | - if ( ! self::handle_interval( $array, $intervals, $v ) ) |
| | 472 | + if ( ! self::handle_interval( $array, $v, $intervals ) ) |
| 438 | 473 | $array[] = $v; |
| 439 | 474 | if ( count( $array ) > $wgNllMaxListLength ) |
| 440 | 475 | break; |