]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 21 Mar 2013 13:10:32 +0000 (21:10 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)
Xinchen Hui [Thu, 21 Mar 2013 13:09:30 +0000 (21:09 +0800)]
Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 21 Mar 2013 07:58:08 +0000 (15:58 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix test after f8b91d9acff10ede7bd3f2bc631794a3abef8ff7
Xinchen Hui [Sat, 16 Mar 2013 15:14:06 +0000 (23:14 +0800)]
Fix test after f8b91d9acff10ede7bd3f2bc631794a3abef8ff7

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 21 Mar 2013 03:14:36 +0000 (11:14 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #64432 (more empty delimiter warning in strX methods)
Xinchen Hui [Thu, 21 Mar 2013 03:14:10 +0000 (11:14 +0800)]
Fixed bug #64432 (more empty delimiter warning in strX methods)

11 years agofix memory leak
Xinchen Hui [Thu, 21 Mar 2013 02:56:30 +0000 (10:56 +0800)]
fix memory leak

the value shouldn't be ref, use z_add_ref is enough

11 years agoadd array_column()
Stanislav Malyshev [Wed, 20 Mar 2013 21:14:17 +0000 (14:14 -0700)]
add array_column()

11 years agoNEWS section for beta 2
David Soria Parra [Wed, 20 Mar 2013 14:07:08 +0000 (15:07 +0100)]
NEWS section for beta 2

11 years agoNEWS for beta 1
David Soria Parra [Wed, 20 Mar 2013 14:06:15 +0000 (15:06 +0100)]
NEWS for beta 1

11 years agoAllow local override of PHPROOT in makedist
David Soria Parra [Wed, 20 Mar 2013 14:16:24 +0000 (15:16 +0100)]
Allow local override of PHPROOT in makedist

11 years agoNEWS for array_column
David Soria Parra [Wed, 20 Mar 2013 12:14:20 +0000 (13:14 +0100)]
NEWS for array_column

11 years agoMerge branch 'pull-request/257' into PHP-5.5
David Soria Parra [Wed, 20 Mar 2013 12:02:33 +0000 (13:02 +0100)]
Merge branch 'pull-request/257' into PHP-5.5

* pull-request/257:
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()

11 years agoupdated NEWS
Anatol Belski [Wed, 20 Mar 2013 08:15:16 +0000 (09:15 +0100)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Wed, 20 Mar 2013 08:14:13 +0000 (09:14 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently

11 years agoupdated NEWS
Anatol Belski [Wed, 20 Mar 2013 08:13:13 +0000 (09:13 +0100)]
updated NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Wed, 20 Mar 2013 08:12:33 +0000 (09:12 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #64452 Zip PHPTs crash intermittently

11 years agoFixed bug #64452 Zip PHPTs crash intermittently
Anatol Belski [Wed, 20 Mar 2013 08:10:10 +0000 (09:10 +0100)]
Fixed bug #64452 Zip PHPTs crash intermittently

11 years agoclarify NEWS
Stanislav Malyshev [Wed, 20 Mar 2013 05:32:50 +0000 (22:32 -0700)]
clarify NEWS

11 years agoarray_column: Fix compile-time warnings
Ben Ramsey [Wed, 20 Mar 2013 01:44:19 +0000 (20:44 -0500)]
array_column: Fix compile-time warnings

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 19 Mar 2013 20:22:49 +0000 (21:22 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Backported fix for bug #62852

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Tue, 19 Mar 2013 20:22:09 +0000 (21:22 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Backported fix for bug #62852

11 years agoBackported fix for bug #62852
Anatol Belski [Tue, 19 Mar 2013 20:19:55 +0000 (21:19 +0100)]
Backported fix for bug #62852

11 years agoRefer to Zend Optimizer as Zend Opcache from now on
David Soria Parra [Tue, 19 Mar 2013 15:15:54 +0000 (16:15 +0100)]
Refer to Zend Optimizer as Zend Opcache from now on

11 years agoZO+ NEWS
David Soria Parra [Tue, 19 Mar 2013 14:26:40 +0000 (15:26 +0100)]
ZO+ NEWS

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Anatol Belski [Tue, 19 Mar 2013 14:15:31 +0000 (15:15 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agofix C89 compat
Anatol Belski [Tue, 19 Mar 2013 14:13:27 +0000 (15:13 +0100)]
fix C89 compat

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
David Soria Parra [Tue, 19 Mar 2013 14:11:48 +0000 (15:11 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix typos

11 years agoFix typos
Carson McDonald [Tue, 12 Mar 2013 08:15:50 +0000 (04:15 -0400)]
Fix typos

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Anatol Belski [Tue, 19 Mar 2013 13:50:05 +0000 (14:50 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoFix #48358 add() method for SplDoublyLinkedLis
Mark Baker [Mon, 18 Mar 2013 21:01:42 +0000 (22:01 +0100)]
Fix #48358 add() method for SplDoublyLinkedLis

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 19 Mar 2013 13:44:20 +0000 (14:44 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix C90 compat

11 years agofix C90 compat
Anatol Belski [Tue, 19 Mar 2013 13:42:18 +0000 (14:42 +0100)]
fix C90 compat

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Tue, 19 Mar 2013 13:04:35 +0000 (17:04 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)

Conflicts:
NEWS

11 years agoFixed bug #63976 (Parent class incorrectly using child constant in class property)
Dmitry Stogov [Tue, 19 Mar 2013 12:59:01 +0000 (16:59 +0400)]
Fixed bug #63976 (Parent class incorrectly using child constant in class property)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Tue, 19 Mar 2013 11:47:43 +0000 (15:47 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Partial fix for bug #64239

11 years agoPartial fix for bug #64239
Dmitry Stogov [Tue, 19 Mar 2013 11:45:48 +0000 (15:45 +0400)]
Partial fix for bug #64239

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Tue, 19 Mar 2013 11:00:24 +0000 (15:00 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #62343 (Show class_alias In get_declared_classes())

Conflicts:
NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Tue, 19 Mar 2013 10:59:08 +0000 (14:59 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62343 (Show class_alias In get_declared_classes())

11 years agoFixed bug #62343 (Show class_alias In get_declared_classes())
Dmitry Stogov [Tue, 19 Mar 2013 10:56:53 +0000 (14:56 +0400)]
Fixed bug #62343 (Show class_alias In get_declared_classes())

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Tue, 19 Mar 2013 09:07:32 +0000 (13:07 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)

Conflicts:
NEWS
Zend/zend_compile.c

11 years agoFixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Dmitry Stogov [Tue, 19 Mar 2013 08:48:23 +0000 (12:48 +0400)]
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)

11 years agostrlen() returns size_t
Dmitry Stogov [Tue, 19 Mar 2013 06:45:38 +0000 (10:45 +0400)]
strlen() returns size_t

11 years agoRenamed Zend Optimizer+ into Zend OPcache
Dmitry Stogov [Tue, 19 Mar 2013 06:32:24 +0000 (10:32 +0400)]
Renamed Zend Optimizer+ into Zend OPcache

11 years agoAdd stats to phpinfo
Dmitry Stogov [Tue, 19 Mar 2013 06:17:44 +0000 (10:17 +0400)]
Add stats to phpinfo

11 years agoAvoid trailing line break
Dmitry Stogov [Mon, 18 Mar 2013 09:36:31 +0000 (13:36 +0400)]
Avoid trailing line break

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Mon, 18 Mar 2013 09:17:42 +0000 (13:17 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  fix NEWS
  fix NEWS

11 years agoAdd oom, wasted, hash and manual restart counters to help identify potential configur...
Dmitry Stogov [Mon, 18 Mar 2013 09:13:35 +0000 (13:13 +0400)]
Add oom, wasted, hash and manual restart counters to help identify potential configuration problems

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 18 Mar 2013 07:52:36 +0000 (00:52 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Stanislav Malyshev [Mon, 18 Mar 2013 07:52:27 +0000 (00:52 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix NEWS

11 years agofix NEWS
Stanislav Malyshev [Mon, 18 Mar 2013 07:52:15 +0000 (00:52 -0700)]
fix NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 18 Mar 2013 07:51:35 +0000 (00:51 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix NEWS

11 years agofix NEWS
Stanislav Malyshev [Mon, 18 Mar 2013 07:51:16 +0000 (00:51 -0700)]
fix NEWS

11 years agoAdd optional flag to opcache_get_status()
Dmitry Stogov [Mon, 18 Mar 2013 07:23:26 +0000 (11:23 +0400)]
Add optional flag to opcache_get_status()

11 years agomerge with 5.4
Boris Lytochkin [Sun, 17 Mar 2013 16:52:55 +0000 (20:52 +0400)]
merge with 5.4

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Boris Lytochkin [Sun, 17 Mar 2013 16:52:12 +0000 (20:52 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  more test coverage: missing square bracket error message
  Fixed bug #61981

11 years agomore test coverage: missing square bracket error message
Boris Lytochkin [Sun, 17 Mar 2013 16:40:15 +0000 (20:40 +0400)]
more test coverage: missing square bracket error message

11 years agoFixed bug #61981
Boris Lytochkin [Sun, 17 Mar 2013 16:29:14 +0000 (20:29 +0400)]
Fixed bug #61981

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Boris Lytochkin [Sun, 17 Mar 2013 16:02:34 +0000 (20:02 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #61981

11 years agoFix bug #61981
Boris Lytochkin [Sun, 17 Mar 2013 16:00:37 +0000 (20:00 +0400)]
Fix bug #61981

11 years agoLoad "black list" only if O+ is enabled
Dmitry Stogov [Sun, 17 Mar 2013 08:17:04 +0000 (12:17 +0400)]
Load "black list" only if O+ is enabled

11 years agoMade opcache_get_status() return statistics during O+ restart
Dmitry Stogov [Sun, 17 Mar 2013 07:56:04 +0000 (11:56 +0400)]
Made opcache_get_status() return statistics during O+ restart

11 years agoAdded ability to load zend_extensions without absolute path names
Dmitry Stogov [Sun, 17 Mar 2013 07:42:25 +0000 (11:42 +0400)]
Added ability to load zend_extensions without absolute path names

11 years agoEnabled O+ build by default (it may be disabled before 5.0.0 release)
Dmitry Stogov [Sun, 17 Mar 2013 06:58:30 +0000 (10:58 +0400)]
Enabled O+ build by default (it may be disabled before 5.0.0 release)

11 years agoRemoved files that are neccessary only for standalone pecl branch
Dmitry Stogov [Sun, 17 Mar 2013 06:40:59 +0000 (10:40 +0400)]
Removed files that are neccessary only for standalone pecl branch

11 years agosetting plausible default value for struct members
Anatol Belski [Sat, 16 Mar 2013 17:07:21 +0000 (18:07 +0100)]
setting plausible default value for struct members

especially for unsigned members so they don't casted to max unsigned

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Etienne Kneuss [Sat, 16 Mar 2013 17:20:16 +0000 (18:20 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove spurious int cast in between two longs

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Etienne Kneuss [Sat, 16 Mar 2013 17:20:06 +0000 (18:20 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Remove spurious int cast in between two longs

11 years agoRemove spurious int cast in between two longs
Etienne Kneuss [Sat, 16 Mar 2013 17:19:14 +0000 (18:19 +0100)]
Remove spurious int cast in between two longs

11 years agoFixed test after nick previous fix
Xinchen Hui [Sat, 16 Mar 2013 14:58:47 +0000 (22:58 +0800)]
Fixed test after nick previous fix

11 years agoFix test after f8b91d9acff10ede7bd3f2bc631794a3abef8ff7
Xinchen Hui [Sat, 16 Mar 2013 15:14:06 +0000 (23:14 +0800)]
Fix test after f8b91d9acff10ede7bd3f2bc631794a3abef8ff7

11 years agoFixed memory leaks
Dmitry Stogov [Sat, 16 Mar 2013 13:24:54 +0000 (17:24 +0400)]
Fixed memory leaks

11 years agoMade test compatible with O+
Dmitry Stogov [Sat, 16 Mar 2013 12:11:00 +0000 (16:11 +0400)]
Made test compatible with O+

11 years agoFixed compatibility with ext/phar
Dmitry Stogov [Sat, 16 Mar 2013 12:08:11 +0000 (16:08 +0400)]
Fixed compatibility with ext/phar

11 years agoFixed O+ testes
Dmitry Stogov [Sat, 16 Mar 2013 08:07:09 +0000 (12:07 +0400)]
Fixed O+ testes

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Fri, 15 Mar 2013 20:46:34 +0000 (00:46 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge Zend Optimizer+
Dmitry Stogov [Fri, 15 Mar 2013 20:41:46 +0000 (00:41 +0400)]
Merge Zend Optimizer+

git-subtree-dir: ext/opcache
git-subtree-mainline: b1dbfb73571b051fef055dc371e05163cf73eb8b
git-subtree-split: 8d35170c5fe9b9c0c864b7a6c4dc6b0149809569

11 years agoFixed bug #62852 Unserialize Invalid Date crash
Anatol Belski [Fri, 15 Mar 2013 20:22:35 +0000 (21:22 +0100)]
Fixed bug #62852 Unserialize Invalid Date crash

Error handling is the same as in bug #53437, E_ERROR if we
expect an invalid object.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Fri, 15 Mar 2013 18:12:34 +0000 (19:12 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS

11 years agoupdated NEWS
Anatol Belski [Fri, 15 Mar 2013 18:11:53 +0000 (19:11 +0100)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Fri, 15 Mar 2013 18:09:18 +0000 (19:09 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Backported patch for #64370

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Fri, 15 Mar 2013 18:08:32 +0000 (19:08 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Backported patch for #64370

11 years agoBackported patch for #64370
Anatol Belski [Fri, 15 Mar 2013 18:04:40 +0000 (19:04 +0100)]
Backported patch for #64370

11 years agoRenamed ZendOptimizerPlus.so into opcache.so
Dmitry Stogov [Fri, 15 Mar 2013 17:03:05 +0000 (21:03 +0400)]
Renamed ZendOptimizerPlus.so into opcache.so

11 years agoFixed bug #53437 Crash with unserialized DatePeriod instance
Anatol Belski [Fri, 15 Mar 2013 15:59:54 +0000 (16:59 +0100)]
Fixed bug #53437 Crash with unserialized DatePeriod instance

11 years agoFix wrong macro usage and add missing NEWS entry
Nikita Popov [Fri, 15 Mar 2013 12:48:33 +0000 (13:48 +0100)]
Fix wrong macro usage and add missing NEWS entry

11 years ago"ZendOptimizerPlus" is renamed to "opcache" to de merged into PHP-5.5 under ext/opcac...
Dmitry Stogov [Fri, 15 Mar 2013 12:21:07 +0000 (16:21 +0400)]
"ZendOptimizerPlus" is renamed to "opcache" to de merged into PHP-5.5 under ext/opcache (the product name is still "Zend Optimizer+")

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Fri, 15 Mar 2013 08:41:50 +0000 (09:41 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  explain the step updating the git submodule reference in web/php.git

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Ferenc Kovacs [Fri, 15 Mar 2013 08:41:34 +0000 (09:41 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  explain the step updating the git submodule reference in web/php.git

11 years agoexplain the step updating the git submodule reference in web/php.git
Ferenc Kovacs [Fri, 15 Mar 2013 08:40:28 +0000 (09:40 +0100)]
explain the step updating the git submodule reference in web/php.git

11 years agoMore accurate restart scheduling
Dmitry Stogov [Fri, 15 Mar 2013 07:49:33 +0000 (11:49 +0400)]
More accurate restart scheduling

11 years agoAutogolobal $GLOBALS has to be pinged even if auto_globals_jit=0
Dmitry Stogov [Fri, 15 Mar 2013 06:45:49 +0000 (10:45 +0400)]
Autogolobal $GLOBALS has to be pinged even if auto_globals_jit=0

11 years agoAllow only shared O+ build
Dmitry Stogov [Thu, 14 Mar 2013 19:11:10 +0000 (23:11 +0400)]
Allow only shared O+ build

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Thu, 14 Mar 2013 13:39:47 +0000 (14:39 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix zts check

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Thu, 14 Mar 2013 13:39:09 +0000 (14:39 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix zts check

11 years agofix zts check
Anatol Belski [Thu, 14 Mar 2013 13:38:20 +0000 (14:38 +0100)]
fix zts check

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Thu, 14 Mar 2013 10:19:41 +0000 (14:19 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  fix the fix
  fix for bug  #63530  mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
  Forgot to remove some now unused variables
  Add support for non-scalar Iterator keys in foreach
  fixed headers order
  - Updated to version 2013.2 (2013b)
  fixed the test
  Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
  Disable zend_always_inline in debug build

11 years agofix the fix
Andrey Hristov [Wed, 13 Mar 2013 14:56:44 +0000 (15:56 +0100)]
fix the fix

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Wed, 13 Mar 2013 14:29:40 +0000 (15:29 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS

11 years agoRemoved redundand code
Dmitry Stogov [Wed, 13 Mar 2013 13:51:10 +0000 (17:51 +0400)]
Removed redundand code