diff --git a/customcss.php b/customcss.php index 94956d2065..14a0b39f0f 100644 --- a/customcss.php +++ b/customcss.php @@ -2,8 +2,8 @@ ini_set('max_execution_time', 60); // 1 minute -require_once __DIR__ . '/config/servers.inc.php'; require_once __DIR__ . '/config/config.inc.php'; +require_once __DIR__ . '/config/servers.inc.php'; spl_autoload_register(function ($class) { require_once('lib/css-sanitizer/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php'); diff --git a/lib/ntbb-session.lib.php b/lib/ntbb-session.lib.php index 5b9c9c3026..7fa6502b91 100644 --- a/lib/ntbb-session.lib.php +++ b/lib/ntbb-session.lib.php @@ -1,7 +1,7 @@

- Play (insecure mode) + Play (insecure mode) - Play online + Play online

diff --git a/website/intro.php b/website/intro.php index dd112c16a6..45010bd0ea 100644 --- a/website/intro.php +++ b/website/intro.php @@ -1,5 +1,6 @@

- [Physical] Physical
- [Special] Special
+ [Physical] Physical
+ [Special] Special

In game and online, these icons will remind you of whether a move is Physical or Special. Remember that a Pokémon with high Attack and low Special Attack should usually be using only Physical moves, and vice versa. @@ -144,7 +145,7 @@

Set-up and phazing

- Because you're giving up an entire turn that could have been used attacking, most moves that do nothing but raise or lower stats are useless. The exception is boosting moves that can help set up a Pokémon to sweep. + Because you're giving up an entire turn that could have been used attacking, most moves that do nothing but raise or lower stats are useless. The exception is boosting moves that can help set up a Pokémon to sweep.

A sweep is the act of a Pokémon knocking out multiple opposing Pokémon in a row. Certain moves, such as Swords Dance, Dragon Dance, Shell Smash, and Calm Mind raise your Pokémon's attacking stats and Speed to the point where it could defeat all your opponent's remaining Pokémon that threaten it in one hit. @@ -172,7 +173,7 @@ Well, now you have a basic idea of how competitive battling works. If you'd like to dive straight in, play Pokémon Showdown! Our Random Battle format is great for learning the basics of competitive play.

- Play online + Play online

If you'd like more help, Smogon University offers a Battling 101 program, where you will be paired with a tutor. diff --git a/website/news/embed.php b/website/news/embed.php index 8d5b2c1580..b26a510c8a 100644 --- a/website/news/embed.php +++ b/website/news/embed.php @@ -2,6 +2,7 @@ // in theory this file is no longer used +include_once __DIR__ . '/../../config/config.inc.php'; include __DIR__ . '/../../config/news.inc.php'; function readableDate($time=0) { @@ -67,7 +68,7 @@ function readableDate($time=0) {

- — on Read more / comments + — on Read more / comments

was successfully changed!.

- Play online + Play online

- play.pokemonshowdown.com + .psim.us @@ -190,7 +191,7 @@ function saveservers() {

Owner:

- +

diff --git a/website/theme/wrapper.inc.php b/website/theme/wrapper.inc.php index 790c42bdc4..2b8ba9ac13 100644 --- a/website/theme/wrapper.inc.php +++ b/website/theme/wrapper.inc.php @@ -1,5 +1,7 @@ - + @@ -48,13 +50,13 @@ function ThemeHeaderTemplate() {
diff --git a/website/usermodlog.php b/website/usermodlog.php index a8bc4ce662..fe0a8ef864 100644 --- a/website/usermodlog.php +++ b/website/usermodlog.php @@ -4,6 +4,7 @@ ini_set('display_errors', TRUE); ini_set('display_startup_errors', TRUE); +include_once __DIR__ . '/../config/config.inc.php'; include '../lib/ntbb-session.lib.php'; include '../lib/ntbb-ladder.lib.php'; include 'lib/panels.lib.php'; @@ -30,7 +31,7 @@ if (substr($_SERVER['REQUEST_URI'], 0, 13) === '/users/?user=') { // really wish this could be done with mod_rewrite - header('Location: http://pokemonshowdown.com/users/'.$userid); + header('Location: http://' . $psconfig['routes']['users'] . '/' .$userid); die(); } diff --git a/website/users.php b/website/users.php index 81c3ac94b4..cbea0a6743 100644 --- a/website/users.php +++ b/website/users.php @@ -96,7 +96,7 @@ if (substr($_SERVER['REQUEST_URI'], 0, 13) === '/users/?user=') { // really wish this could be done with mod_rewrite - header('Location: https://pokemonshowdown.com/users/'.$userid); + header('Location: https://' . $psconfig['routes']['users'] . '/'.$userid); die(); } @@ -266,7 +266,7 @@ Use this link:

- https://pokemonshowdown.com/resetpassword/ + https:///resetpassword/