Skip to content

Commit

Permalink
[ticket/12958] Remove more references of subsilver2
Browse files Browse the repository at this point in the history
PHPBB3-12958
  • Loading branch information
nickvergessen committed Aug 10, 2014
1 parent 8c40574 commit 59780bb
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 144 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
/phpBB/store/*
/phpBB/styles/*
!/phpBB/styles/prosilver
!/phpBB/styles/subsilver2
/phpBB/vendor
/tests/phpbb_unit_tests.sqlite*
/tests/test_config*.php
Expand Down
3 changes: 0 additions & 3 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,6 @@
<exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />
<exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/styles/subsilver2 new_version/phpBB3/styles/subsilver2 >
save/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />

<exec dir="build" escape="false"
command="git shortlog --summary --numbered release-${prevversion}...HEAD >
Expand Down
8 changes: 0 additions & 8 deletions build/package.php
Original file line number Diff line number Diff line change
Expand Up @@ -469,22 +469,14 @@
// $package->run_command('rm -v database_update.php');
$package->run_command('rm -v install_update.php');

chdir($package->get('dest_dir'));
$package->run_command('mv -v styles/subsilver2 ../subsilver2');
$package->run_command('cp -p docs/COPYING ../subsilver2/license.txt');

chdir($package->locations['package_dir']);
foreach ($compress_programs as $extension => $compress_command)
{
$package->begin_status('Packaging phpBB for ' . $extension);
$package->run_command('rm -v ./release_files/' . $package->get('release_filename') . ".{$extension}");
$package->run_command('rm -v ./release_files/subsilver2_' . $package->get('new_version_number') . ".{$extension}");

// Build Package
$package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name'));

// Build subSilver2 Package
$package->run_command("$compress_command ./release_files/subsilver2_" . $package->get('new_version_number') . '.' . $extension . ' subsilver2');
}

// Microsoft Web PI packaging
Expand Down
2 changes: 1 addition & 1 deletion phpBB/develop/imageset_to_css.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

$phpbb_root_path = '../';
$style = 'subsilver2';
$style = 'prosilver';

$imageset_path = $phpbb_root_path . 'styles/' . $style . '/imageset';
$theme_path = $phpbb_root_path . 'styles/' . $style . '/theme';
Expand Down
2 changes: 1 addition & 1 deletion phpBB/docs/INSTALL.html
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ <h4>Advanced settings</h4>

<p>If you have non-English language packs installed, you may want to see if a new version has been made available. A number of missing strings may have been added which, though not essential, may be beneficial to users. Please note that at this time not all language packs have been updated so you should be prepared to periodically check for updates.</p>

<p>These update methods will only update the standard styles, <code>prosilver</code> and <code>subsilver2</code>, any other styles you have installed for your board will usually also need to be updated.</p>
<p>These update methods will only update the standard style <code>prosilver</code>, any other styles you have installed for your board will usually also need to be updated.</p>

</div>

Expand Down
Loading

0 comments on commit 59780bb

Please sign in to comment.