Index: lib/eztemplate/classes/eztemplate.php
===================================================================
--- lib/eztemplate/classes/eztemplate.php	(revision 25248)
+++ lib/eztemplate/classes/eztemplate.php	(working copy)
@@ -531,7 +531,7 @@
                 $root =& $resourceData['root-node'];
         }
         eZDebug::accumulatorStop( 'template_load' );
-        if ( $resourceData['locales'] && count( $resourceData['locales'] ) )
+        if ( $resourceData['locales'] && !empty( $resourceData['locales'] ) )
         {
             $savedLocale = setlocale( LC_CTYPE, null );
             setlocale( LC_CTYPE, $resourceData['locales'] );
@@ -575,7 +575,7 @@
 
         eZDebug::accumulatorStop( 'template_total' );
 
-        if ( $resourceData['locales'] && count( $resourceData['locales'] ) )
+        if ( $resourceData['locales'] && !empty( $resourceData['locales'] ) )
         {
             setlocale( LC_CTYPE, $savedLocale );
         }
@@ -843,7 +843,7 @@
 
         $templateCompilationUsed = false;
 
-        if ( $resourceData['locales'] && count( $resourceData['locales'] ) )
+        if ( $resourceData['locales'] && !empty( $resourceData['locales'] ) )
         {
             $savedLocale = setlocale( LC_CTYPE, null );
             setlocale( LC_CTYPE, $resourceData['locales'] );
@@ -869,7 +869,7 @@
             $textElements[] = $text;
         }
 
-        if ( $resourceData['locales'] && count( $resourceData['locales'] ) )
+        if ( $resourceData['locales'] && !empty( $resourceData['locales'] ) )
         {
             setlocale( LC_CTYPE, $savedLocale );
         }
@@ -1023,7 +1023,7 @@
     function resourceFor( $uri, &$res, &$template )
     {
         $args = explode( ":", $uri );
-        if ( count( $args ) > 1 )
+        if ( isset( $args[1] ) )
         {
             $res = $args[0];
             $template = $args[1];
@@ -1420,7 +1420,7 @@
         if ( $namespace != "" )
             $txt .= "$namespace:";
         $txt .= $var;
-        if ( count( $attrs ) > 0 )
+        if ( !empty( $attrs ) )
             $txt .= "." . implode( ".", $attrs );
         return $txt;
     }
@@ -1499,53 +1499,64 @@
         }
     }
 
-    /*!
-     Sets the template variable $var to the value $val.
-     \sa setVariableRef
-    */
-    function setVariable( $var, $val, $namespace = "" )
+    /**
+     * Sets the template variable $var to the value $val.
+     *
+     * @param string $var
+     * @param string $val
+     * @param string $namespace (optional)
+     */
+    function setVariable( $var, $val, $namespace = '' )
     {
-        if ( array_key_exists( $namespace, $this->Variables ) and
-             array_key_exists( $var, $this->Variables[$namespace] ) )
-            unset( $this->Variables[$namespace][$var] );
         $this->Variables[$namespace][$var] = $val;
     }
 
-    /*!
-     Sets the template variable $var to the value $val.
-     \note This sets the variable using reference
-     \sa setVariable
-    */
-    function setVariableRef( $var, $val, $namespace = "" )
+    /**
+     * Sets the template variable $var to the value $val by ref (pre 4.0)
+     *
+     * @deprecated Since 4.3, have not used references since 4.0
+     * @uses eZTemplate::setVariable()
+     *
+     * @param string $var
+     * @param string $val
+     * @param string $namespace (optional)
+     */
+    function setVariableRef( $var, $val, $namespace = '' )
     {
-        if ( array_key_exists( $namespace, $this->Variables ) and
-             array_key_exists( $var, $this->Variables[$namespace] ) )
-            unset( $this->Variables[$namespace][$var] );
-        $this->Variables[$namespace][$var] = $val;
+        $this->setVariable( $var, $val, $namespace );
     }
 
