| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -277,22 +277,6 @@ |
| 278 | 278 | * Start the PHP session. This may be called before execute() to start the PHP session. |
| 279 | 279 | */ |
| 280 | 280 | public function startSession() { |
| 281 | | - $sessPath = $this->getSessionSavePath(); |
| 282 | | - |
| 283 | | - if( $sessPath != '' ) { |
| 284 | | - if( strval( ini_get( 'open_basedir' ) ) != '' ) { |
| 285 | | - // we need to skip the following check when open_basedir is on. |
| 286 | | - // The session path probably *wont* be writable by the current |
| 287 | | - // user, and telling them to change it is bad. Bug 23021. |
| 288 | | - } elseif( !is_dir( $sessPath ) || !is_writeable( $sessPath ) ) { |
| 289 | | - $this->showError( 'config-session-path-bad', $sessPath ); |
| 290 | | - return false; |
| 291 | | - } |
| 292 | | - } else { |
| 293 | | - // If the path is unset it'll default to some system bit, which *probably* is ok... |
| 294 | | - // not sure how to actually get what will be used. |
| 295 | | - } |
| 296 | | - |
| 297 | 281 | if( wfIniGetBool( 'session.auto_start' ) || session_id() ) { |
| 298 | 282 | // Done already |
| 299 | 283 | return true; |
| — | — | @@ -312,23 +296,6 @@ |
| 313 | 297 | } |
| 314 | 298 | |
| 315 | 299 | /** |
| 316 | | - * Get the value of session.save_path |
| 317 | | - * |
| 318 | | - * Per http://www.php.net/manual/en/session.configuration.php#ini.session.save-path, |
| 319 | | - * this may have an initial integer value to indicate the depth of session |
| 320 | | - * storage (eg /tmp/a/b/c). Explode on ; and check and see if this part is |
| 321 | | - * there or not. Should also allow paths with semicolons in them (if you |
| 322 | | - * really wanted your session files stored in /tmp/some;dir) which PHP |
| 323 | | - * supposedly supports. |
| 324 | | - * |
| 325 | | - * @return String |
| 326 | | - */ |
| 327 | | - private function getSessionSavePath() { |
| 328 | | - $parts = explode( ';', ini_get( 'session.save_path' ), 2 ); |
| 329 | | - return count( $parts ) == 1 ? $parts[0] : $parts[1]; |
| 330 | | - } |
| 331 | | - |
| 332 | | - /** |
| 333 | 300 | * Get a hash of data identifying this MW installation. |
| 334 | 301 | * |
| 335 | 302 | * This is used by config/index.php to prevent multiple installations of MW |
| Index: trunk/phase3/includes/installer/Installer.i18n.php |
| — | — | @@ -38,7 +38,6 @@ |
| 39 | 39 | Restart the installation process.', |
| 40 | 40 | 'config-no-session' => 'Your session data was lost! |
| 41 | 41 | Check your php.ini and make sure <code>session.save_path</code> is set to an appropriate directory.', |
| 42 | | - 'config-session-path-bad' => 'Your <code>session.save_path</code> (<code>$1</code>) seems to be invalid or unwritable.', |
| 43 | 42 | 'config-your-language' => 'Your language:', |
| 44 | 43 | 'config-your-language-help' => 'Select a language to use during the installation process.', |
| 45 | 44 | 'config-wiki-language' => 'Wiki language:', |