| Index: branches/REL1_17/phase3/maintenance/upgrade1_5.php |
| — | — | @@ -1307,4 +1307,4 @@ |
| 1308 | 1308 | } |
| 1309 | 1309 | |
| 1310 | 1310 | $maintClass = 'FiveUpgrade'; |
| 1311 | | -require( RUN_MAINTENANCE_IF_MAIN ); |
| | 1311 | +require_once( RUN_MAINTENANCE_IF_MAIN ); |
| Property changes on: branches/REL1_17/phase3/maintenance/upgrade1_5.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 1312 | 1312 | Merged /branches/new-installer/phase3/maintenance/upgrade1_5.php:r43664-66004 |
| 1313 | 1313 | Merged /branches/REL1_15/phase3/maintenance/upgrade1_5.php:r51646 |
| 1314 | 1314 | Merged /branches/sqlite/maintenance/upgrade1_5.php:r58211-58321 |
| 1315 | 1315 | Merged /trunk/phase3/maintenance/upgrade1_5.php:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81519,90835 |
| Index: branches/REL1_17/phase3/maintenance/rebuildImages.php |
| — | — | @@ -209,4 +209,4 @@ |
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | $maintClass = 'ImageBuilder'; |
| 213 | | -require( RUN_MAINTENANCE_IF_MAIN ); |
| | 213 | +require_once( RUN_MAINTENANCE_IF_MAIN ); |
| Property changes on: branches/REL1_17/phase3/maintenance/rebuildImages.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 214 | 214 | Merged /branches/new-installer/phase3/maintenance/rebuildImages.php:r43664-66004 |
| 215 | 215 | Merged /branches/REL1_15/phase3/maintenance/rebuildImages.php:r51646 |
| 216 | 216 | Merged /branches/sqlite/maintenance/rebuildImages.php:r58211-58321 |
| 217 | 217 | Merged /trunk/phase3/maintenance/rebuildImages.php:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81519,90835 |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -42,6 +42,8 @@ |
| 43 | 43 | * Fixed a bug in message transformation where the previous language could leak |
| 44 | 44 | into later transformations in the UI language. |
| 45 | 45 | * (bug 29091) Fix form of native name for Ossetic language (Иронау -> Ирон) |
| | 46 | +* Fixed maintenance scripts upgrade1_5.php and rebuildImages.php, they did not |
| | 47 | + work at all since 1.17 beta 1. |
| 46 | 48 | |
| 47 | 49 | === Changes since 1.17.0rc1 === |
| 48 | 50 | |