-    /*!
-     Removes the template variable $var. If the variable does not exist an error is output.
-    */
-    function unsetVariable( $var, $namespace = "" )
+    /**
+     * Unsets the template variable $var.
+     *
+     * @param string $var
+     * @param string $namespace (optional)
+     */
+    function unsetVariable( $var, $namespace = '' )
     {
-        if ( array_key_exists( $namespace, $this->Variables ) and
+        if ( isset( $this->Variables[$namespace] ) &&
              array_key_exists( $var, $this->Variables[$namespace] ) )
             unset( $this->Variables[$namespace][$var] );
         else
             $this->warning( "unsetVariable()", "Undefined Variable: \$$namespace:$var, cannot unset" );
     }
 
-    /*!
-     Returns true if the variable $var is set in namespace $namespace,
-     if $attrs is supplied alle attributes must exist for the function to return true.
-    */
-    function hasVariable( $var, $namespace = "", $attrs = array() )
+    /**
+     * Returns true if the variable $var is set in namespace $namespace,
+     * if $attrs is supplied all attributes must exist for the function to return true.
+     *
+     * @param string $var
+     * @param string $namespace (optional)
+     * @param array $attrs (optional) Deprecated as of 4.3.
+     * @return bool
+     */
+    function hasVariable( $var, $namespace = '', $attrs = array() )
     {
-        $exists = ( array_key_exists( $namespace, $this->Variables ) and
+        $exists = ( isset( $this->Variables[$namespace] ) &&
                     array_key_exists( $var, $this->Variables[$namespace] ) );
-        if ( $exists and count( $attrs ) > 0 )
+        if ( $exists && !empty( $attrs ) )
         {
+            eZDebug::writeStrict( '$attrs parameter is deprecated as of 4.3', __METHOD__ );
             $ptr =& $this->Variables[$namespace][$var];
             foreach( $attrs as $attr )
             {
@@ -1575,19 +1586,25 @@
         return $exists;
     }
 
-    /*!
-     Returns the content of the variable $var using namespace $namespace,
-     if $attrs is supplied the result of the attributes is returned.
-    */
-    function variable( $var, $namespace = "", $attrs = array() )
+    /**
+     * Returns the content of the variable $var using namespace $namespace,
+     * if $attrs is supplied the result of the attributes is returned.
+     *
+     * @param string $var
+     * @param string $namespace (optional)
+     * @param array $attrs (optional) Deprecated as of 4.3
+     * @return string|array
+     */
+    function variable( $var, $namespace = '', $attrs = array() )
     {
         $val = null;
-        $exists = ( array_key_exists( $namespace, $this->Variables ) and
+        $exists = ( isset( $this->Variables[$namespace] ) &&
                     array_key_exists( $var, $this->Variables[$namespace] ) );
         if ( $exists )
         {
-            if ( count( $attrs ) > 0 )
+            if ( !empty( $attrs ) )
             {
+                eZDebug::writeStrict( '$attrs parameter is deprecated as of 4.3', __METHOD__ );
                 $element = $this->Variables[$namespace][$var];
                 foreach( $attrs as $attr )
                 {
@@ -2348,8 +2365,7 @@
     {
         if ( self::$factory === false )
         {
-            // Make sure self::$instance is set
-            self::instance();
+            $instance = self::instance();
 
             $ini = eZINI::instance();
             if ( $ini->variable( 'TemplateSettings', 'Debug' ) == 'enabled' )
@@ -2363,10 +2379,10 @@
 
             $autoLoadPathList = array_unique( array_merge( $compatAutoLoadPath, $autoLoadPathList, $extensionPathList ) );
 
-            self::$instance->setAutoloadPathList( $autoLoadPathList );
-            self::$instance->autoload();
+            $instance->setAutoloadPathList( $autoLoadPathList );
+            $instance->autoload();
 
-            self::$instance->registerResource( eZTemplateDesignResource::instance() );
+            $instance->registerResource( eZTemplateDesignResource::instance() );
             self::$factory = true;
         }
         return self::instance();