| Index: trunk/phase3/maintenance/hiphop/run-server |
| — | — | @@ -41,6 +41,7 @@ |
| 42 | 42 | '-c', "$thisDir/server.conf", |
| 43 | 43 | '-v', "Server.SourceRoot=$sourceBase", |
| 44 | 44 | '-v', "Server.IncludeSearchPaths.0=$sourceBase", |
| | 45 | + '-v', 'ServerVariables.MW_COMPILED=1', |
| 45 | 46 | '--mode=server', |
| 46 | 47 | '--port=8080' |
| 47 | 48 | ), |
| — | — | @@ -55,6 +56,8 @@ |
| 56 | 57 | $sourceBase = realpath( "$IP/.." ); |
| 57 | 58 | |
| 58 | 59 | passthru( |
| | 60 | + 'cd ' . wfEscapeShellArg( $sourceBase ) . " && " . |
| | 61 | + 'MW_INSTALL_PATH=' . wfEscapeShellArg( $IP ) . ' ' . |
| 59 | 62 | wfEscapeShellArg( |
| 60 | 63 | 'hphpi', |
| 61 | 64 | '-c', "$thisDir/server.conf", |
| Index: trunk/phase3/maintenance/hiphop/server.conf |
| — | — | @@ -15,9 +15,6 @@ |
| 16 | 16 | EnableStaticContentFromDisk = false |
| 17 | 17 | AlwaysUseRelativePath = true |
| 18 | 18 | } |
| 19 | | -ServerVariables { |
| 20 | | - MW_COMPILED = 1 |
| 21 | | -} |
| 22 | 19 | VirtualHost { |
| 23 | 20 | * { |
| 24 | 21 | ServerName = localhost |
| — | — | @@ -26,8 +23,8 @@ |
| 27 | 24 | * { |
| 28 | 25 | pattern = ^/wiki/(.*)$ |
| 29 | 26 | to = /phase3/index.php?title=$1 |
| | 27 | + qsa = true |
| 30 | 28 | } |
| 31 | 29 | } |
| 32 | 30 | } |
| 33 | 31 | } |
| 34 | | - |
| Index: trunk/phase3/includes/actions/PurgeAction.php |
| — | — | @@ -57,7 +57,7 @@ |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
| 61 | | - * purge is slightly wierd because it can be either formed or formless depending |
| | 61 | + * purge is slightly weird because it can be either formed or formless depending |
| 62 | 62 | * on user permissions |
| 63 | 63 | */ |
| 64 | 64 | public function show() { |