The branch, master has been updated
via 0c2863c91c919d7def3b7f2cd7b423e14d7ad2eb (commit)
via 1c843b57f8395f2b19ffc154963bc15f52ffbae8 (commit)
via 565956aee0a8148bd0f22717baec00e9454276bc (commit)
via ae26ae730a335abab1a22ec00d3954e1d79144b1 (commit)
via 07384919d51327a998dcd8e2cf99e688708c3048 (commit)
via 054220cf32f5d1aaa892cb9e6501fb50305fc408 (commit)
via 957e90b5b687248727d55edc80eb7385488587d0 (commit)
via …
[View More]622f96978313cd3adc54b8c08679515e86c696d4 (commit)
via 8b3e491b7356b5c7b50b5b96603cd6da664dd89f (commit)
via 0d1cb8d58d7c08a1193af7c867b19ca25e460738 (commit)
via 5e5705f626891324d659b8b00e73ef55482bc02a (commit)
from 54729ef4cb20ae59c804eef595c75057dd170e90 (commit)
- Log -----------------------------------------------------------------
commit 0c2863c91c919d7def3b7f2cd7b423e14d7ad2eb
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Jun 30 12:00:52 2011 +0200
Update
commit 1c843b57f8395f2b19ffc154963bc15f52ffbae8
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Tue Jun 28 18:30:19 2011 +0200
Translation update done using Pootle.
commit 565956aee0a8148bd0f22717baec00e9454276bc
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Tue Jun 28 18:29:40 2011 +0200
Translation update done using Pootle.
commit ae26ae730a335abab1a22ec00d3954e1d79144b1
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Tue Jun 28 16:46:23 2011 +0200
Translation update done using Pootle.
commit 07384919d51327a998dcd8e2cf99e688708c3048
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Tue Jun 28 16:46:15 2011 +0200
Translation update done using Pootle.
commit 054220cf32f5d1aaa892cb9e6501fb50305fc408
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Tue Jun 28 16:46:09 2011 +0200
Translation update done using Pootle.
commit 957e90b5b687248727d55edc80eb7385488587d0
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Tue Jun 28 16:46:00 2011 +0200
Translation update done using Pootle.
commit 622f96978313cd3adc54b8c08679515e86c696d4
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Mon Jun 27 19:45:09 2011 +0200
Translation update done using Pootle.
commit 8b3e491b7356b5c7b50b5b96603cd6da664dd89f
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Mon Jun 27 19:44:06 2011 +0200
Translation update done using Pootle.
commit 0d1cb8d58d7c08a1193af7c867b19ca25e460738
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Mon Jun 27 19:42:22 2011 +0200
Translation update done using Pootle.
commit 5e5705f626891324d659b8b00e73ef55482bc02a
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Mon Jun 27 19:42:04 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
output/es/Documentation.html | 19 +++++++++++--------
output/tr/Documentation.html | 6 ++++--
po/en_GB.po | 12 +++++++++---
po/es.po | 14 ++++++++++++--
po/tr.po | 6 +++++-
5 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/output/es/Documentation.html b/output/es/Documentation.html
index f878e4b..4c50256 100644
--- a/output/es/Documentation.html
+++ b/output/es/Documentation.html
@@ -156,8 +156,9 @@ o enlaces de descarga
title="Frequently Asked Questions">FAQ</abbr> 3.6)</a></li>
<li>usar mysqli, la extensión mejorada de MySQL <a href="#faq1_17"> (vea <abbr
title="Frequently Asked Questions">FAQ</abbr> 1.17)</a></li>
- <li>create, edit, call, export and drop stored procedures and functions</li>
- <li>create, edit, export and drop events and triggers</li>
+ <li>crear, editar, ejecutar y eliminar funciones y procedimientos almacenados
+(«stored procedures»)</li>
+ <li>crear, editar, exportar y eliminar eventos y disparadores</li>
<li>comunicarse en <a
href="http://www.phpmyadmin.net/home_page/translations.php">62 lenguajes
distintos</a>
@@ -5585,9 +5586,10 @@ una forma de comunicación entre procesos.</li>
<li><a href="http://www.wikipedia.org/wiki/Secure_Sockets_Layer">SSL (Secure
Sockets Layer)</a> - un protocolo criptográfico que provee comunicaciones
seguras en internet.</li>
- <li><a href="http://en.wikipedia.org/wiki/Stored_procedure">Stored procedure</a>
-- a subroutine available to applications accessing a relational database
-system</li>
+ <li><a
+href="http://es.wikipedia.org/wiki/Procedimiento_almacenado">Procedimiento
+almacenado «stored procedure»</a> - una subrutina disponible para las
+aplicaciones que acceden a un sistema de bases de datos relacionales</li>
<li><a href="http://www.wikipedia.org/wiki/SQL">SQL</a> - lenguaje estructurado
de consultas</li>
<li><a href="http://www.wikipedia.org/wiki/Table_%28database%29">tabla</a> -
@@ -5601,9 +5603,10 @@ tipo de formato de archivación de archivos.</li>
<li><a href="http://www.wikipedia.org/wiki/TCP">TCP (Transmission Control
Protocol)</a> - uno de los protocolos clave en el conjunto de protocolos de
internet.</li>
- <li><a href="http://en.wikipedia.org/wiki/Database_trigger">trigger</a> - a
-procedural code that is automatically executed in response to certain events
-on a particular table or view in a database</li>
+ <li><a
+href="http://es.wikipedia.org/wiki/Trigger_(base_de_datos)">disparador</a> -
+un código procedural que es ejecutado automáticamente en respuesta a ciertos
+eventos en una tabla o vista particular de una base de datos</li>
<li><a href="http://www.acko.net/node/56">UFPDF</a> - extensión Unicode/UTF-8
para FPDF</li>
<li><a href="http://www.wikipedia.org/wiki/URL">URL (Uniform Resource
diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html
index 71bc879..7df02a8 100644
--- a/output/tr/Documentation.html
+++ b/output/tr/Documentation.html
@@ -162,8 +162,10 @@ href="#faq3_6">(<abbr title="Sıkça Sorulan Sorular">SSS</abbr> 3.6'ya
bakın)</a></li>
<li>mysqli, gelişmiş MySQL uzantılarını destekleyebilir <a href="#faq1_17">
(<abbr title="Sıkça Sorulan Sorular">SSS</abbr> 1.17'ye bakın)</a></li>
- <li>create, edit, call, export and drop stored procedures and functions</li>
- <li>create, edit, export and drop events and triggers</li>
+ <li>depolanan işlemleri ve işlevleri oluşturabilir, düzenleyebilir, çağırabilir,
+dışa aktarabilir ve kaldırabilir</li>
+ <li>olayları ve tetikleyicileri oluşturabilir, düzenleyebilir, çağırabilir, dışa
+aktarabilir ve kaldırabilir</li>
<li><a href="http://www.phpmyadmin.net/home_page/translations.php">62 farklı
dilde</a> iletişim kurabilir
</li>
diff --git a/po/en_GB.po b/po/en_GB.po
index f9144dc..01a71b1 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs VERSION\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lis\n"age/translations.php">62 farklır, dışa3]������+�����"qR�+��R�+����������xR�+��S�+�s�+�ho�+���������+�����`�����R�+6 ��!�!���������x$o�+�����"qR�+�R�+�����pR�+O�������+�xR�+��+���+���+��S�+x$o�+�����`�����R�+�!�!�����������N�+p����"qR�+�R�+�����pR�+O����@����8�����s�+�p�������xR�+��S�+p����@�����R�+GHIJKMNOP���������H�%�+����"qR�+�R�+����0��+�xR�+0o�+���+��+���+���+��S�+H�%�+����P�����R�+8�%�+����������R�+(�%�+����������R�+�%�+����������R�+ ���+�xR�+���+`�����(�+�wR�+���+�����y(�+�wR�+��+�����Z(�+�wR�+���+0o�+���+��+�4o�+���+���+��S�+��+0���������R�+#%')*-.035678:<=���������p[��+P����"qR�+8?o�+�xR�+�4o�+�9o�+��S�+cf���+�����p[��+P���� �����R�+�%�����wq�-�����s��,~9��u]�� 4Q��U^Qʉ��u������*ēv�2��+�����F@6�+F@6�+?���+������������������+�wR�+�s�+����B@6�+Г���O�����t�+�������������B@6�+������R�ts.sourceforge.net\n"
"POT-Creation-Date: 2011-06-27 10:29+0300\n"
-"PO-Revision-Date: 2011-06-23 00:03+0200\n"
+"PO-Revision-Date: 2011-06-28 16:46+0200\n"
"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n"
"Language-Team: none\n"
"Language: en_GB\n"
@@ -396,12 +396,12 @@ msgstr ""
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:140
msgid "create, edit, call, export and drop stored procedures and functions"
-msgstr ""
+msgstr "create, edit, call, export and drop stored procedures and functions"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:141
msgid "create, edit, export and drop events and triggers"
-msgstr ""
+msgstr "create, edit, export and drop events and triggers"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:142
@@ -13969,6 +13969,9 @@ msgid ""
"a> - a subroutine available to applications accessing a relational database "
"system"
msgstr ""
+"<a href=\"http://en.wikipedia.org/wiki/Stored_procedure\">Stored procedure</a> "
+"- a subroutine available to applications accessing a relational database "
+"system"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5159
@@ -14022,6 +14025,9 @@ msgid ""
"procedural code that is automatically executed in response to certain events "
"on a particular table or view in a database"
msgstr ""
+"<a href=\"http://en.wikipedia.org/wiki/Database_trigger\">trigger</a> - a "
+"procedural code that is automatically executed in response to certain events "
+"on a particular table or view in a database"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5173
diff --git a/po/es.po b/po/es.po
index a764856..a5f1e5e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs VERSION\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-06-27 10:28+0300\n"
-"PO-Revision-Date: 2011-06-21 15:46+0200\n"
+"PO-Revision-Date: 2011-06-27 19:45+0200\n"
"Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n"
"Language-Team: none\n"
"Language: es\n"
@@ -405,11 +405,13 @@ msgstr ""
#: orig-docs/Documentation.html:140
msgid "create, edit, call, export and drop stored procedures and functions"
msgstr ""
+"crear, editar, ejecutar y eliminar funciones y procedimientos almacenados "
+"(«stored procedures»)"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:141
msgid "create, edit, export and drop events and triggers"
-msgstr ""
+msgstr "crear, editar, exportar y eliminar eventos y disparadores"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:142
@@ -14325,6 +14327,10 @@ msgid ""
"a> - a subroutine available to applications accessing a relational database "
"system"
msgstr ""
+"<a "
+"href=\"http://es.wikipedia.org/wiki/Procedimiento_almacenado\">Procedimiento "
+"almacenado «stored procedure»</a> - una subrutina disponible para las "
+"aplicaciones que acceden a un sistema de bases de datos relacionales"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5159
@@ -14380,6 +14386,10 @@ msgid ""
"procedural code that is automatically executed in response to certain events "
"on a particular table or view in a database"
msgstr ""
+"<a "
+"href=\"http://es.wikipedia.org/wiki/Trigger_(base_de_datos)\">disparador</a> - "
+"un código procedural que es ejecutado automáticamente en respuesta a "
+"ciertos eventos en una tabla o vista particular de una base de datos"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5173
diff --git a/po/tr.po b/po/tr.po
index 5308187..0e9acb7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs VERSION\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-06-27 10:28+0300\n"
-"PO-Revision-Date: 2011-06-26 12:18+0200\n"
+"PO-Revision-Date: 2011-06-28 18:30+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: none\n"
"Language: tr\n"
@@ -407,11 +407,15 @@ msgstr ""
#: orig-docs/Documentation.html:140
msgid "create, edit, call, export and drop stored procedures and functions"
msgstr ""
+"depolanan işlemleri ve işlevleri oluşturabilir, düzenleyebilir, çağırabilir, "
+"dışa aktarabilir ve kaldırabilir"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:141
msgid "create, edit, export and drop events and triggers"
msgstr ""
+"olayları ve tetikleyicileri oluşturabilir, düzenleyebilir, çağırabilir, dışa "
+"aktarabilir ve kaldırabilir"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:142
hooks/post-receive
--
phpMyAdmin localized documentation
[View Less]
The branch, master has been updated
via eb8caa4b7742cda1816598f4b5cf18f4b0616fce (commit)
via 2a8dee495a7e5c52562856b8a68b373c130f40f2 (commit)
via 02fef2c5af5ff0ce3d728e749080e48cdb1368be (commit)
from 500daacd24292fdf2524eb2a99bf86ccaf1d9e2e (commit)
- Log -----------------------------------------------------------------
commit eb8caa4b7742cda1816598f4b5cf18f4b0616fce
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Tue Jun 28 22:08:51 2011 +0200
…
[View More] Removed dead and incorrect code
(In static context $this makes no sense)
commit 2a8dee495a7e5c52562856b8a68b373c130f40f2
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Tue Jun 28 22:01:53 2011 +0200
Fix/unify comments
commit 02fef2c5af5ff0ce3d728e749080e48cdb1368be
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Tue Jun 28 21:40:38 2011 +0200
Proper check for TIMESTAMP
-----------------------------------------------------------------------
Summary of changes:
libraries/Table.class.php | 136 +++++++++++++++++++++++++--------------------
1 files changed, 76 insertions(+), 60 deletions(-)
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 0acd2d9..8e8a8d7 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -72,7 +72,10 @@ class PMA_Table
}
/**
+ * returns table name
+ *
* @see PMA_Table::getName()
+ * @return string table name
*/
function __toString()
{
@@ -102,7 +105,7 @@ class PMA_Table
/**
* returns table name
*
- * @param boolean whether to quote name with backticks ``
+ * @param boolean $backquoted whether to quote name with backticks ``
* @return string table name
*/
function getName($backquoted = false)
@@ -126,7 +129,7 @@ class PMA_Table
/**
* returns database name for this table
*
- * @param boolean whether to quote name with backticks ``
+ * @param boolean $backquoted whether to quote name with backticks ``
* @return string database name for this table
*/
function getDbName($backquoted = false)
@@ -140,7 +143,8 @@ class PMA_Table
/**
* returns full name for table, including database name
*
- * @param boolean whether to quote name with backticks ``
+ * @param boolean $backquoted whether to quote name with backticks ``
+ * @return string
*/
function getFullName($backquoted = false)
{
@@ -153,18 +157,14 @@ class PMA_Table
return PMA_Table::_isView($db, $table);
}
- if (isset($this) && strpos($this->get('TABLE TYPE'), 'VIEW')) {
- return true;
- }
-
return false;
}
/**
* sets given $value for given $param
*
- * @param string param name
- * @param mixed param value
+ * @param string $param name
+ * @param mixed $value value
*/
function set($param, $value)
{
@@ -174,7 +174,7 @@ class PMA_Table
/**
* returns value for given setting/param
*
- * @param string name for value to return
+ * @param string $param name for value to return
* @return mixed value for $param
*/
function get($param)
@@ -189,6 +189,8 @@ class PMA_Table
/**
* loads structure data
* (this function is work in progress? not yet used)
+ *
+ * @return boolean
*/
function loadStructure()
{
@@ -215,6 +217,7 @@ class PMA_Table
$this->set($$each_create_option[0], $each_create_option[1]);
}
}
+ return true;
}
/**
@@ -222,12 +225,9 @@ class PMA_Table
*
* @deprecated
* @todo see what we could do with the possible existence of $table_is_view
- * @param string the database name
- * @param string the table name
- *
+ * @param string $db the database name
+ * @param string $table the table name
* @return boolean whether this is a view
- *
- * @access public
*/
static protected function _isView($db, $table)
{
@@ -246,22 +246,17 @@ class PMA_Table
*
* If the ENGINE of the table is MERGE or MRG_MYISAM (alias), this is a merge table.
*
- * @param string the database name
- * @param string the table name
+ * @param string $db the database name
+ * @param string $table the table name
* @return boolean true if it is a merge table
- * @access public
*/
static public function isMerge($db = null, $table = null)
{
+ $engine = null;
// if called static, with parameters
if (! empty($db) && ! empty($table)) {
$engine = PMA_Table::sGetStatusInfo($db, $table, 'ENGINE', null, true);
}
- // if called as an object
- // does not work yet, because $this->settings[] is not filled correctly
- else if (! empty($this)) {
- $engine = $this->get('ENGINE');
- }
return (! empty($engine) && ((strtoupper($engine) == 'MERGE') || (strtoupper($engine) == 'MRG_MYISAM')));
}
@@ -282,7 +277,7 @@ class PMA_Table
* @param string $table
* @param string $info
* @param boolean $force_read
- * @param boolean if true, disables error message
+ * @param boolean $disable_error if true, disables error message
* @return mixed
*/
static public function sGetStatusInfo($db, $table, $info = null, $force_read = false, $disable_error = false)
@@ -313,21 +308,19 @@ class PMA_Table
}
/**
- * generates column/field specification for ALTER or CREATE TABLE syntax
+ * generates column specification for ALTER or CREATE TABLE syntax
*
* @todo move into class PMA_Column
- * @todo on the interface, some js to clear the default value when the default
- * current_timestamp is checked
- * @static
+ * @todo on the interface, some js to clear the default value when the default current_timestamp is checked
* @param string $name name
* @param string $type type ('INT', 'VARCHAR', 'BIT', ...)
* @param string $length length ('2', '5,2', '', ...)
* @param string $attribute
* @param string $collation
- * @param string $null with 'NULL' or 'NOT NULL'
+ * @param bool|string $null with 'NULL' or 'NOT NULL'
* @param string $default_type whether default is CURRENT_TIMESTAMP,
* NULL, NONE, USER_DEFINED
- * @param boolean $default_value default value for USER_DEFINED default type
+ * @param string $default_value default value for USER_DEFINED default type
* @param string $extra 'AUTO_INCREMENT'
* @param string $comment field comment
* @param array &$field_primary list of fields for PRIMARY KEY
@@ -337,10 +330,10 @@ class PMA_Table
static function generateFieldSpec($name, $type, $length = '', $attribute = '',
$collation = '', $null = false, $default_type = 'USER_DEFINED',
$default_value = '', $extra = '', $comment = '',
- &$field_primary, $index, $default_orig = false)
+ &$field_primary, $index)
{
- $is_timestamp = strpos(' ' . strtoupper($type), 'TIMESTAMP') == 1;
+ $is_timestamp = strpos(strtoupper($type), 'TIMESTAMP') !== false;
/**
* @todo include db-name
@@ -432,14 +425,13 @@ class PMA_Table
* Revision 13 July 2001: Patch for limiting dump size from
* vinay(a)sanisoft.com & girish(a)sanisoft.com
*
- * @param string the current database name
- * @param string the current table name
- * @param boolean whether to force an exact count
+ * @param string $db the current database name
+ * @param string $table the current table name
+ * @param bool $force_exact whether to force an exact count
+ * @param bool $is_view
*
* @return mixed the number of records if "retain" param is true,
* otherwise true
- *
- * @access public
*/
static public function countRecords($db, $table, $force_exact = false, $is_view = null)
{
@@ -504,7 +496,25 @@ class PMA_Table
} // end of the 'PMA_Table::countRecords()' function
/**
+ * Generates column specification for ALTER syntax
+ *
* @see PMA_Table::generateFieldSpec()
+ * @param string $oldcol old column name
+ * @param string $newcol new column name
+ * @param string $type type ('INT', 'VARCHAR', 'BIT', ...)
+ * @param string $length length ('2', '5,2', '', ...)
+ * @param string $attribute
+ * @param string $collation
+ * @param bool|string $null with 'NULL' or 'NOT NULL'
+ * @param string $default_type whether default is CURRENT_TIMESTAMP,
+ * NULL, NONE, USER_DEFINED
+ * @param string $default_value default value for USER_DEFINED default type
+ * @param string $extra 'AUTO_INCREMENT'
+ * @param string $comment field comment
+ * @param array &$field_primary list of fields for PRIMARY KEY
+ * @param string $index
+ * @param mixed $default_orig
+ * @return string field specification
*/
static public function generateAlter($oldcol, $newcol, $type, $length,
$attribute, $collation, $null, $default_type, $default_value,
@@ -519,19 +529,15 @@ class PMA_Table
/**
* Inserts existing entries in a PMA_* table by reading a value from an old entry
*
- * @param string The array index, which Relation feature to check
- * ('relwork', 'commwork', ...)
- * @param string The array index, which PMA-table to update
- * ('bookmark', 'relation', ...)
- * @param array Which fields will be SELECT'ed from the old entry
- * @param array Which fields will be used for the WHERE query
- * (array('FIELDNAME' => 'FIELDVALUE'))
- * @param array Which fields will be used as new VALUES. These are the important
- * keys which differ from the old entry.
- * (array('FIELDNAME' => 'NEW FIELDVALUE'))
-
- * @global string relation variable
- *
+ * @global relation variable
+ * @param string $work The array index, which Relation feature to check ('relwork', 'commwork', ...)
+ * @param string $pma_table The array index, which PMA-table to update ('bookmark', 'relation', ...)
+ * @param array $get_fields Which fields will be SELECT'ed from the old entry
+ * @param array $where_fields Which fields will be used for the WHERE query (array('FIELDNAME' => 'FIELDVALUE'))
+ * @param array $new_fields Which fields will be used as new VALUES. These are the important
+ * keys which differ from the old entry.
+ * (array('FIELDNAME' => 'NEW FIELDVALUE'))
+ * @return int|true
*/
static public function duplicateInfo($work, $pma_table, $get_fields, $where_fields,
$new_fields)
@@ -603,6 +609,14 @@ class PMA_Table
/**
* Copies or renames table
*
+ * @param $source_db
+ * @param $source_table
+ * @param $target_db
+ * @param $target_table
+ * @param $what
+ * @param $move
+ * @param $mode
+ * @return bool
*/
static public function moveCopy($source_db, $source_table, $target_db, $target_table, $what, $move, $mode)
{
@@ -1008,10 +1022,10 @@ class PMA_Table
/**
* renames table
*
- * @param string new table name
- * @param string new database name
- * @param boolean is this for a VIEW rename?
- * @return boolean success
+ * @param string $new_name new table name
+ * @param string $new_db new database name
+ * @param bool $is_view is this for a VIEW rename?
+ * @return bool success
*/
function rename($new_name, $new_db = null, $is_view = false)
{
@@ -1141,14 +1155,14 @@ class PMA_Table
* returns an array with all columns with unqiue content, in fact these are
* all columns being single indexed in PRIMARY or UNIQUE
*
- * f.e.
+ * e.g.
* - PRIMARY(id) // id
* - UNIQUE(name) // name
* - PRIMARY(fk_id1, fk_id2) // NONE
* - UNIQUE(x,y) // NONE
*
*
- * @param boolean whether to quote name with backticks ``
+ * @param bool $backquoted whether to quote name with backticks ``
* @return array
*/
public function getUniqueColumns($backquoted = true)
@@ -1172,9 +1186,10 @@ class PMA_Table
*
* returns an array with all columns make use of an index, in fact only
* first columns in an index
+ *
+ * e.g. index(col1, col2) would only return col1
*
- * f.e. index(col1, col2) would only return col1
- * @param boolean whether to quote name with backticks ``
+ * @param bool $backquoted whether to quote name with backticks ``
* @return array
*/
public function getIndexedColumns($backquoted = true)
@@ -1195,7 +1210,7 @@ class PMA_Table
*
* returns an array with all columns
*
- * @param boolean whether to quote name with backticks ``
+ * @param bool $backquoted whether to quote name with backticks ``
* @return array
*/
public function getColumns($backquoted = true)
@@ -1240,7 +1255,6 @@ class PMA_Table
/**
* Save this table's UI preferences into phpMyAdmin database.
*
- *
* @return true|PMA_Message
*/
protected function saveUiPrefsToDb()
@@ -1385,6 +1399,7 @@ class PMA_Table
* Remove a property from UI preferences.
*
* @param string $property
+ * @return true|PMA_Message
*/
public function removeUiProp($property)
{
@@ -1399,6 +1414,7 @@ class PMA_Table
return $this->saveUiprefsToDb();
}
}
+ return true;
}
}
?>
hooks/post-receive
--
phpMyAdmin
[View Less]