Permalink
Browse files

Merge branch 'prep-release-3.0.10'

* prep-release-3.0.10: (221 commits)
  [prep-release-3.0.10] Bumping version number for 3.0.10 final.
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
  [ticket/10531] Disallow deleting of the last style
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection
  [ticket/10319] Missing hidden fields in search form
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.
  [ticket/10480] Add a build target for changelog building.
  [ticket/10480] Add a build script for exporting the changelog from tracker.
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
  [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
  [ticket/10501] Fix description of table prefixes
  [ticket/10503] Debug error "Invalid arguments" when previewing edits
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.
  [ticket/10461] Add a comment explaining the logic here.
  ...
  • Loading branch information...
2 parents c8da5ad + e14c3f3 commit 2345be38b682a58f9b5e5429c76db97a0564093d @bantu bantu committed Jan 2, 2012
Showing with 2,284 additions and 3,144 deletions.
  1. +11 −11 .gitignore
  2. +35 −15 build/build.xml
  3. +53 −0 build/build_changelog.php
  4. +2 −2 phpBB/adm/style/acp_icons.html
  5. +30 −0 phpBB/adm/style/acp_main.html
  6. +1 −1 phpBB/adm/style/acp_ranks.html
  7. +1 −1 phpBB/adm/style/acp_users.html
  8. +2 −3 phpBB/adm/style/acp_users_signature.html
  9. +3 −5 phpBB/adm/style/admin.css
  10. +24 −17 phpBB/develop/create_schema_files.php
  11. +155 −18 phpBB/docs/CHANGELOG.html
  12. +2 −2 phpBB/docs/INSTALL.html
  13. +1 −1 phpBB/docs/README.html
  14. +21 −73 phpBB/docs/coding-guidelines.html
  15. +8 −23 phpBB/feed.php
  16. +29 −5 phpBB/includes/acp/acp_ban.php
  17. +1 −1 phpBB/includes/acp/acp_board.php
  18. +6 −3 phpBB/includes/acp/acp_database.php
  19. +4 −6 phpBB/includes/acp/acp_email.php
  20. +3 −7 phpBB/includes/acp/acp_forums.php
  21. +3 −9 phpBB/includes/acp/acp_inactive.php
  22. +8 −1 phpBB/includes/acp/acp_language.php
  23. +2 −2 phpBB/includes/acp/acp_logs.php
  24. +13 −5 phpBB/includes/acp/acp_main.php
  25. +8 −0 phpBB/includes/acp/acp_php_info.php
  26. +1 −1 phpBB/includes/acp/acp_ranks.php
  27. +16 −2 phpBB/includes/acp/acp_styles.php
  28. +3 −6 phpBB/includes/acp/acp_update.php
  29. +4 −10 phpBB/includes/acp/acp_users.php
  30. +8 −0 phpBB/includes/auth.php
  31. +10 −1 phpBB/includes/auth/auth_db.php
  32. +7 −0 phpBB/includes/bbcode.php
  33. +1 −1 phpBB/includes/constants.php
  34. +120 −79 phpBB/includes/db/db_tools.php
  35. +1 −1 phpBB/includes/db/dbal.php
  36. +1 −1 phpBB/includes/db/mssqlnative.php
  37. +30 −5 phpBB/includes/db/mysqli.php
  38. +7 −5 phpBB/includes/error_collector.php
  39. +145 −57 phpBB/includes/functions.php
  40. +48 −16 phpBB/includes/functions_admin.php
  41. +1 −1 phpBB/includes/functions_content.php
  42. +102 −42 phpBB/includes/functions_display.php
  43. +8 −49 phpBB/includes/functions_install.php
  44. +37 −5 phpBB/includes/functions_messenger.php
  45. +4 −4 phpBB/includes/functions_posting.php
  46. +5 −4 phpBB/includes/functions_privmsgs.php
  47. +44 −11 phpBB/includes/functions_transfer.php
  48. +2 −2 phpBB/includes/mcp/mcp_logs.php
  49. +8 −9 phpBB/includes/mcp/mcp_main.php
  50. +1 −1 phpBB/includes/mcp/mcp_notes.php
  51. +1 −1 phpBB/includes/mcp/mcp_post.php
  52. +3 −0 phpBB/includes/mcp/mcp_queue.php
  53. +1 −0 phpBB/includes/mcp/mcp_reports.php
  54. +2 −2 phpBB/includes/mcp/mcp_topic.php
  55. +33 −0 phpBB/includes/session.php
  56. +2 −2 phpBB/includes/startup.php
  57. +1 −4 phpBB/includes/ucp/ucp_activate.php
  58. +24 −28 phpBB/includes/ucp/ucp_groups.php
  59. +1 −1 phpBB/includes/ucp/ucp_pm.php
  60. +1 −1 phpBB/includes/ucp/ucp_pm_viewmessage.php
  61. +7 −10 phpBB/includes/ucp/ucp_profile.php
  62. +3 −6 phpBB/includes/ucp/ucp_register.php
  63. +2 −8 phpBB/includes/ucp/ucp_resend.php
  64. +12 −4 phpBB/index.php
  65. +4 −4 phpBB/install/convertors/convert_phpbb20.php
  66. +32 −2,239 phpBB/install/database_update.php
  67. +9 −12 phpBB/install/install_convert.php
  68. +7 −5 phpBB/install/install_install.php
  69. +4 −3 phpBB/install/schemas/firebird_schema.sql
  70. +6 −4 phpBB/install/schemas/mssql_schema.sql
  71. +4 −3 phpBB/install/schemas/mysql_40_schema.sql
  72. +4 −3 phpBB/install/schemas/mysql_41_schema.sql
  73. +6 −4 phpBB/install/schemas/oracle_schema.sql
  74. +6 −4 phpBB/install/schemas/postgres_schema.sql
  75. +2 −1 phpBB/install/schemas/schema_data.sql
  76. +4 −3 phpBB/install/schemas/sqlite_schema.sql
  77. +3 −0 phpBB/language/en/acp/ban.php
  78. +2 −2 phpBB/language/en/acp/board.php
  79. +10 −0 phpBB/language/en/acp/common.php
  80. +1 −0 phpBB/language/en/acp/database.php
  81. +1 −1 phpBB/language/en/acp/forums.php
  82. +1 −0 phpBB/language/en/acp/language.php
  83. +10 −0 phpBB/language/en/common.php
  84. +1 −1 phpBB/language/en/email/admin_welcome_activated.txt
  85. +1 −1 phpBB/language/en/email/privmsg_notify.txt
  86. +1 −1 phpBB/language/en/help_faq.php
  87. +4 −2 phpBB/language/en/install.php
  88. +2 −2 phpBB/language/en/posting.php
  89. +3 −0 phpBB/language/en/ucp.php
  90. +29 −14 phpBB/memberlist.php
  91. +20 −2 phpBB/posting.php
  92. +7 −0 phpBB/report.php
  93. +1 −1 phpBB/styles/prosilver/imageset/imageset.cfg
  94. +1 −1 phpBB/styles/prosilver/style.cfg
  95. +7 −4 phpBB/styles/prosilver/template/editor.js
  96. +1 −1 phpBB/styles/prosilver/template/forum_fn.js
  97. +1 −1 phpBB/styles/prosilver/template/jumpbox.html
  98. +1 −1 phpBB/styles/prosilver/template/mcp_approve.html
  99. +0 −1 phpBB/styles/prosilver/template/mcp_front.html
  100. +1 −1 phpBB/styles/prosilver/template/mcp_notes_user.html
  101. +1 −0 phpBB/styles/prosilver/template/mcp_post.html
  102. +5 −28 phpBB/styles/prosilver/template/memberlist_body.html
  103. +3 −3 phpBB/styles/prosilver/template/memberlist_view.html
  104. +10 −2 phpBB/styles/prosilver/template/message_body.html
  105. +2 −2 phpBB/styles/prosilver/template/overall_header.html
  106. +2 −2 phpBB/styles/prosilver/template/posting_buttons.html
  107. +1 −1 phpBB/styles/prosilver/template/template.cfg
  108. +8 −1 phpBB/styles/prosilver/template/ucp_groups_manage.html
  109. +46 −109 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
  110. +4 −7 phpBB/styles/prosilver/template/viewtopic_body.html
  111. +2 −2 phpBB/styles/prosilver/theme/bidi.css
  112. +1 −1 phpBB/styles/prosilver/theme/buttons.css
  113. +1 −1 phpBB/styles/prosilver/theme/common.css
  114. +1 −1 phpBB/styles/prosilver/theme/content.css
  115. +1 −1 phpBB/styles/prosilver/theme/cp.css
  116. +2 −1 phpBB/styles/prosilver/theme/forms.css
  117. +1 −1 phpBB/styles/prosilver/theme/links.css
  118. +2 −7 phpBB/styles/prosilver/theme/print.css
  119. +5 −7 phpBB/styles/prosilver/theme/stylesheet.css
  120. +1 −1 phpBB/styles/prosilver/theme/theme.cfg
  121. +1 −1 phpBB/styles/prosilver/theme/tweaks.css
  122. +1 −1 phpBB/styles/subsilver2/imageset/imageset.cfg
  123. +1 −1 phpBB/styles/subsilver2/style.cfg
  124. +1 −1 phpBB/styles/subsilver2/template/attachment.html
  125. +7 −4 phpBB/styles/subsilver2/template/editor.js
  126. +6 −1 phpBB/styles/subsilver2/template/memberlist_body.html
  127. +4 −4 phpBB/styles/subsilver2/template/memberlist_view.html
  128. +2 −3 phpBB/styles/subsilver2/template/posting_buttons.html
  129. +1 −1 phpBB/styles/subsilver2/template/template.cfg
  130. +1 −1 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
  131. +5 −10 phpBB/styles/subsilver2/theme/stylesheet.css
  132. +1 −1 phpBB/styles/subsilver2/theme/theme.cfg
  133. +6 −0 phpBB/ucp.php
  134. +21 −3 phpBB/viewforum.php
  135. +27 −10 phpBB/viewtopic.php
  136. +55 −0 tests/dbal/cross_join_test.php
  137. +86 −0 tests/dbal/db_tools_test.php
  138. +59 −0 tests/dbal/fixtures/massmail_crossjoin.xml
  139. +16 −0 tests/dbal/fixtures/three_users.xml
  140. +17 −1 tests/dbal/select_test.php
  141. +35 −0 tests/error_collector_test.php
  142. +22 −0 tests/mock/cache.php
  143. +16 −0 tests/mock_user.php
  144. +63 −0 tests/network/ftp_fsock_pasv_epsv_test.php
  145. +1 −1 tests/profile/custom_test.php
  146. +35 −0 tests/regex/table_prefix_test.php
  147. +51 −0 tests/session/append_sid_test.php
  148. +16 −0 tests/session/fixtures/sessions_empty.xml
  149. +16 −0 tests/session/fixtures/sessions_full.xml
  150. +3 −2 tests/template/template_test.php
  151. +5 −0 tests/test_framework/phpbb_database_test_connection_manager.php
  152. +85 −0 tests/text_processing/censor_text_test.php
  153. 0 tests/{utf/data → tmp}/.gitkeep
  154. +9 −6 tests/utf/normalizer_test.php
  155. +49 −0 tests/wrapper/gmgetdate_test.php
  156. +1 −1 tests/{random/mt_rand.php → wrapper/mt_rand_test.php}
  157. +130 −0 tests/wrapper/version_compare_test.php
View
@@ -1,12 +1,12 @@
*~
-phpunit.xml
-phpBB/cache/*.php
-phpBB/cache/queue.php.lock
-phpBB/config.php
-phpBB/files/*
-phpBB/images/avatars/gallery/*
-phpBB/images/avatars/upload/*
-phpBB/store/*
-tests/phpbb_unit_tests.sqlite2
-tests/test_config.php
-tests/utf/data/*.txt
+/phpunit.xml
+/phpBB/cache/*.php
+/phpBB/cache/queue.php.lock
+/phpBB/config.php
+/phpBB/files/*
+/phpBB/images/avatars/gallery/*
+/phpBB/images/avatars/upload/*
+/phpBB/store/*
+/tests/phpbb_unit_tests.sqlite2
+/tests/test_config.php
+/tests/tmp/*
View
@@ -2,9 +2,9 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
- <property name="newversion" value="3.0.9" />
- <property name="prevversion" value="3.0.8" />
- <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.9-RC1, 3.0.9-RC2, 3.0.9-RC3, 3.0.9-RC4" />
+ <property name="newversion" value="3.0.10" />
+ <property name="prevversion" value="3.0.9" />
+ <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.10-RC1, 3.0.10-RC2, 3.0.10-RC3" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -49,19 +49,16 @@
--coverage-clover build/logs/clover.xml
--coverage-html build/coverage"
passthru="true" />
+ </target>
-
- <!-- Does not allow changing the working directory to tests/
- so this approach does not work for us unfortunately
- <phpunit codecoverage="true" haltonfailure="true">
- <formatter todir="build/logs" type="xml"/>
- <batchtest>
- <fileset dir="tests">
- <include name="all_tests.php"/>
- </fileset>
- </batchtest>
- </phpunit>
- -->
+ <target name="test-slow" depends="clean,prepare">
+ <exec dir="."
+ command="phpunit --log-junit build/logs/phpunit.xml
+ --configuration phpunit.xml.all
+ --group slow
+ --coverage-clover build/logs/clover-slow.xml
+ --coverage-html build/coverage-slow"
+ passthru="true" />
</target>
<target name="docs">
@@ -122,6 +119,29 @@
<target name="create-package" depends="prepare-new-version,old-version-diffs">
<exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" />
<exec dir="build" command="php -f build_diff.php '${prevversion}' '${newversion}' > logs/build_diff.log" escape="false" />
+
+ <exec dir="build" escape="false"
+ command="diff -crNEBwd old_versions/release-${prevversion}/language new_version/phpBB3/language >
+ save/save_${prevversion}_to_${newversion}/language/phpbb-${prevversion}_to_${newversion}_language.patch" />
+ <exec dir="build" escape="false"
+ command="diff -crNEBwd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
+ save/save_${prevversion}_to_${newversion}/prosilver/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/save_${prevversion}_to_${newversion}/subsilver2/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />
+
+ <exec dir="build" escape="false"
+ command="git shortlog --summary --numbered release-${prevversion}...HEAD >
+ save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_shortlog.txt" />
+ <exec dir="build" escape="false"
+ command="git diff --stat release-${prevversion}...HEAD >
+ save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_diffstat.txt" />
+ </target>
+
+ <target name="changelog" depends="prepare">
+ <exec dir="build" escape="false"
+ command="php -f build_changelog.php '${newversion}' >
+ save/changelog_${newversion}.html" />
</target>
<!--
@@ -0,0 +1,53 @@
+#!/usr/bin/env php
+<?php
+/**
+*
+* @package build
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU General Public License
+*
+*/
+
+if ($_SERVER['argc'] != 2)
+{
+ echo "Please specify the new version as argument (e.g. build_changelog.php '1.0.2').\n";
+ exit(1);
+}
+
+$fixVersion = $_SERVER['argv'][1];
+
+$query = 'project = PHPBB3
+ AND resolution = Fixed
+ AND fixVersion = "' . $fixVersion . '"
+ AND status IN ("Unverified Fix", Closed)';
+
+$url = 'http://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000';
+$xml = simplexml_load_string(file_get_contents($url));
+
+foreach ($xml->xpath('//item') as $item)
+{
+ $key = (string) $item->key;
+
+ $keyUrl = 'http://tracker.phpbb.com/browse/' . $key;
+ $keyLink = '<a href="' . $keyUrl . '">' . $key . '</a>';
+
+ $value = str_replace($key, $keyLink, htmlspecialchars($item->title));
+ $value = str_replace(']', '] -', $value);
+
+ $types[(string) $item->type][$key] = $value;
+}
+
+ksort($types);
+foreach ($types as $type => $tickets)
+{
+ echo "<h4>$type</h4>\n";
+ echo "<ul>\n";
+
+ uksort($tickets, 'strnatcasecmp');
+
+ foreach ($tickets as $ticket)
+ {
+ echo "<li>$ticket</li>\n";
+ }
+ echo "</ul>\n";
+}
@@ -74,7 +74,7 @@
<fieldset class="tabulated">
<legend>{L_TITLE}</legend>
- <table cellspacing="1">
+ <table cellspacing="1" id="smilies">
<thead>
<tr>
<th colspan="{COLSPAN}">{L_CONFIG}</th>
@@ -94,7 +94,7 @@
<td>{L_ORDER}</td>
<!-- ENDIF -->
<!-- IF S_ADD -->
- <td>{L_ADD}</td>
+ <td>{L_ADD} <a href="#" onclick="marklist('smilies', 'add_img', true); return false;">({L_MARK_ALL})</a></td>
<!-- ENDIF -->
</tr>
</thead>
@@ -34,6 +34,36 @@
</div>
<!-- ENDIF -->
+ <!-- IF S_MBSTRING_LOADED -->
+ <!-- IF S_MBSTRING_FUNC_OVERLOAD_FAIL -->
+ <div class="errorbox">
+ <h3>{L_ERROR_MBSTRING_FUNC_OVERLOAD}</h3>
+ <p>{L_ERROR_MBSTRING_FUNC_OVERLOAD_EXPLAIN}</p>
+ </div>
+ <!-- ENDIF -->
+
+ <!-- IF S_MBSTRING_ENCODING_TRANSLATION_FAIL -->
+ <div class="errorbox">
+ <h3>{L_ERROR_MBSTRING_ENCODING_TRANSLATION}</h3>
+ <p>{L_ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN}</p>
+ </div>
+ <!-- ENDIF -->
+
+ <!-- IF S_MBSTRING_HTTP_INPUT_FAIL -->
+ <div class="errorbox">
+ <h3>{L_ERROR_MBSTRING_HTTP_INPUT}</h3>
+ <p>{L_ERROR_MBSTRING_HTTP_INPUT_EXPLAIN}</p>
+ </div>
+ <!-- ENDIF -->
+
+ <!-- IF S_MBSTRING_HTTP_OUTPUT_FAIL -->
+ <div class="errorbox">
+ <h3>{L_ERROR_MBSTRING_HTTP_OUTPUT}</h3>
+ <p>{L_ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN}</p>
+ </div>
+ <!-- ENDIF -->
+ <!-- ENDIF -->
+
<!-- IF S_WRITABLE_CONFIG -->
<div class="errorbox notice">
<p>{L_WRITABLE_CONFIG}</p>
@@ -35,7 +35,7 @@
</dl>
<dl>
<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
- <dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
+ <dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
<label><input onclick="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
</dl>
<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
@@ -13,7 +13,7 @@
<fieldset>
<legend>{L_SELECT_USER}</legend>
<dl>
- <dt><label for="username">{L_FIND_USERNAME}:</label></dt>
+ <dt><label for="username">{L_ENTER_USERNAME}:</label></dt>
<dd><input class="text medium" type="text" id="username" name="username" /></dd>
<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
@@ -22,9 +22,8 @@
w: '{LA_BBCODE_W_HELP}',
s: '{LA_BBCODE_S_HELP}',
f: '{LA_BBCODE_F_HELP}',
- e: '{LA_BBCODE_E_HELP}',
+ y: '{LA_BBCODE_Y_HELP}',
d: '{LA_BBCODE_D_HELP}',
- t: '{LA_BBCODE_T_HELP}',
tip: '{L_STYLES_TIP}'
<!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
@@ -56,7 +55,7 @@
<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
- <input type="button" class="button2" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
+ <input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('y')" onmouseout="helpline('tip')" />
<!-- IF S_BBCODE_IMG -->
<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
<!-- ENDIF -->
@@ -899,24 +899,22 @@ html>body dd label input { vertical-align: text-bottom;} /* Tweak for Moz to ali
dd input {
font-size: 1.00em;
max-width: 100%;
+ margin: 2px 0;
}
dd select {
font-size: 100%;
+ font-size: 1em;
width: auto;
max-width: 100%;
+ margin: 2px 0;
}
dd textarea {
font-size: 0.90em;
width: 90%;
}
-dd select {
- width: auto;
- font-size: 1.00em;
-}
-
fieldset dl {
margin-bottom: 10px;
font-size: 0.85em;
@@ -12,11 +12,7 @@
* If you overwrite the original schema files please make sure you save the file with UNIX linefeeds.
*/
-die("Please read the first lines of this script for instructions on how to enable it");
-
-@set_time_limit(0);
-
-$schema_path = './../install/schemas/';
+$schema_path = dirname(__FILE__) . '/../install/schemas/';
if (!is_writable($schema_path))
{
@@ -242,7 +238,7 @@
foreach ($supported_dbms as $dbms)
{
- $fp = fopen($schema_path . '_' . $dbms . '_schema.sql', 'wt');
+ $fp = fopen($schema_path . $dbms . '_schema.sql', 'wt');
$line = '';
@@ -251,32 +247,43 @@
{
case 'mysql_40':
case 'mysql_41':
- $line = "#\n# \$I" . "d: $\n#\n\n";
+ case 'firebird':
+ case 'sqlite':
+ fwrite($fp, "# DO NOT EDIT THIS FILE, IT IS GENERATED\n");
+ fwrite($fp, "#\n");
+ fwrite($fp, "# To change the contents of this file, edit\n");
+ fwrite($fp, "# phpBB/develop/create_schema_files.php and\n");
+ fwrite($fp, "# run it.\n");
break;
+ case 'mssql':
+ case 'oracle':
+ case 'postgres':
+ fwrite($fp, "/*\n");
+ fwrite($fp, " * DO NOT EDIT THIS FILE, IT IS GENERATED\n");
+ fwrite($fp, " *\n");
+ fwrite($fp, " * To change the contents of this file, edit\n");
+ fwrite($fp, " * phpBB/develop/create_schema_files.php and\n");
+ fwrite($fp, " * run it.\n");
+ fwrite($fp, " */\n\n");
+ break;
+ }
+
+ switch ($dbms)
+ {
case 'firebird':
- $line = "#\n# \$I" . "d: $\n#\n\n";
$line .= custom_data('firebird') . "\n";
break;
case 'sqlite':
- $line = "#\n# \$I" . "d: $\n#\n\n";
$line .= "BEGIN TRANSACTION;\n\n";
break;
- case 'mssql':
- $line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
- // no need to do this, no transaction support for schema changes
- //$line .= "BEGIN TRANSACTION\nGO\n\n";
- break;
-
case 'oracle':
- $line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
$line .= custom_data('oracle') . "\n";
break;
case 'postgres':
- $line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
$line .= "BEGIN;\n\n";
$line .= custom_data('postgres') . "\n";
break;
Oops, something went wrong.

0 comments on commit 2345be3

Please sign in to comment.