diff options
author | Madhura Jayaratne <madhura.cj@gmail.com> | 2012-06-02 22:00:57 +0400 |
---|---|---|
committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2012-06-02 22:00:57 +0400 |
commit | bff981f893aa9537f11e530b547761c965ddda42 (patch) | |
tree | a0aa852959363bf727e92a0293b295b61004ab86 /libraries | |
parent | 955ad7c695ad53e5e18c1a0ca50c99dda44b2f67 (diff) |
Wrap some long lines
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/transformations.lib.php | 35 | ||||
-rw-r--r-- | libraries/user_preferences.inc.php | 4 |
2 files changed, 25 insertions, 14 deletions
diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index e187d44757..a6517df8ce 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -6,10 +6,12 @@ * This file also provides basic functions to use in other plungins! * These are declared in the 'GLOBAL Plugin functions' section * - * Please use short and expressive names. For now, special characters which aren't allowed in + * Please use short and expressive names. + * For now, special characters which aren't allowed in * filenames or functions should not be used. * - * Please provide a comment for your function, what it does and what parameters are available. + * Please provide a comment for your function, + * what it does and what parameters are available. * * @package PhpMyAdmin */ @@ -18,7 +20,8 @@ if (! defined('PHPMYADMIN')) { } /** - * returns array of options from string with options separated by comma, removes quotes + * Returns array of options from string with options separated by comma, + * removes quotes * * <code> * PMA_transformation_getOptions("'option ,, quoted',abd,'2,3',"); @@ -187,7 +190,9 @@ function PMA_getMIME($db, $table, $strict = false) AND ( `mimetype` != \'\'' . (!$strict ? ' OR `transformation` != \'\' OR `transformation_options` != \'\'' : '') . ')'; - return PMA_DBI_fetch_result($com_qry, 'column_name', null, $GLOBALS['controllink']); + return PMA_DBI_fetch_result( + $com_qry, 'column_name', null, $GLOBALS['controllink'] + ); } // end of the 'PMA_getMIME()' function /** @@ -275,14 +280,14 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, * in $buffer, after performing a regular expression search and replace on * $buffer using $options['regex'] and $options['regex_replace']. * - * @param string $buffer text that will be replaced in $options['string'], - * after being formatted - * @param array $options the options required to format $buffer - * = array ( - * 'string' => 'string', // text containing "[__BUFFER__]" - * 'regex' => 'mixed', // the pattern to search for - * 'regex_replace' => 'mixed', // string or array of strings to replace with - * ); + * @param string $buffer text that will be replaced in $options['string'], + * after being formatted + * @param array $options the options required to format $buffer + * = array ( + * 'string' => 'string', // text containing "[__BUFFER__]" + * 'regex' => 'mixed', // the pattern to search for + * 'regex_replace' => 'mixed', // string or array of strings to replace with + * ); * * @return string containing the text with all the replacements */ @@ -293,7 +298,11 @@ function PMA_transformation_global_html_replace($buffer, $options = array()) } if (isset($options['regex']) && isset($options['regex_replace'])) { - $buffer = preg_replace('@' . str_replace('@', '\@', $options['regex']) . '@si', $options['regex_replace'], $buffer); + $buffer = preg_replace( + '@' . str_replace('@', '\@', $options['regex']) . '@si', + $options['regex_replace'], + $buffer + ); } // Replace occurences of [__BUFFER__] with actual text diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index be6f97a11e..50398ceac9 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -65,6 +65,8 @@ $msg->display(); $cfgRelation = PMA_getRelationsParam(); if (! $cfgRelation['userconfigwork']) { $msg = __('Your preferences will be saved for current session only. Storing them permanently requires %sphpMyAdmin configuration storage%s.'); - $msg = PMA_sanitize(sprintf($msg, '[a@./Documentation.html#linked-tables@_blank]', '[/a]')); + $msg = PMA_sanitize( + sprintf($msg, '[a@./Documentation.html#linked-tables@_blank]', '[/a]') + ); PMA_Message::notice($msg)->display(); } |