[Quickfw-git] SF.net Git: quickfw branch, master, updated. 1549de48418af2bdcc06bc335e20149cb907c5ea

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  1549de48418af2bdcc06bc335e20149cb907c5ea (commit)
       via  7536cca023849240d8e6362df445f39004734c6a (commit)
      from  86e1c657f85b3dfed5cbd488d89738193a50e817 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1549de48418af2bdcc06bc335e20149cb907c5ea
Author: Ivan1986 <iva...@li...>
Date:   Tue Mar 30 15:29:39 2010 +0400

    Исправлено PhpDOC класса Templater

diff --git a/QFW/Templater/Templater.php b/QFW/Templater/Templater.php
index fa52621..92919ec 100644
--- a/QFW/Templater/Templater.php
+++ b/QFW/Templater/Templater.php
@@ -22,32 +22,29 @@ abstract class Templater
 	}
 
 	/**
-	* Assign variables to the template
-	*
-	* Allows setting a specific key to the specified value, OR passing an array
-	* of key => value pairs to set en masse.
-	*
-	* @param string|array $spec The assignment strategy to use (key or array of key
-	* => value pairs)
-	* @param mixed $value (Optional) If assigning a named variable, use this
-	* as the value.
-	* @return Templater_PlainView
-	*/
-	public function assign($spec, $value = null)
+	 * Присваение значения переменной шаблона
+	 *
+	 * Allows setting a specific key to the specified value, OR passing an array
+	 * of key => value pairs to set en masse.
+	 *
+	 * @param string|array $name Имя переменной или массив (ключ => значение)
+	 * @param mixed $value Значение переменной, если первый параметр не массив
+	 * @return Templater_PlainView Ссылка на себя
+	 */
+	public function assign($name, $value = null)
 	{
-		if (is_array($spec))
-			$this->_vars = array_merge($this->_vars, $spec);
+		if (is_array($name))
+			$this->_vars = array_merge($this->_vars, $name);
 		else
-			$this->_vars[$spec] = $value;
+			$this->_vars[$name] = $value;
 		return $this;
 	}
 
 	/**
-	* Clear assigned variable
-	*
-	* @param string|array
-	* @return void
-	*/
+	 * Удаляет указанную переменную из шаблона
+	 *
+	 * @param string|array имя переменной или массив имен
+	 */
 	public function delete($spec)
 	{
 		if (is_array($spec))
@@ -58,10 +55,9 @@ abstract class Templater
 	}
 
 	/**
-	* Clear all assigned variables
-	*
-	* @return void
-	*/
+	 * Очистка всех установленных переменных
+	 *
+	 */
 	public function clearVars()
 	{
 		$this->_vars=array();

commit 7536cca023849240d8e6362df445f39004734c6a
Author: Ivan1986 <iva...@li...>
Date:   Tue Mar 30 15:29:11 2010 +0400

    Игнорирование генерируемой документации

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9d81ed1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/tmp/doc
\ No newline at end of file

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                  |    1 +
 QFW/Templater/Templater.php |   44 +++++++++++++++++++-----------------------
 2 files changed, 21 insertions(+), 24 deletions(-)
 create mode 100644 .gitignore


hooks/post-receive
-- 
quickfw