mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-27 13:40:28 +01:00
Code Issues Releases Wiki Activity
10,579 Commits 10 Branches 193 Tags
efedc973eb7442c004ed045f7f5f81e3f9ec2d4e
Commit Graph

71 Commits

Author SHA1 Message Date
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline 
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
 2010-11-11 19:10:55 +01:00
Nils Adermann
2e51e68ca1 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes.
  [ticket/9140] Check current board version in incremental update packages
  [ticket/9891] Updater drops language-selection after database-update
 2010-11-10 19:02:35 +01:00
Joas Schilling
4340e5a217 [ticket/9140] Check current board version in incremental update packages 
We need to use $this->current_version in this case instead of
$config['version']. Otherwise the message will be displayed after the database
got updated from database_update.php. Using PHPBB_VERSION from
includes/constants.php is not the right selection either, because than the
message is displayed after the files got updated and are checked one last time.

PHPBB3-9140
 2010-11-10 18:26:02 +01:00
Igor Wiedler
fccd7f0ab5 [feature/request-class] Convert any direct access to $_* to use $request 
PHPBB3-9716
 2010-09-25 20:32:15 +02:00
Gabriel Vazquez
2ba6360e43 [ticket/9140] Check current board version in incremental update packages 
Since we do not want to limit the updater functionality we only display
a prominent warning when the current board version does not match the
version the update files are meant to update from.

PHPBB3-9140
 2010-07-12 01:37:05 +02:00
Joas Schilling
d8b5594c14 [ticket/9119] Respect language selection on automated update. 
PHPBB3-9119
 2010-05-16 16:54:29 +02:00
Nils Adermann
47ce0f2a93 Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075] 
If you were trying to update from 3.0.5 to 3.0.6 but were presented with a dialogue
suggesting to merge the same file over and over take the install/install_update.php
from 3.0.7-RC2 or current svn, and replace your 3.0.5 one with it. It works fine in
3.0.5.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10528 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-23 23:35:48 +00:00
Andreas Fischer
f59a9221e9 Fix Bug #53965, Regression introduced in r9768 - Hardcode language for the time being. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10271 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-11-15 22:30:07 +00:00
Meik Sievertsen
d94da30c5d correctly execute database update step (detect if the version the admin wants to update to is greater than the current version even if phpbb.com says the current version is lower than the update version) which correctly updates the database for those who forgot to enable the PHPBB_QA constant for release candidates. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10218 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-10-09 11:59:54 +00:00
Meik Sievertsen
7a244e1d2b if preserve_cr is true and the file generated no conflict but is obviously not "empty" we tag it as modified because preserve_cr is the default mode for showing modifications (else the user gets a resolvable conflict and may wonder why ;)) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10167 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-20 16:18:41 +00:00
Meik Sievertsen
38c4bcad55 Ok, after 20+ hours i think i fixed all grave issues with the updater 
- smaller memory footprint
- better checks for already updated files
- even less conflicts
- fixed automatic conflict resolving after successful merges
- no more conflicts for $Id$ changes
- fixed skip_whitespace_changes bug where code blocks were added to diff_op_add whereby the previous or next diff_op_copy already had the change
- correctly display merged files in diff view (previously it happened that the old file was used for comparision, although the new file was different/newer/merged)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10163 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-18 18:18:54 +00:00
Andreas Fischer
e5fadfd42b Bugs #15809, #49215 - Allow updater to work correctly with PHP filename extensions other than .php. 
Related revisions: r9935, r9936

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9948 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-10 12:12:45 +00:00
Andreas Fischer
090ab9bf05 Bug #49215 again. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9936 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-07 12:50:25 +00:00
Andreas Fischer
8dcad17d1b Fix bug #49215 - Use $phpEx variable instead of hardcoded '.php' 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9935 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-07 12:10:34 +00:00
Andreas Fischer
ab9715a9fe Fix bugs #46615 & #46945 - Fail gracefully if store folder is not writable during update. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9768 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-07-17 11:32:27 +00:00
Meik Sievertsen
8037937eb8 late fix for #45335 (incorrect log message for update if using old updater) 
late fix committed because change does not effect update files or patch

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9517 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-05-19 11:19:06 +00:00
Meik Sievertsen
6c3532761b slight change for 3.0.5 for updating. 
- only return auth options having 2 or more columns (does not change the outcome, the script works fine)
- purge the theme after a successful update the easy way to let style.php do the job

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9510 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-05-06 08:38:30 +00:00
Meik Sievertsen
62973fa504 - adjust db_tools again to not remove any schema (they may be required) 
- fill dbms version if not yet filled

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9351 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-02-28 19:22:27 +00:00
Meik Sievertsen
fce20fd898 TortoiseMerge seems to mess up the newlines... very very annoying bug. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9254 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-01-13 10:55:04 +00:00
Meik Sievertsen
189e7cdf45 - Allow download of conflicting file for later reference in automatic updater 
- Default difference view is now 'inline' instead of 'side by side'
- Added new option for merging differences to conflicting files in automatic updater


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9252 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-01-12 16:58:47 +00:00
Meik Sievertsen
fe4a53b76e Help the user if FTP update fails. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9035 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-10-25 14:12:13 +00:00
Marek A. R
3a2f8753f6 PHP 5.3 compatibility. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8760 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-08-15 19:46:51 +00:00
Meik Sievertsen
325ff1fa1b One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.) 
Although i somehow mistakingly got #20445 and #15249 into it. :/

