[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1381-g3ca8237
Marc Delisle
lem9 at users.sourceforge.net
Mon Apr 5 15:16:44 CEST 2010
The branch, master has been updated
via 3ca82375d57cb84e37064c82e4291f06b5e4cce6 (commit)
from 6b5f3b996201be64d344eded98db712aefa53417 (commit)
- Log -----------------------------------------------------------------
commit 3ca82375d57cb84e37064c82e4291f06b5e4cce6
Author: Marc Delisle <marc at infomarc.info>
Date: Mon Apr 5 09:16:36 2010 -0400
continue removing author names in code
-----------------------------------------------------------------------
Summary of changes:
config.sample.inc.php | 2 +-
db_structure.php | 4 ++--
libraries/File.class.php | 6 +++---
libraries/common.inc.php | 8 ++++----
libraries/common.lib.php | 2 +-
libraries/config.default.php | 2 +-
libraries/core.lib.php | 2 +-
libraries/display_tbl.lib.php | 2 +-
tbl_change.php | 3 +--
tbl_replace.php | 2 +-
10 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/config.sample.inc.php b/config.sample.inc.php
index b886ff3..f61b648 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -36,7 +36,7 @@ $cfg['Servers'][$i]['compress'] = false;
$cfg['Servers'][$i]['extension'] = 'mysql';
$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
+/* for blobstreaming */
$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
diff --git a/db_structure.php b/db_structure.php
index 479980e..6bcc3bd 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -151,7 +151,7 @@ $hidden_fields = array();
$odd_row = true;
$sum_row_count_pre = '';
-// added by rajk - for blobstreaming
+// for blobstreaming
$PMA_Config = $GLOBALS['PMA_Config'];
if (!empty($PMA_Config))
@@ -473,7 +473,7 @@ if ($is_show_stats) {
<th align="center" nowrap="nowrap">
<?php
// for blobstreaming - if the number of tables is 0, set tableReductionCount to 0
- // (we don't want negative numbers here) - rajk
+ // (we don't want negative numbers here)
if ($num_tables == 0)
$tableReductionCount = 0;
diff --git a/libraries/File.class.php b/libraries/File.class.php
index 312f1f8..8f77fe4 100644
--- a/libraries/File.class.php
+++ b/libraries/File.class.php
@@ -283,7 +283,7 @@ class PMA_File
$file = PMA_File::fetchUploadedFromTblChangeRequestMultiple($file, $primary);
}
- // rajk - for blobstreaming
+ // for blobstreaming
$is_bs_upload = FALSE;
// check if this field requires a repository upload
@@ -491,7 +491,7 @@ class PMA_File
if (! empty($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary])
&& is_string($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary])) {
// ... whether with multiple rows ...
- // rajk - for blobstreaming
+ // for blobstreaming
$is_bs_upload = FALSE;
// check if this field requires a repository upload
@@ -631,7 +631,7 @@ class PMA_File
}
} elseif (! empty($_REQUEST['fields_uploadlocal_' . $key])
&& is_string($_REQUEST['fields_uploadlocal_' . $key])) {
- // rajk - for blobstreaming
+ // for blobstreaming
$is_bs_upload = FALSE;
// check if this field requires a repository upload
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index b190f12..e37e288 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -471,9 +471,9 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
'pma_lang', 'pma_charset', 'pma_collation_connection',
/* Possible login form */
'pma_servername', 'pma_username', 'pma_password',
- /* rajk - for playing blobstreamable media */
+ /* for playing blobstreamable media */
'media_type', 'custom_type', 'bs_reference',
- /* rajk - for changing BLOB repository file MIME type */
+ /* for changing BLOB repository file MIME type */
'bs_db', 'bs_table', 'bs_ref', 'bs_new_mime_type'
);
/**
@@ -966,10 +966,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
unset($_SESSION['profiling']);
}
- // rajk - library file for blobstreaming
+ // library file for blobstreaming
require_once './libraries/blobstreaming.lib.php';
- // rajk - checks for blobstreaming plugins and databases that support
+ // checks for blobstreaming plugins and databases that support
// blobstreaming (by having the necessary tables for blobstreaming)
if (checkBLOBStreamingPlugins()) {
checkBLOBStreamableDatabases();
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index d99793a..f161013 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -793,7 +793,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
$table_groups = array();
- // for blobstreaming - list of blobstreaming tables - rajk
+ // for blobstreaming - list of blobstreaming tables
// load PMA configuration
$PMA_Config = $GLOBALS['PMA_Config'];
diff --git a/libraries/config.default.php b/libraries/config.default.php
index d73bec7..377d828 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -138,7 +138,7 @@ $cfg['Servers'][$i]['connect_type'] = 'tcp';
*/
$cfg['Servers'][$i]['extension'] = 'mysql';
-/* rajk - added for blobstreaming */
+/* added for blobstreaming */
$cfg['Servers'][$i]['bs_garbage_threshold'] = '';
$cfg['Servers'][$i]['bs_repository_threshold'] = '';
$cfg['Servers'][$i]['bs_temp_blob_timeout'] = '';
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 88e5fb6..69a6aaf 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -298,7 +298,7 @@ function PMA_getTableCount($db)
$num_tables = PMA_DBI_num_rows($tables);
// for blobstreaming - get blobstreaming tables
- // for use in determining if a table here is a blobstreaming table - rajk
+ // for use in determining if a table here is a blobstreaming table
// load PMA configuration
$PMA_Config = $GLOBALS['PMA_Config'];
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 13eb093..4e2ccc5 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1278,7 +1278,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
if (!isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = ' <td align="right"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n";
} else {
- // rajk - for blobstreaming
+ // for blobstreaming
$bs_reference_exists = $allBSTablesExist = FALSE;
diff --git a/tbl_change.php b/tbl_change.php
index 263e4ab..cbeda52 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -818,7 +818,7 @@ foreach ($rows as $row_id => $vrow) {
if (($cfg['ProtectBinary'] && $field['is_blob'])
|| ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) {
echo "\n";
- // rajk - for blobstreaming
+ // for blobstreaming
$bs_reference_exists = FALSE;
if (isset ($tbl_type) && strlen ($tbl_type) > 0)
@@ -917,7 +917,6 @@ foreach ($rows as $row_id => $vrow) {
// (displayed whatever value the ProtectBinary has)
if ($is_upload && $field['is_blob']) {
- // added by rajk
// check if field type is of longblob
if ($field['pma_type'] == "longblob")
{
diff --git a/tbl_replace.php b/tbl_replace.php
index 5e7b977..39bf6a2 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -226,7 +226,7 @@ foreach ($loop_array as $rowcount => $where_clause) {
require './libraries/tbl_replace_fields.inc.php';
- // rajk - for blobstreaming
+ // for blobstreaming
if ($blob_streaming_active && (NULL != $primary_field || strlen($primary_field) > 0)) {
$remove_blob_repo = isset($_REQUEST['remove_blob_repo_' . $key]) ? $_REQUEST['remove_blob_repo_' . $key] : NULL;
$upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : NULL;
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list