From 52237215020e114203ddc9ce6f0a5371a026b0d7 Mon Sep 17 00:00:00 2001 From: Oldperl <44996956+oldperl@users.noreply.github.com> Date: Thu, 1 Feb 2018 12:05:51 +0000 Subject: [PATCH] fixed PHP 5.6 autoloader bug for order of the class declaration --- .../Contenido_Category.class.php | 160 +++++++++--------- 1 file changed, 81 insertions(+), 79 deletions(-) diff --git a/conlite/classes/Contenido_Category/Contenido_Category.class.php b/conlite/classes/Contenido_Category/Contenido_Category.class.php index 3f9c5c7..e2095fd 100644 --- a/conlite/classes/Contenido_Category/Contenido_Category.class.php +++ b/conlite/classes/Contenido_Category/Contenido_Category.class.php @@ -35,6 +35,87 @@ if(!defined('CON_FRAMEWORK')) { } + +/** + * Base class for Contenido_Category, Contenido_Categories, Contenido_Category_Language. + * @version 0.9.0 + * @author Rudi Bieller + * @copyright four for business AG + * {@internal + * created 2008-02-15 + * }} + */ +class Contenido_Category_Base { + /** + * @var obj + * @access protected + */ + protected $oDb; + /** + * @var array + * @access protected + */ + protected $aCfg; + /** + * @var boolean + * @access protected + */ + protected $bDbg; + /** + * @var string + * @access protected + */ + protected $sDbgMode; + /** + * @var obj + * @access protected + */ + protected $oDbg; + + /** + * Constructor. + * @access public + * @param DB_ConLite $oDb + * @param array $aCfg + * @return void + * @author Rudi Bieller + */ + public function __construct(DB_ConLite $oDb, array $aCfg) { + $this->oDb = $oDb; + $this->aCfg = $aCfg; + $this->bDbg = false; + $this->oDbg = null; + } + + /** + * Set internal property for debugging on/off and choose appropriate debug object + * @access public + * @param boolean $bDebug + * @param string $sDebugMode + * @return void + * @author Rudi Bieller + */ + public function setDebug($bDebug = true, $sDebugMode = 'visible') { + if ($bDebug === false) { + $this->bDbg = false; + $this->oDbg = null; + $this->sDbgMode = 'hidden'; + } else { + if (!in_array($sDebugMode, array('visible', 'visible_adv', 'file', 'devnull', 'hidden'))) { + $sDebugMode = 'devnull'; + } + try { + $this->sDbgMode = $sDebugMode; + $this->bDbg = true; + $this->oDbg = DebuggerFactory::getDebugger($sDebugMode); + } catch (InvalidArgumentException $e) { + throw $e; + } + } + } +} + + /** * Implementation of a Contenido Category. * @version 0.9.0 @@ -822,83 +903,4 @@ class Contenido_Category_Language extends Contenido_Category_Base { return !is_null($this->sUrlname) ? (string) $this->sUrlname : ''; } } - -/** - * Base class for Contenido_Category, Contenido_Categories, Contenido_Category_Language. - * @version 0.9.0 - * @author Rudi Bieller - * @copyright four for business AG - * {@internal - * created 2008-02-15 - * }} - */ -class Contenido_Category_Base { - /** - * @var obj - * @access protected - */ - protected $oDb; - /** - * @var array - * @access protected - */ - protected $aCfg; - /** - * @var boolean - * @access protected - */ - protected $bDbg; - /** - * @var string - * @access protected - */ - protected $sDbgMode; - /** - * @var obj - * @access protected - */ - protected $oDbg; - - /** - * Constructor. - * @access public - * @param DB_ConLite $oDb - * @param array $aCfg - * @return void - * @author Rudi Bieller - */ - public function __construct(DB_ConLite $oDb, array $aCfg) { - $this->oDb = $oDb; - $this->aCfg = $aCfg; - $this->bDbg = false; - $this->oDbg = null; - } - - /** - * Set internal property for debugging on/off and choose appropriate debug object - * @access public - * @param boolean $bDebug - * @param string $sDebugMode - * @return void - * @author Rudi Bieller - */ - public function setDebug($bDebug = true, $sDebugMode = 'visible') { - if ($bDebug === false) { - $this->bDbg = false; - $this->oDbg = null; - $this->sDbgMode = 'hidden'; - } else { - if (!in_array($sDebugMode, array('visible', 'visible_adv', 'file', 'devnull', 'hidden'))) { - $sDebugMode = 'devnull'; - } - try { - $this->sDbgMode = $sDebugMode; - $this->bDbg = true; - $this->oDbg = DebuggerFactory::getDebugger($sDebugMode); - } catch (InvalidArgumentException $e) { - throw $e; - } - } - } -} ?> \ No newline at end of file