Removing s_watching_img from watch_topic_forum() function (Bug #20445)
Changing order for post review if more than one post affected (Bug #15249)
Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479)
Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738)
Tiny code fixes (Bug #20165, #20025, #19795, #14804)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8350 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-01-30 16:01:15 +00:00
Meik Sievertsen
983da62c50 seems like there is an error within the udpater, skipping the first file changed. This is not good(tm). For Gold, we will provide update packages for going from RC7 -> gold and RC8 -> gold. 
git-svn-id: file:///svn/phpbb/trunk@8276 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-12-12 16:18:56 +00:00
Meik Sievertsen
dd409913b5 lets start thinking about the future 
git-svn-id: file:///svn/phpbb/trunk@8249 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-11-19 17:00:34 +00:00
Meik Sievertsen
f08c01f099 erm... i am very very sorry... but i think this one is responsible for the loops people still experience. :o 
git-svn-id: file:///svn/phpbb/trunk@8196 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-15 17:27:22 +00:00
Meik Sievertsen
15dcba000d ok, fought #14735 with the help from paul. 
git-svn-id: file:///svn/phpbb/trunk@8189 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-14 21:26:07 +00:00
Meik Sievertsen
1fb304c5f2 more fixes... 
git-svn-id: file:///svn/phpbb/trunk@8183 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-14 15:46:44 +00:00
Meik Sievertsen
26cb825314 automatic updater supporting batch-processing diff 
git-svn-id: file:///svn/phpbb/trunk@8152 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-06 11:45:30 +00:00
Meik Sievertsen
92f554e38a deregister globals to install too 
git-svn-id: file:///svn/phpbb/trunk@8130 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-04 11:33:33 +00:00
Meik Sievertsen
484d214ef7 it has been decided amongst the team that using glob() is bad practice, after determining the overall usage among projects as well as the security history of the function. 
git-svn-id: file:///svn/phpbb/trunk@7900 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-17 16:08:42 +00:00
Meik Sievertsen
3585dbd42c a bunch of fixes 
git-svn-id: file:///svn/phpbb/trunk@7884 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-14 15:44:10 +00:00
Meik Sievertsen
2ba03a411e allow what is stated within the changelog... 
git-svn-id: file:///svn/phpbb/trunk@7874 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-12 13:02:29 +00:00
Meik Sievertsen
f27d0c466e basically what is listed within the changelog. ;) 
git-svn-id: file:///svn/phpbb/trunk@7872 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-12 07:08:21 +00:00
Meik Sievertsen
e5ae1698ca more failsafe "glob()" method. 
git-svn-id: file:///svn/phpbb/trunk@7863 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-10 17:36:59 +00:00
David M
49e78aa98c #13207 
git-svn-id: file:///svn/phpbb/trunk@7861 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-10 16:18:57 +00:00
David M
f75dd43d55 #13149 
git-svn-id: file:///svn/phpbb/trunk@7850 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-09 16:32:49 +00:00
Meik Sievertsen
179c77ccdd - do not include if there are no files fetched with glob() 
- allow options for merged files on update (merge, new file, old file)


git-svn-id: file:///svn/phpbb/trunk@7848 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-09 11:33:14 +00:00
Meik Sievertsen
bb7d2f7aad changes... 
git-svn-id: file:///svn/phpbb/trunk@7842 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-08 16:39:48 +00:00
Meik Sievertsen
6ca11b2d2b some fixes... most importantly the ability to update the board with the automatic files while having fsockopen disabled (instead, the update file information will be used, which may be inaccurate if the admin did a mistake). 
git-svn-id: file:///svn/phpbb/trunk@7818 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-01 16:09:50 +00:00
Meik Sievertsen
28521e5568 fixing bugs within the updater... 
git-svn-id: file:///svn/phpbb/trunk@7798 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-06-26 13:53:07 +00:00
Meik Sievertsen
fe7242f37c a tiny fix 
git-svn-id: file:///svn/phpbb/trunk@7771 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-06-17 08:24:10 +00:00
Meik Sievertsen
455536773f ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!) 
git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-06-09 11:11:20 +00:00
Nils Adermann
76c67b6b89 - bracket in wrong place there [Bug #11122] 
git-svn-id: file:///svn/phpbb/trunk@7626 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-17 22:21:29 +00:00
Meik Sievertsen
34fe17f758 so some version_compare magic. :o 
git-svn-id: file:///svn/phpbb/trunk@7621 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-17 16:33:52 +00:00
Meik Sievertsen
38e08367d2 label changes, language fixes... 
git-svn-id: file:///svn/phpbb/trunk@7608 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-16 14:45:13 +00:00
Meik Sievertsen
f7b51337c5 some language-specific adjustements 
fix prune users (adding the list of users to the confirmation page)
tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)


git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-03 14:29:22 +00:00
Meik Sievertsen
1d1b5e6446 some fixes... 
git-svn-id: file:///svn/phpbb/trunk@7266 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-04-02 15:47:23 +00:00
Meik Sievertsen
4ed8b3a62c ahhh, there are you. I can see a new haircut... looks good. 
git-svn-id: file:///svn/phpbb/trunk@7263 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-04-01 22:46:14 +00:00
Meik Sievertsen
3ff475bcbb some fixes... hopefully not breaking something. :o 
git-svn-id: file:///svn/phpbb/trunk@7216 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-03-22 15:15:20 +00:00