File tree Expand file tree Collapse file tree 2 files changed +11
-6
lines changed
Expand file tree Collapse file tree 2 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -712,7 +712,11 @@ function mb_strtolower($string)
712712
713713if (WARN_ABOUT_PHP_SETTINGS && !$ GLOBALS ['commandline ' ]) {
714714 if (strpos (getenv ('REQUEST_URI ' ), $ pageroot .'/admin ' ) !== 0 ) {
715- Warn ($ GLOBALS ['I18N ' ]->get ('The pageroot in your config does not match the current locationCheck your config file. ' ));
715+ Warn (s (
716+ 'The pageroot in your config "%s" does not match the current location "%s". Check your config file. ' ,
717+ $ pageroot ,
718+ strstr (getenv ('REQUEST_URI ' ), '/admin ' , true )
719+ ));
716720 }
717721}
718722clearstatcache ();
Original file line number Diff line number Diff line change 687687 $ attachment_repository = $ tmpdir ;
688688}
689689
690- if (!isset ($ pageroot )) {
690+ if (isset ($ pageroot )) {
691+ if ($ pageroot == '/ ' ) {
692+ $ pageroot = '' ;
693+ }
694+ } else {
691695 $ pageroot = '/lists ' ;
692- $ GLOBALS ['pageroot ' ] = '/lists ' ;
693696}
694- //# as the "admin" in adminpages is hardcoded, don't put it in the config file
697+ // as the "admin" in adminpages is hardcoded, don't put it in the config file
695698$ adminpages = $ GLOBALS ['pageroot ' ].'/admin ' ;
696- //# remove possibly duplicated // at the beginning
697- $ adminpages = preg_replace ('~^//~ ' , '/ ' , $ adminpages );
698699
699700$ GLOBALS ['homepage ' ] = 'home ' ;
700701
You can’t perform that action at this time.
0 commit comments