mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
15,737 Commits 17 Branches 190 Tags
Commit Graph

13 Commits

Author SHA1 Message Date
Oleg Pudeyev
26fd70d9cd Merge remote-tracking branch 'upstream/develop' into ticket/11015 
* upstream/develop: (196 commits)
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [ticket/10716] Collect standard error from executed php process.
  [ticket/10716] Skip test if php is not in PATH.
  [ticket/10716] Exclude our dependencies from linting.
  [ticket/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [ticket/10103] Assert with messages.
  [ticket/10103] assertLessThan/assertGreaterThan.
  [ticket/10103] Inline assignment is bad?
  [ticket/10103] $rv had too few characters.
  [ticket/10103] Correct flock class documentation.
  ...

Conflicts:
	phpBB/includes/functions.php
	tests/cache/cache_test.php
 2012-12-06 21:49:24 -05:00
Oleg Pudeyev
a8d02ffc27 [ticket/11247] Fix wrong property reference in flock class. 
PHPBB3-11247
 2012-12-05 01:54:29 -05:00
Oleg Pudeyev
3e093c282a [ticket/10103] New and improved wording. 
PHPBB3-10103
 2012-12-04 14:05:49 -05:00
Oleg Pudeyev
4cc81f1ffa [ticket/10103] Correct flock class documentation. 
PHPBB3-10103
 2012-12-04 13:44:22 -05:00
Oleg Pudeyev
3687febdac [ticket/11015] Change more docblocks. 
PHPBB3-11015
 2012-12-04 04:29:31 -05:00
Oleg Pudeyev
f08c28c77a [ticket/10103] Factor out flock lock class. 
PHPBB3-10103
 2012-12-04 02:00:10 -05:00
Oleg Pudeyev
ec4343c744 [ticket/11227] @return void -> @return null, per coding guidelines. 
PHPBB3-11227
 2012-11-30 23:03:06 -05:00
Igor Wiedler
c34ca32795 [ticket/11015] Fix db connection type hint in lock_db 
PHPBB3-11015
 2012-07-21 19:35:45 +02:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
Nils Adermann
7a2c5e618b [feature/system-cron] preg_match returns int so cast to bool, fix comment 
PHPBB3-9596
 2011-02-12 22:05:54 -05:00
Nils Adermann
2e47409e80 [feature/system-cron] Rename lock() to acquire and unlock() to release. 
PHPBB3-9596
 2011-02-12 22:05:54 -05:00
Nils Adermann
165b0ec0b2 [feature/system-cron] Make use of the new config class in locks. 
PHPBB3-9596
 2011-02-12 22:05:53 -05:00
Nils Adermann
3a3a8bb96d [feature/system-cron] Abstract the database locking mechanism out of cron. 
Added a number of tests for the locking mechanism which can now lock
arbitrary config variables.

PHPBB3-9596
 2011-02-12 22:05:53 -05:00