Skip to content
Snippets Groups Projects
  1. Jun 27, 2012
  2. Jun 24, 2012
    • Helmut Hummel's avatar
      [TASK] Add travis configuration file · 4302056c
      Helmut Hummel authored
      For details read the ticket description.
      
      Change-Id: Ibc22c62e7bb490e1871db92bbc09cd7e56581fa3
      Resolves: #38357
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12339
      Reviewed-by: Helmut Hummel
      Tested-by: Helmut Hummel
      4302056c
    • Helmut Hummel's avatar
      [BUGFIX] Backup global vars in DriverRegistryTest · b75bdffe
      Helmut Hummel authored
      The DriverRegistryTest pollutes the global variable space,
      which leads to failures in other tests if they are executed
      after this test.
      
      Backup and restore the global variables for this test.
      
      Change-Id: I1abacbb8a49a771c64356215749c96ae02700cc2
      Resolves: #38350
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12333
      Reviewed-by: Helmut Hummel
      Tested-by: Helmut Hummel
      b75bdffe
    • Helmut Hummel's avatar
      [BUGFIX] Use the TestFinder to determine fixture path · 23a2dbcd
      Helmut Hummel authored
      Two tests still use a hardcoded path to the fixture files.
      This fails if no typo3_src folder is present which is not
      the case in some TYPO3 installations.
      
      For this change it is necessary to also allow tests/ as prefix
      for language files.
      
      Change-Id: I89de174c8a80ea162ec3b0c3eef4817e7c8be475
      Releases: 6.0
      Resolves: #38349
      Reviewed-on: http://review.typo3.org/12332
      Reviewed-by: Helmut Hummel
      Tested-by: Helmut Hummel
      23a2dbcd
    • Christian Kuhn's avatar
      [TASK] Encapsulate bootstrap base code · 1bf9ae64
      Christian Kuhn authored
      This patch merges all bootstrap code that is independent from the local
      instance and configuration into one class. A wrapper method in
      Typo3_Bootsrap is introduced to call the only public method of this
      class. This reduces the number of public bootstrap methods and
      creates a clear definition what code must be run until instance
      specific configuration comes into the game.
      
      Some code fragments like the time initialization is now done more early
      in bootstrap, the according methods are merged in the class.
      
      The basic error_reporting setup is moved to the very end of the class,
      which forced some called t3lib_div methods to be notice free.
      
      All code that can be easily tested in this class now has unit tests.
      
      Change-Id: I90d48f8f4ff4a59b5507becb6102c90b39d9eebd
      Resolves: #38344
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12319
      Reviewed-by: Steffen Ritter
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Susanne Moog
      Tested-by: Susanne Moog
      1bf9ae64
    • Christian Kuhn's avatar
      [BUGFIX] CamelCased class names impossible with empty cache · 304cdabe
      Christian Kuhn authored
      Issue #37110 that aimed to allow case sensitive class name in
      ext_autoload files has a bug that any class registered with CamelCased
      class name is only found if the autoload entries are read from cache.
      
      The patch now creates a lower cased entry as soon as the core_autoload
      and ext_autoload files are read. There is an additional test that fails
      if the changes in the autoload class are not applied. The naming of the
      existing camelCase test was adapted to show that it is handling the
      answer of an successful cache fetch only.
      
      Additionally the current strtolower is changed to t3lib_div::strtolower
      to make the whole thing multibyte safe.
      
      Change-Id: I94f7ca5b3e60234f08433c747c00639d8dd219cd
      Fixes: #38331
      Related: #37110
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12310
      Reviewed-by: Steffen Ritter
      Tested-by: Steffen Ritter
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      304cdabe
    • Susanne Moog's avatar
      [TASK] CGL cleanup for the new module menu classes · 57b516d3
      Susanne Moog authored
      The new module menu classes have some CGL issues left.
      
      Patch fixes missing comments and some wrong object
      annotations.
      
      Change-Id: I7b8e810fe732977e9efbd56075683601658971f4
      Resolves: #38347
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12329
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      57b516d3
    • derhansen's avatar
      [BUGFIX] Wrong margin calculation for Text/Image · a3f6f262
      derhansen authored
      This patch fixes a wrong calculation of margins for Text/Image
      items with the properties "Beside text, left" and "Beside
      text, right".
      
      Change-Id: Ie484685aa2839123c42338862c241403614e7f7a
      Fixes: #36541
      Releases: 6.0, 4.7
      Reviewed-on: http://review.typo3.org/10995
      Reviewed-by: Steffen Ritter
      Tested-by: Steffen Ritter
      a3f6f262
    • Christian Kuhn's avatar
      [TASK] Raise submodule pointer · e2c10e4f
      Christian Kuhn authored
      Change-Id: I9e1a9af81ec767475911c48772ae60e754c29384
      Reviewed-on: http://review.typo3.org/12327
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      e2c10e4f
    • Susanne Moog's avatar
      [FEATURE] Add module menu object to the TYPO3 backend · da64930b
      Susanne Moog authored
      The backend at the moment uses a combination of the
      GLOBAL variables TBE_MODULES and TBE_MODULES_EXT to
      build the main menus of the backend (the module menu
      on the left and the submodule menus of the backend
      modules - look at info for an example).
      
      To be able to easily change the representation of
      these menus and to offer a clean API for rendering
      menus the menu is refactored into an object structure
      with n levels. This patch migrates the old GLOBALS
      to a 3 level menu object. This means that you can use
      the module menu object in your backend modules to
      render your submenu.
      
      This patch just adds the object structure and
      transformation. It does not change any handling of
      menus in the core itself. These changes can be done
      piece by piece after this patch.
      
      Change-Id: I1f7f9f5fcf83274840acef6cbeb267ea4ca460c3
      Resolves: #38138
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12146
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      da64930b
  3. Jun 23, 2012
    • Andy Grunwald's avatar
      [TASK] Remove empty init() method from EXT:tsconfig_help · f117012f
      Andy Grunwald authored
      In EXT:tsconfig_help the method init() just call his parent.
      
      This is not needed, because parent method are always called,
      even if an extending class does not specify this explicitly.
      
      Change-Id: I69d7aa47af7f6d90b8c3fb78c2f00d088e8a0597
      Fixes: #38336
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12315
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      f117012f
    • Andy Grunwald's avatar
      [TASK] Remove empty constructors in EXT:form · 2f2c906c
      Andy Grunwald authored
      An empty constructor just calling parent is not needed, because parent
      constructors are always called automatically.
      
      Change-Id: I89384aa584048108fab444e3ee0d50e661c7d014
      Fixes: #38335
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12314
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      2f2c906c
    • Andy Grunwald's avatar
      [TASK] Remove empty method from t3lib_file_Repository_FileCollectionRepo · 7c8608db
      Andy Grunwald authored
      In t3lib_file_Repository_FileCollectionRepository the method findByType
      just call his parent.
      
      Change-Id: Ia82ec630fdb8a54d77b413b98423c81f23a76941
      Fixes: #38332
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12311
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      7c8608db
    • Andy Grunwald's avatar
      [TASK] Remove empty constructor from t3lib_spritemanager_SimpleHandler · fb4f4fc5
      Andy Grunwald authored
      An empty constructor just calling parent is not needed, because parent
      constructors are always called automatically.
      
      Change-Id: I86818458540dd85709619f0d0ab21efa266e079b
      Fixes: #38333
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12312
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      fb4f4fc5
    • Andy Grunwald's avatar
      [TASK] Remove empty constructor from localRecordList · 899b13ac
      Andy Grunwald authored
      __construct() in localRecordList just calls parent.
      
      This is not needed, because parent constructors are always
      called, even if an extending class does not specify this
      explicitly.
      
      Change-Id: I505169347964744bcd5a7f7deb2d89f696d02634
      Fixes: #38334
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12313
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      899b13ac
    • Christian Kuhn's avatar
      [FEATURE] Cache negative ux_* look up in autoloader · c50007f7
      Christian Kuhn authored
      For every class instance that is requested via
      t3lib_div::makeInstance(), a lookup for ux_"classname" is done
      and that class is instantiated if it exists, instead of the original
      class. If no ux_ class is found with class_exists(), the requested class
      is instantiated. This is the basic "XCLASS" handling in the core.
      
      The patch adds autoloader rows for unsuccessful (NULL) ux_* lookups to the
      autoloader cache file. The file is updated during shutdown. This way the
      information a XCLASS does NOT exist is cached between consecutive calls.
      This leads to a performance improvement and is an advantage over the
      current makeInstance class name cache that worked only for one call.
      The old "cache for one call only" code is dropped with the patch.
      
      Change-Id: I70573146600d658d218dc9b31694748341fc7a20
      Resolves: #37915
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/11943
      Reviewed-by: Susanne Moog
      Tested-by: Susanne Moog
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      c50007f7
    • Dominique Feyer's avatar
      [BUGFIX] Refactor page renderer · 1c175820
      Dominique Feyer authored
      The render method of the page renderer is huge and needs to be refactored
      into smaller pieces to be able to integrate further changes.
      
      Change-Id: I2ee64ce54d9b9ae66d78b52f6d67a42b7852c53f
      Resolves: #38238
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12242
      Reviewed-by: Philipp Gampe
      Tested-by: Philipp Gampe
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      1c175820
    • Ludwig Rafelsberger's avatar
      [TASK] Fix CGL violations against DoubleQuoteUsage · 39c8c822
      Ludwig Rafelsberger authored
      Also did some spacing CGL issues.
      
      Change-Id: I10a93c31694ae90be483a4205abd93cc145001c5
      Releases: 6.0
      Resolves: #38325
      Reviewed-on: http://review.typo3.org/12306
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      39c8c822
    • Christian Kuhn's avatar
      [TASK] Raise submodule pointer · c82e19fc
      Christian Kuhn authored
      Change-Id: If32bee38978ad52e7338cedcca98b860f696866b
      Reviewed-on: http://review.typo3.org/12305
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      c82e19fc
    • Wouter Wolters's avatar
      [TASK] Clean up phpDoc comments in typo3/sysext/ · cfe1743c
      Wouter Wolters authored
      Clean up provides:
      
      * Provide correct parameter names in phpDoc
      * Provide correct data types in phpDoc
      * CGLify phpDoc (remove tabs)
      
      Change-Id: Ibf7958460bfac740d74bd22a12c7b9a995d1dbbe
      Resolves: #38321
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12303
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      cfe1743c
    • Wouter Wolters's avatar
      [TASK] Clean up phpDoc comments in typo3/sysext/ · 38dded56
      Wouter Wolters authored
      Clean up provides:
      
      * Provide correct parameter names in phpDoc
      * Provide correct data types in phpDoc
      * CGLify phpDoc (remove tabs)
      
      Change-Id: I86ee97b8d1827efca265daa62b488b64c657c095
      Resolves: #38322
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12304
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      38dded56
    • Soren Malling's avatar
      [BUGFIX] sys_action toolbar items doesn't go to right submodule · a73e7875
      Soren Malling authored
      The toolbar items in the sys_actions toolbar doesn't go to the
      right submodule in the "Task center" module - unless the last
      chosen submodule was "Tasks".
      
      This patch adds the "mode" setting, so the right submodule is chosen
      
      Change-Id: I0eacf922569005c7eba7cadfd49b15575faa3e60
      Resolves: #37906
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/11931
      Reviewed-by: Mattias Nilsson
      Tested-by: Mattias Nilsson
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Benjamin Mack
      Tested-by: Benjamin Mack
      a73e7875
  4. Jun 22, 2012
    • Wouter Wolters's avatar
      [TASK] Clean up phpDoc comments in typo3/sysext/ · 325c9e63
      Wouter Wolters authored
      Clean up provides:
      
      * Provide correct parameter names in phpDoc
      * Provide correct data types in phpDoc
      * CGLify phpDoc (remove tabs)
      
      Change-Id: I06035bfe7a224a33fa6624a7adf33a19821a91bf
      Resolves: #38320
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12302
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      325c9e63
    • Wouter Wolters's avatar
      [TASK] Clean up phpDoc comments in typo3/sysext/ · 64daaef4
      Wouter Wolters authored
      Clean up provides:
      
      * Provide correct parameter names in phpDoc
      * Provide correct data types in phpDoc
      * CGLify phpDoc (remove tabs)
      
      Change-Id: I413cc9c71997b8ba7f557c2f80bd013e284bd521
      Resolves: #38319
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12301
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      64daaef4
    • Wouter Wolters's avatar
      [TASK] Clean up phpDoc comments in typo3/sysext/saltedpasswords · afc22996
      Wouter Wolters authored
      Clean up provides:
      
      * Provide correct parameter names in phpDoc
      * Provide correct data types in phpDoc
      * CGLify phpDoc (remove tabs)
      
      Change-Id: If173ab6ad75f17f41826ec5dc4f32ca378909193
      Resolves: #38318
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12300
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      afc22996
    • Wouter Wolters's avatar
      [TASK] Clean up phpDoc comments in typo3/sysext/rsaauth · 6ccf0ec1
      Wouter Wolters authored
      * Provide correct parameter names in phpDoc
      * Provide correct data types in phpDoc
      * CGLify phpDoc (remove tabs)
      
      Change-Id: Icd78ad5235b537134e0a5684de8405d2c581769f
      Resolves: #38317
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12299
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      6ccf0ec1
    • Ludwig Rafelsberger's avatar
      [TASK] Fix CGL violations against DoubleQuoteUsage · 85af2b7c
      Ludwig Rafelsberger authored
      Change-Id: Ia82bb9e0da1761e42af8e32f85443c0a231173f7
      Release: 6.0
      Resolves: #38303
      Reviewed-on: http://review.typo3.org/12291
      Reviewed-by: Wouter Wolters
      Reviewed-by: Philipp Gampe
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      85af2b7c
    • Wouter Wolters's avatar
      [TASK] Clean up phpDoc comments in typo3/sysext/ · b80dc31e
      Wouter Wolters authored
      Clean up phpDoc comments for the following classes:
      
      * typo3/sysext/recordlist/ext_tables.php
      * typo3/sysext/recordlist/mod1/index.php
      * typo3/sysext/reports/ext_localconf.php
      * typo3/sysext/reports/ext_tables.php
      * typo3/sysext/reports/interfaces/interface.tx_reports_report.php
      * typo3/sysext/reports/interfaces/interface.tx_reports_statusprovider.php
      * typo3/sysext/reports/mod/index.php
      * typo3/sysext/reports/reports/class.tx_reports_reports_status.php
      * typo3/sysext/reports/reports/status/
      class.tx_reports_reports_status_configurationstatus.php
      * typo3/sysext/reports/reports/status/
      class.tx_reports_reports_status_securitystatus.php
      * typo3/sysext/reports/reports/status/
      class.tx_reports_reports_status_status.php
      * typo3/sysext/reports/reports/status/
      class.tx_reports_reports_status_systemstatus.php
      * typo3/sysext/reports/reports/status/
      class.tx_reports_reports_status_typo3status.php
      * typo3/sysext/reports/reports/status/
      class.tx_reports_reports_status_warningmessagepostprocessor.php
      * typo3/sysext/reports/tasks/
      class.tx_reports_tasks_systemstatusupdatetask.php
      * typo3/sysext/reports/tasks/
      class.tx_reports_tasks_systemstatusupdatetasknotificationemailfield.php
      
      Clean up provides:
      
      * Provide correct parameter names in phpDoc
      * Provide correct data types in phpDoc
      * CGLify phpDoc (remove tabs)
      
      Change-Id: I75f6fe74dd2e70c2f327729eaffbc0da8d4518c4
      Resolves: #38315
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12297
      Reviewed-by: Christian Kuhn
      Tested-by: Christian Kuhn
      b80dc31e
    • Oliver Hader's avatar
      [BUGFIX] Missing class definitions in core autoloader · 60eb6ff3
      Oliver Hader authored
      Since the classes in typo3/ have been moved to the TYPO3 Core
      Autoloader as well and accordant require() calls removed, some
      parts of the TYPO3 Backend will show a PHP Fatal Error like
      "class not found".
      The reason is, that there are PHP files with multiple class
      definitions that have not been considered.
      
      The changed autoload registry file was created with the SVN
      version of EXT:extdeveval.
      
      Change-Id: Id78e479ea51757eead7ec7298e8749c44d148ab0
      Fixes: #38293
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12286
      Reviewed-by: Philipp Gampe
      Tested-by: Philipp Gampe
      Reviewed-by: Helmut Hummel
      Tested-by: Helmut Hummel
      60eb6ff3
    • Wouter Wolters's avatar
      [TASK] Clean up phpDoc comments in typo3/sysext/ · 7a1282ea
      Wouter Wolters authored
      Clean up phpDoc comments for the following classes:
      
      * typo3/sysext/opendocs/class.tx_opendocs.php
      * typo3/sysext/opendocs/ext_tables.php
      * typo3/sysext/opendocs/registerToolbarItem.php
      * typo3/sysext/perm/ext_tables.php
      * typo3/sysext/perm/mod1/class.sc_mod_web_perm_ajax.php
      * typo3/sysext/perm/mod1/conf.php
      * typo3/sysext/perm/mod1/index.php
      
      Clean up provides:
      
      * Provide correct parameter names in phpDoc
      * Provide correct data types in phpDoc
      * CGLify phpDoc (remove tabs)
      
      Change-Id: I9f5811b8f674f189cf033e50da110e1074cb48bb
      Resolves: #38276
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12281
      Reviewed-by: Benjamin Mack
      Tested-by: Benjamin Mack
      7a1282ea
    • Stefan Galinski's avatar
      [TASK] Follow-Up: favicon for backend window · 54e3b7e8
      Stefan Galinski authored
      The favicon is still missing for the initial login,
      some popup windows and the install tool.
      
      Change-Id: I37b4c68e9b77a5652fba3b37d9b3eda75660b524
      Resolves: #37868
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12004
      Reviewed-by: Oliver Klee
      Reviewed-by: Philipp Gampe
      Tested-by: Philipp Gampe
      Reviewed-by: Wouter Wolters
      Tested-by: Wouter Wolters
      Reviewed-by: Felix Kopp
      Tested-by: Felix Kopp
      Reviewed-by: Benjamin Mack
      Tested-by: Benjamin Mack
      54e3b7e8
    • Benjamin Mack's avatar
      [TASK] Clean up phpDoc comments in typo3/sysext/ · 98e34ba8
      Benjamin Mack authored
      Clean up phpDoc comments for the following classes:
      
      * typo3/sysext/info/ext_tables.php
      * typo3/sysext/info/mod1/conf.php
      * typo3/sysext/info/mod1/index.php
      * typo3/sysext/info_pagetsconfig/
      	class.tx_infopagetsconfig_webinfo.php
      * typo3/sysext/info_pagetsconfig/ext_tables.php
      * typo3/sysext/lang/ext_localconf.php
      * typo3/sysext/lang/hooks/clearcache/class.tx_lang_clearcache.php
      * typo3/sysext/lang/hooks/clearcache/class.tx_lang_clearcachemenu.php
      * typo3/sysext/lang/lang.php
      * typo3/sysext/lang/res/js/be/typo3lang.js
      * typo3/sysext/lowlevel/admin_cli.php
      * typo3/sysext/lowlevel/class.tx_lowlevel_admin_core.php
      * typo3/sysext/lowlevel/class.tx_lowlevel_cleaner_core.php
      * typo3/sysext/lowlevel/clmods/class.cleanflexform.php
      * typo3/sysext/lowlevel/clmods/class.deleted.php
      * typo3/sysext/lowlevel/clmods/class.double_files.php
      * typo3/sysext/lowlevel/clmods/class.lost_files.php
      * typo3/sysext/lowlevel/clmods/class.missing_files.php
      * typo3/sysext/lowlevel/clmods/class.missing_relations.php
      * typo3/sysext/lowlevel/clmods/class.orphan_records.php
      * typo3/sysext/lowlevel/clmods/class.rte_images.php
      * typo3/sysext/lowlevel/clmods/class.syslog.php
      * typo3/sysext/lowlevel/clmods/class.versions.php
      * typo3/sysext/lowlevel/config/conf.php
      * typo3/sysext/lowlevel/config/index.php
      * typo3/sysext/lowlevel/dbint/cli/cleaner_cli.php
      * typo3/sysext/lowlevel/dbint/cli/refindex_cli.php
      * typo3/sysext/lowlevel/dbint/conf.php
      * typo3/sysext/lowlevel/dbint/index.php
      * typo3/sysext/lowlevel/ext_localconf.php
      * typo3/sysext/lowlevel/ext_tables.php
      
      Clean up provides:
      
      * Provide correct parameter names in phpDoc
      * Provide correct data types in phpDoc
      * CGLify phpDoc (remove tabs)
      
      Change-Id: Ib348429f98c4f23d9b71028a8024273c78654eec
      Resolves: #38272
      Releases: 6.0
      Reviewed-on: http://review.typo3.org/12278
      Reviewed-by: Benjamin Mack
      Tested-by: Benjamin Mack
      98e34ba8
    • Benjamin Mack's avatar
      [BUG] FAL: Signals for IndexerService are named wrong · 001dc18c
      Benjamin Mack authored
      The signals for the Indexer Service are named wrong
      (probably due to a copy/paste error).
      
      Change-Id: Ifac15514c682f8c9f93a42c4cc4a7e27903cb60f
      Resolves: #38256
      Reviewed-on: http://review.typo3.org/12254
      Reviewed-by: Steffen Ritter
      Tested-by: Steffen Ritter
      Reviewed-by: Oliver Klee
      Reviewed-by: Andreas Wolf
      Tested-by: Andreas Wolf
      001dc18c
  5. Jun 21, 2012