diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-06-17 18:43:05 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-06-17 18:43:05 +0200 |
| commit | db4ab58d92443348acbdf14ceaf2649338c2454f (patch) | |
| tree | d7d1032d18236128aed0dc7d32f3caa09963e955 /build | |
| parent | 6cb574d03c51556d4b476a56b90f07b2dfc55320 (diff) | |
| parent | ac2b5430aa2e4e75ed7b9372ae39024c22dac915 (diff) | |
| download | forums-db4ab58d92443348acbdf14ceaf2649338c2454f.tar forums-db4ab58d92443348acbdf14ceaf2649338c2454f.tar.gz forums-db4ab58d92443348acbdf14ceaf2649338c2454f.tar.bz2 forums-db4ab58d92443348acbdf14ceaf2649338c2454f.tar.xz forums-db4ab58d92443348acbdf14ceaf2649338c2454f.zip | |
Merge branch 'task/naderman/drop-subsilver2' into develop
* task/naderman/drop-subsilver2:
[task/drop-subsilver2] Removing subsilver2 for Ascraeus development.
Conflicts:
phpBB/styles/subsilver2/template/ucp_pm_message_footer.html
phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
Diffstat (limited to 'build')
| -rwxr-xr-x | build/build_diff.php | 12 | ||||
| -rw-r--r-- | build/build_helper.php | 9 |
2 files changed, 1 insertions, 20 deletions
diff --git a/build/build_diff.php b/build/build_diff.php index ef815bc0c3..5fc64e2f85 100755 --- a/build/build_diff.php +++ b/build/build_diff.php @@ -43,7 +43,6 @@ if (!$package_changed_files) run_command("mkdir $location/save/{$s_name}"); run_command("mkdir $location/save/{$s_name}/language"); run_command("mkdir $location/save/{$s_name}/prosilver"); - run_command("mkdir $location/save/{$s_name}/subsilver2"); } } @@ -52,7 +51,6 @@ if (!$package_changed_files) { build_code_changes('language'); build_code_changes('prosilver'); - build_code_changes('subsilver2'); } // Package code changes @@ -85,7 +83,7 @@ if (!$echo_changes) } /** -* $output_format can be: language, prosilver and subsilver2 +* $output_format can be: language or prosilver */ function build_code_changes($output_format) { @@ -120,7 +118,6 @@ function build_code_changes($output_format) $titles = array( 'language' => 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' Language Pack Changes', 'prosilver' => 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' prosilver Changes', - 'subsilver2' => 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' subsilver2 Changes', ); $data['header'] = array( @@ -183,13 +180,6 @@ These are the ' . $titles[$output_format] . ' summed up into a little Mod. These continue 2; } break; - - case 'subsilver2': - if (strpos($filename, 'styles/subsilver2/') !== 0) - { - continue 2; - } - break; } if (!file_exists($location . '/old_versions/' . $simple_name_old . '/' . $filename)) diff --git a/build/build_helper.php b/build/build_helper.php index 2bae32218b..1e5bd95880 100644 --- a/build/build_helper.php +++ b/build/build_helper.php @@ -142,15 +142,6 @@ class build_package ), 'store' => '', 'styles' => array( - 'subsilver2' => array( - 'imageset' => array( - 'en' => '', - ), - 'template' => '', - 'theme' => array( - 'images' => '', - ), - ), 'prosilver' => array( 'imageset' => array( 'en' => '', |