Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
This commit is contained in:
Madhura Jayaratne
commit
566caa5143
585
ChangeLog
585
ChangeLog
@ -122,594 +122,9 @@ phpMyAdmin - ChangeLog
|
||||
- issue [Security] Full path disclosure vulnerability in SQL parser, see PMASA-2016-8
|
||||
- issue [Security] XSS vulnerability in SQL editor, see PMASA-2016-9
|
||||
|
||||
4.5.3.1 (2015-12-25)
|
||||
- issue #11774 Undefined offset 2
|
||||
- issue [Security] Path disclosure, see PMASA-2015-6
|
||||
|
||||
4.5.3.0 (2015-12-23)
|
||||
- issue #11744 Incomplete results of UNION ALL
|
||||
- issue #11742 MATCH AGAINST keywords not recognized
|
||||
- issue #11723 syntax verifier is not knowing "STRAIGHT_JOIN"
|
||||
- issue #11699 REPLACE() function confused with REPLACE statement
|
||||
- issue #11690 FLUSH word not recognized by parser
|
||||
- issue #11664 Online syntax verifier bug - "IF" on SELECT statement
|
||||
- issue #11665 Format breaks query with COUNT()
|
||||
- issue Undefinex index: SendErrorReports
|
||||
- issue Incorrect script name in include
|
||||
- issue #11685 Warning: Invalid argument supplied for foreach()
|
||||
- issue #11687 Delimiter missing while exporting multiple db routines
|
||||
- issue #11684 mysql_native_password with MariaDB bug
|
||||
- issue #11693 Flush privileges overusage - related to #11597
|
||||
- issue #11691 Query was empty on creating User in 4.5.2
|
||||
- issue #11695 PMA_getDataForDeleteUsers() warning
|
||||
- issue #11698 Cannot create user on Percona Server
|
||||
- issue Properly report error on connecting
|
||||
- issue #11706 Database export template not saving compression option
|
||||
- issue #11721 Fix single quote export for servers in ANSI_QUOTES mode
|
||||
- issue #11714 Avoid duplicite fetching of table information
|
||||
- issue #11724 Temporary fix for live data edit of big sets is not working
|
||||
- issue IE 8 compatibility in console
|
||||
- issue #11732 Exporting feature does not work with union table
|
||||
- issue #11679 Cannot export results of some queries
|
||||
- issue #11720 Message "An account already exists..." incorrectly displayed
|
||||
- issue #11758 Missing quoting of table in ALTER CONVERT query
|
||||
- issue #11752 PMA 4.5.2 breaks MySQL Master-Master Cluster
|
||||
- issue #11757 Export and preview show different SQL for character set
|
||||
- issue #11749 Fix possible undefined variables in table operations
|
||||
|
||||
4.5.2.0 (2015-11-23)
|
||||
- issue #11589 Incorrect parameter in mysqli_fetch_fields()
|
||||
- issue #11592 Missing headers in zipped export
|
||||
- issue #11590 Parser: Array to string conversion
|
||||
- issue #11597 Huge binary log growth on 4.5.x
|
||||
- issue #11594 'only_db' config option bug when db names contain underscore and are grouped
|
||||
- issue #11607 Unable to change password from Login information tab
|
||||
- issue #11610 Undefined variable: res_rel
|
||||
- issue #11611 Warning while exporting schema to PDF
|
||||
- issue #11612 Undefined index: new_row_format
|
||||
- issue #11605 Changing hostname kills password
|
||||
- issue #11614 Undefined variable: db
|
||||
- issue #11627 CREATE TABLE/INSERT INTO executed twice (ctrl+enter)
|
||||
- issue #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given
|
||||
- issue #11632 Exporting GIS visualization ignores start and row count
|
||||
- issue #11476 Errors instead of git info when PHP has no gzip support
|
||||
- issue #11633 CodeMirror tooltip shows below modal window
|
||||
- issue #11639 Bug with the MainBackground Color
|
||||
- issue Profiling checkbox is missing
|
||||
- issue #11642 Properly handle session expiry after POST requests
|
||||
- issue #11648 Notice in ./export.php#214 Undefined index: quick_or_custom
|
||||
- issue #11646 Unrecognized keywords
|
||||
- issue #11635 Sql not executed properly
|
||||
- issue #11631 Linter warnings when creating new user
|
||||
- issue #11626 wrong row count for query results
|
||||
- issue #11608 Analyzer doesn't recognize GRANT statements
|
||||
- issue #11602 Parser warnings (subqueries)
|
||||
- issue #11658 Collation column is empty in table Structure
|
||||
- issue #11661 Error changing table's column encoding
|
||||
|
||||
4.5.1.0 (2015-10-23)
|
||||
- issue Invalid argument supplied for foreach()
|
||||
- issue array_key_exists() expects parameter 2 to be array
|
||||
- issue #11480 Notice Undefined index: drop_database
|
||||
- issue #11486 Server variable edition in ANSI_QUOTES sql_mode: losing current value
|
||||
- issue #11491 Propose table structure broken
|
||||
- issue #11464 phpMyAdmin suggests upgrading to newer version not usable on that system
|
||||
- issue #11495 'PMA_Microhistory' is undefined
|
||||
- issue #11496 Incorrect definition for getTablesWhenOpen()
|
||||
- issue #11500 Error when creating new user on MariaDB 10.0.21
|
||||
- issue #11505 Notice on htmlspecialchars()
|
||||
- issue Notice in Structure page of views
|
||||
- issue #11510 AUTO_INCREMENT always exported when IF NOT EXISTS is on
|
||||
- issue #11516 Some partitions are missing in copied table
|
||||
- issue #11521 Notice of undefined variable when performing SHOW CREATE
|
||||
- issue #11509 Error exporting sql query results with table alias
|
||||
- issue #11512 SQL editing window does not recognise 'OUTER' keyword in 'LEFT OUTER JOIN'
|
||||
- issue #11518 "NOT IN" clause not recognized (MySQL 5.6 and 5.7)
|
||||
- issue #11524 Yellow star does not change in database Structure after add/remove from favorites
|
||||
- issue #11531 Invalid SQL in table definition when exporting table
|
||||
- issue #11526 Foreign key to other database's tables fails
|
||||
- issue #11519 Bug while exporting results when a joined table field name is in SELECT query
|
||||
- issue #11522 Strange behavior on table rename
|
||||
- issue #11539 Rename table does not result in refresh in left panel
|
||||
- issue #11541 Missing arguments for PMA_Table::generateAlter()
|
||||
- issue #11544 Notices about undefined indexes on structure pages of information_schema tables
|
||||
- issue Change minimum PHP version for Composer
|
||||
- issue #11542 Import parser and backslash
|
||||
- issue #11546 "Visualize GIS data" seems to be broken
|
||||
- issue #11548 Confirm box on "Reset slave" option
|
||||
- issue Fix cookies clearing on version change
|
||||
- issue #11558 Cannot execute SQL with subquery
|
||||
- issue #11520 Incorrect syntax creating a user using mysql_native_password with MariaDB
|
||||
- issue #11561 Cannot use third party auth plugins
|
||||
|
||||
4.5.0.2 (2015-09-25)
|
||||
- issue #11497 Incorrect indexes when exporting
|
||||
|
||||
4.5.0.1 (2015-09-24)
|
||||
- issue #11492 AUTO_INCREMENT statements are partly missing from exports
|
||||
|
||||
4.5.0.0 (2015-09-23)
|
||||
+ rfe Pagination for GIS visualization
|
||||
+ issue #6207 Usability improvements for console
|
||||
+ issue #6310 Access to Add columns text-box and Go button when creating table
|
||||
+ issue #6007 Add lock tables, disable keys options
|
||||
+ issue #6306 Additional page locking
|
||||
+ issue #6314 Support MySQL 5.7 syntax for password change
|
||||
+ issue #6319 Display/edit index name
|
||||
+ issue #6318 Toggle autocomplete of table and column names
|
||||
+ issue #5633 Manage multiple variable in bookmarked query
|
||||
+ issue #5642 Show edit/delete also when there is calculated column
|
||||
+ issue #6313 Show databases as list instead of as dropdown when no database is selected
|
||||
+ rfe Optional dark theme for the console
|
||||
+ issue #5053 PDF schema sort options
|
||||
+ issue #5543 Structure in PDF export
|
||||
+ issue #6327 Have ZeroConf create phpmyadmin DB if possible
|
||||
+ issue #5462 Warning before silent data conversion/truncation
|
||||
+ issue #6338 Support a default page in designer
|
||||
+ issue #6339 Allow copying mutiple rows
|
||||
+ issue #6334 No SQL query for loading data
|
||||
+ issue #6341 New data validation feature and datetime type
|
||||
+ issue #6324 Importing and exporting pMA meta-data
|
||||
+ issue #6330 Add grouping to stored procedures in the navigation tree
|
||||
+ issue #6275 Support IPv6 browser transformation
|
||||
+ rfe Option groups for 'With selected' dropdown in database structure page
|
||||
+ issue #6347 Support CHECKSUM TABLE operation
|
||||
+ issue #6088 Support for Paramaters with raw SQL
|
||||
+ issue #5844 Show original size of truncated columns
|
||||
+ issue #6114 Explain analyzer
|
||||
+ issue #6186 Add "Drop partition" option to partition tools
|
||||
+ issue #6354 Procedures window shift-click should select multiple rows
|
||||
+ issue #6355 Designer: "Sticky" menu option
|
||||
+ issue #6357 Directly show table comments in structure view
|
||||
+ issue #6259 Page-related settings
|
||||
+ issue #5356 Alter privileges when renaming or copying a database
|
||||
- issue #11256 Slowness due to large number of routines
|
||||
- issue #11258 GROUP_CONCAT shown as GROUPBY_CONCAT in CodeMirror autocomplete
|
||||
+ issue #5946 Work with --skip-grant-tables
|
||||
- issue #11266 "Sort by key" drop-down value is lost
|
||||
+ issue #6287 Browse: improve display of right-aligned data
|
||||
- issue #11265 Textarea rows settings ignored Features > Text fields
|
||||
+ issue #6358 MIME types should be lower case
|
||||
- issue #11226 Drop table doesn't remove the table name from navigation bar
|
||||
+ issue #6360 MySQL and MariaDB functions INET6_ATON and INET6_NTOA
|
||||
- bug Link to get real row counts of all the views in a db, at once
|
||||
- issue #11275 Drizzle version numbers
|
||||
+ issue #5400 Rewrite print view using CSS; fixes print view failures on multi-query statements
|
||||
+ issue #6362 Support spatial indexes in table create form
|
||||
+ issue #6068 Use CTRL or ALT plus arrow keys for navigation in grid editor
|
||||
+ rfe Remove support for Shift + Click on function name to apply to all rows in insert/edit page
|
||||
+ issue #6326 Don't group tables in tree if the result has only one group
|
||||
- issue #11287 When hide table structure actions is false, action should be in a row
|
||||
+ issue #5425 Batch changing the collation of each column in a table
|
||||
- issue #10918 QBE generates wrong query
|
||||
+ issue #6292 Use plain English descriptors instead of script names for icon link destinations
|
||||
+ issue #6239 Disable foreign key checks for some operations
|
||||
- issue #11296 "With selected" links doesn't work in table browse
|
||||
- issue #11166 Query builder: missing joint for the intermediary table
|
||||
+ issue #6251 Integrate SQL debugging into console
|
||||
- issue #11061 Improve/restore non-unique index row editing
|
||||
- issue #11301 MySQL errors are not shown when DebugSQL is enabled
|
||||
+ issue #5037 One file per table and one file per database export option
|
||||
+ issue #5759 Designer settings should be part of saved state
|
||||
+ issue #6257 Option to remove functions, procedures, etc., from navigation tree
|
||||
+ issue #5388 Column privileges and update
|
||||
+ issue #6231 Cant use external config file
|
||||
+ issue #6252 CSV import: Allow "Columns escaped with" to be optional
|
||||
+ issue #6262 Being able to use multiple servers at the same time when using cookie auth
|
||||
+ issue #6301 select structure or data for each table when exporting
|
||||
- issue #11261 Autocomplete completes the original table name when joining multiple aliased tables
|
||||
+ rfe Remove configuration storage data related to a user upon deleting the user
|
||||
+ issue #6298 Improved processlist for mariadb
|
||||
+ issue #6300 Warn about "Any user" potential problem
|
||||
+ issue #6368 Hide/disable edit links for read-only variables
|
||||
+ issue #6365 Human readable/writable URLs (html5 api)
|
||||
+ rfe Support virtual columns in MySQL 5.7.5+
|
||||
+ issue #6215 Support for virtual/persistent columns in MariaDB
|
||||
- issue #11314 Undefined <feature>work upon upgrade to new version
|
||||
- issue #1817 Creating configuration storage tables fail in MySQL 5.7
|
||||
- issue #6118 Parser does not handle nested selects
|
||||
- issue #5437 Support SELECT ... FROM DUAL
|
||||
- issue #4962 Support UNION
|
||||
- issue #11322 Missing null checkbox when grid editing a null cell
|
||||
+ Upgrade TCPDF to version 6.2.9
|
||||
+ issue #6102 Add SHA256 security password support
|
||||
- issue #10250 Displayed git revision info is not set
|
||||
+ Improved schema SVG export
|
||||
- issue #10726 Do not try to set port 80 for https requests
|
||||
+ issue #11394 Export/import Designer view
|
||||
+ Partition support in table Structure
|
||||
+ issue #11414 Unclear export options / organization / hierarchy
|
||||
Set minimum required PHP version to 5.5 (older versions are EOL)
|
||||
- issue #11407 ALTER TABLE failing on import when table exists
|
||||
- issue Do not export `sys` database when exporting server
|
||||
- issue #11436 CREATE DATABASE should be enabled by default on server exports
|
||||
- issue #11442 MySQL 5.7 and SHOW VARIABLES
|
||||
- issue #11445 MySQL 5.7 and Status page for an unprivileged user
|
||||
- issue #11448 Clarify doc about the MemoryLimit directive
|
||||
- issue #11489 Cannot copy a database under certain conditions
|
||||
|
||||
4.4.15.1 (2015-10-23)
|
||||
- issue #11464 phpMyAdmin suggests upgrading to newer version not usable on that system
|
||||
- issue [security] Content spoofing on url.php
|
||||
|
||||
4.4.15.0 (2015-09-20)
|
||||
- issue #11411 Undefined "replace" function on numeric scalar
|
||||
- issue #11421 Stored-proc / routine - broken parameter parsing
|
||||
- issue Missing name for configuration read_as_multibytes
|
||||
- issue #11431 Incorrect "No row selected" message
|
||||
- issue #11447 MySQL 5.5 and the language system variable
|
||||
- issue #11452 Semantics of export and import icons are mixed up
|
||||
- issue #11451 Designer-Bug in move.js on multiple server configuration
|
||||
- issue #11458 Invalid UTF-8 sequence in argument
|
||||
- issue #11457 Request URI too large
|
||||
- issue Invalid argument supplied for foreach()
|
||||
- issue #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled
|
||||
- issue #11487 Warning when entering Query page
|
||||
|
||||
4.4.14.1 (2015-09-08)
|
||||
- issue [security] reCaptcha bypass
|
||||
|
||||
4.4.14.0 (2015-08-20)
|
||||
- issue #11367 Export after search, missing WHERE clause
|
||||
- issue #11380 Incomplete message after import
|
||||
- issue Incorrect scalar type declaration (reported under PHP 7)
|
||||
- issue #11389 ReCaptcha produces deprecated messages under PHP 7
|
||||
- issue #11387 phpseclib < 2.0 produces deprecated messages on PHP 7
|
||||
- issue #11404 "Switch to copied table" doesn't work
|
||||
- issue #11406 Missing quotes after calling "distinct values"
|
||||
- issue #11386 Cannot import database with long data in one column
|
||||
- issue #11410 SPATIAL index option is not clickable
|
||||
|
||||
4.4.13.1 (2015-08-08)
|
||||
- issue #11368 SQL error when importing phpMyAdmin dump file
|
||||
|
||||
4.4.13.0 (2015-08-07)
|
||||
- issue #1808 "Improve table structure" generates invalid SQL
|
||||
- issue Once checked "Show only active" checkbox is always checked
|
||||
- issue #1813 Delete rows using "Check All" is broken
|
||||
- issue Fix PHP 7 possible binding ambiguity
|
||||
- issue #11326 Exported schema includes all the tables of the database
|
||||
- issue #11339 Results not displayed if query ends in delimiter and comment
|
||||
- issue #11320 Live edit of data fields is not working always
|
||||
- issue Table list in navigation collapses when entering into a table in another page
|
||||
- issue #11364 JS error while trying to auto navigate to db structure page when db creation has failed
|
||||
|
||||
4.4.12.0 (2015-07-20)
|
||||
- bug Saved chart image does not have a proper name or an extension
|
||||
- bug #4976 Timepicker CSS issues in Original theme
|
||||
- bug #4975 Move/Copy/Rename operations on Table/Db fail on Drizzle server
|
||||
- bug #4826 Two inline edit windows
|
||||
- bug #4979 Problem when import *.ods file
|
||||
- bug Add missing head tag
|
||||
- bug #4985 Column headers move when scrolling
|
||||
|
||||
4.4.11.0 (2015-07-06)
|
||||
- bug Missing selected/entered values when editing active options in visual query builder
|
||||
- bug #4969 Autoload from prefs_storage not behaving properly
|
||||
- bug #4972 Incorrect length computed for binary data
|
||||
- bug Remove character set from create_tables_drizzle.sql
|
||||
- bug #4973 Users overview needs clarification
|
||||
- bug #4974 Creating a database from console doesn't update navigation panel
|
||||
- bug #4844 FAQ 1.17 needs an update
|
||||
|
||||
4.4.10.0 (2015-06-17)
|
||||
- bug #4950 Issues in database selection for replication
|
||||
- bug #4951 Trying to save chart as image crashes the browser
|
||||
- bug #4953 cant drag sql.gz file onto import input
|
||||
- bug #4960 Table creation results in GET request with missing server parameter that invalidates the session
|
||||
- bug #4961 Javascript error when Designer is opened
|
||||
- bug #4962 Insert by foreign key scrolls page to top
|
||||
- bug #4955 Clicking on the navi logo does not always work
|
||||
- bug External URL for $cfg['NavigationLogoLink'] causes JavaScript error when clicked
|
||||
|
||||
4.4.9.0 (2015-06-04)
|
||||
- bug #4920 relation view doesn't list fields of table in other database
|
||||
- bug #4905 Sorting by an alias
|
||||
- bug #4931 False error before entering reCAPTCHA
|
||||
- bug #4909 central column with multiple server
|
||||
- bug #4937 Custom export with backquotes off is not working
|
||||
- bug #4908 Reverse proxy: infinite internal redirect (added warning in doc)
|
||||
- bug #4942 Export to gzip saves plain text under Chrome
|
||||
|
||||
4.4.8.0 (2015-05-28)
|
||||
- bug Allow accessing visual query builder when pmadb is not configured
|
||||
- bug #4893 Nav tree line alignment issue
|
||||
- bug #4911 Lock page icon is not shown after fresh reload
|
||||
- bug #4912 "Highlight pointer" and "Row marker" doesn't work properly
|
||||
- bug Browse foreigners window goes out of the window
|
||||
- bug #4918 Date field popup dialog position bug
|
||||
- bug In /setup, PMA_messages is not defined
|
||||
- bug #4924 Recaptcha failure
|
||||
- bug #4930 Database copy doesn't work for tables with more than one FULLTEXT index
|
||||
- bug #4929 Edit view structure doesn't load the algorithm
|
||||
- bug #4923 Do not limit table comments to 60 characters
|
||||
|
||||
4.4.7.0 (2015-05-16)
|
||||
- bug #4876 Settings issues (Favorite tables shown twice in Settings)
|
||||
- bug #4896 Non-styled error page when following results link
|
||||
- bug #4894 Deleting without confirmation
|
||||
- bug #4858 Issues with SQL autocomplete
|
||||
- bug #4897 Column hint in SQL autocomplete is sometimes not shown
|
||||
- bug #4898 JS error after selecting a field and press Enter
|
||||
- bug Honor proxy settings when getting Git commit information
|
||||
- bug Missing title on link
|
||||
- bug #4512 ForceSSL Redirect Check
|
||||
- bug Undefined index collation_connection
|
||||
- bug Error when the reporting server is down
|
||||
- bug Escape database and table names for partition maintenance
|
||||
- bug Invalid value for CURLOPT_SSL_VERIFYPEER
|
||||
- bug #4367 Import status infinite loop
|
||||
- bug #4902 Designer: Loading does not work
|
||||
- bug #4904 Setup: Overview > Display does not work
|
||||
- bug #4906 Designer: pages from all databases
|
||||
|
||||
4.4.6.1 (2015-05-13)
|
||||
- bug #4899 [security] CSRF vulnerability in setup
|
||||
- bug #4900 [security] Vulnerability allowing man-in-the-middle attack
|
||||
|
||||
4.4.6.0 (2015-05-07)
|
||||
- bug #4890 webkitStorageInfo and webkitIndexedDB is deprecated
|
||||
- bug #4892 Undefined variable: unique_conditions
|
||||
- bug #4891 CSV Import ignores "Replace table data with file" checkbox
|
||||
|
||||
4.4.5.0 (2015-05-05)
|
||||
- bug Table overhead stats: missing space before the unit
|
||||
- bug Fix resize icon in Designer
|
||||
- bug #4879 Exit fullscreen in Designer does not change the button text
|
||||
- bug #4880 Designer icons missing when using original theme
|
||||
- bug #4878 Column list of central columns is not cleared
|
||||
- bug #4881 jQuery dialogs of the Designer are not displayed in fullscreen
|
||||
- bug #4883 Search function breaks when searching for certain combinations of backslashes and slashes
|
||||
- bug #4830 Maximum execution time exceeded in Util.class.php (better fix)
|
||||
- bug #4885 Some icons are above the overlay of jQuery dialogs
|
||||
- bug #4886 Clicking on external links in advisor rules give JS error
|
||||
- bug #4888 Filter in central columns does not work in other languages
|
||||
|
||||
4.4.4.0 (2015-04-26)
|
||||
- bug #4863 Edit vs Change
|
||||
- bug #4859 Don't scroll (to bottom) when editing multiple rows
|
||||
- bug #4862 Misaligned Inline edit field
|
||||
- bug #4861 Use of undefined constant PMA_DRIZZLE
|
||||
- bug #4865 sprintf(): Too few arguments
|
||||
- bug #4866 Limit column ordering in index edit dialog
|
||||
- bug #4867 Incorrect ALTER TABLE statement generated
|
||||
- bug #4870 Inconsistency in 'Ignore' checkbox in insert page
|
||||
- bug #4869 Drop column action not asking to confirm
|
||||
- bug #4871 Error on creating table
|
||||
- bug Undefined index: Rows
|
||||
|
||||
4.4.3.0 (2015-04-20)
|
||||
- bug #4851 PHP errors in login dialogue
|
||||
- bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version
|
||||
- bug #4845 White screen (Cloudflare)
|
||||
- bug #4794 Server error viewing table content
|
||||
- bug Fix issues related to number of decimal places in time
|
||||
- bug #4853 Relation view between 1600 and 1780 px
|
||||
- bug PHP 7 compatibility in php-gettext
|
||||
- bug PHP 7 compatibility in bfShapeFiles
|
||||
- bug PHP 7 session_regenerate_id() warning
|
||||
- bug #4857 Alter table after changing column name error
|
||||
- bug #4830 Maximum execution time exceeded in Util.class.php
|
||||
|
||||
4.4.2.0 (2015-04-13)
|
||||
- bug #4835 PMA_hideShowConnection not called after submit_num_fields
|
||||
- bug #4836 Server warning after moving from console to direct clicks
|
||||
- bug #4837 Duplicate new version notification when using the "Back" button
|
||||
- bug #4839 DOC link in setting is broken
|
||||
- bug #4841 Status page: Mislukte pogingen per uur value is incorrect
|
||||
- bug MIME Transformation link fixed
|
||||
- bug #4838 Prevents console window from moving out of the screen height
|
||||
- bug #4829 Create procedure via SQL Editor not more possible
|
||||
- bug #4833 CSS and Javascript are not compressed
|
||||
- bug #4849 Functions accessed from navigation do not load on ajax dialog
|
||||
- bug #4850 Relation view on 1920
|
||||
|
||||
4.4.1.1 (2015-04-08)
|
||||
- bug #4846 Web server's error log is flooded
|
||||
|
||||
4.4.1.0 (2015-04-07)
|
||||
- bug #4813 MySQL 5.7.6 and the Users menu tab
|
||||
- bug #4818 MySQL 5.7.6 and changing the password for another user
|
||||
- bug #4819 Request URI too large
|
||||
- bug #4814 MySQL 5.7.6 and Databases
|
||||
- bug Use 'server' parameter in console to work in multi server environments
|
||||
- bug Missing tooltip in monitor
|
||||
- bug Missing sort icons in monitor
|
||||
- bug #4805 Inline edit broken when using functions in query
|
||||
- bug #4821 Timed-out import fails to restart when file represented
|
||||
- bug #4754 pMA DB not detected properly
|
||||
- bug #4825 Datepicker missing when changing number of rows on Insert page
|
||||
- bug #4824 INNODB STATUS page is empty
|
||||
- bug #4828 JavaScript is loaded in wrong order
|
||||
- bug #4827 TEXT formatting doesn't work after inline editing
|
||||
- bug #4822 Compress when php.ini output_buffering is active
|
||||
- bug #4832 Sorting distinct values result loses links
|
||||
- bug #4834 Do not attach token to css requests to improve caching
|
||||
|
||||
4.4.0.0 (2015-04-01)
|
||||
+ rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time
|
||||
+ rfe #1562 Allow tracking multiple table at once from database level tracking page
|
||||
+ rfe #1564 Improve action message on Tracking page
|
||||
+ rfe #1566 Change value of "Number of rows:" when "Show all" is checked
|
||||
+ rfe Focus console by clicking on white space
|
||||
+ rfe #1507 Part 1: Cycle through console history with keyboard up/down arrows
|
||||
+ rfe #1579 Default to primary key when adding relation
|
||||
+ rfe #1572 User prefs: Diff-friendly JSON for config
|
||||
+ rfe #1567 Sever Variables Table UI Improvements
|
||||
- bug #4675 phpMyAdmin should be able to work without 'examples' DIR - move SQL scripts to sql directory
|
||||
+ rfe #1578 Warn about reserved word only when a column is created
|
||||
+ rfe #1590 Recaptcha API v2
|
||||
+ rfe #1580 Individual Zeroconf PMA tables support
|
||||
+ rfe #1525 Generate keys one per line
|
||||
+ rfe #347 allow table with transformed column anywhere in FROM clause
|
||||
+ rfe #1591 Shortcut link to search page
|
||||
+ rfe #1568 Fold Add Column After / Before into dropdown
|
||||
- bug #4705 Table structure: adding primary key doesn't refresh page
|
||||
+ rfe #1582 SQL formatter
|
||||
+ rfe #1597 Fast filter improvement: remove "x other results found"
|
||||
- bug #4720 No error message on Missing extension mbstring
|
||||
+ rfe #801 Builtin transformations and relations
|
||||
+ rfe #767 USING BTREE support for HEAP/MEMORY tables
|
||||
+ rfe #1596 Make "Options > Relational" configurable
|
||||
+ rfe #719 More details in PDF relation view
|
||||
+ rfe #1096 Cannot enter connection for federated engine table
|
||||
+ rfe #954 Allow SALT in ENCRYPT function
|
||||
+ rfe #1260 Setting LoginCookieValidity > session.gc_maxlifetime
|
||||
+ rfe Transformation for JSON
|
||||
- bug Fix isCanvasSupported for new window
|
||||
+ rfe #1600 Clarify the "Inline" link
|
||||
+ rfe #1179 Speed up slow triggers by using EVENT_OBJECT_SCHEMA
|
||||
+ rfe #1192 ON DUPLICATE KEY UPDATE for loading CSV
|
||||
- bug Cannot execute command from console (multi-server installation)
|
||||
+ rfe #1208 linking from information_schema
|
||||
+ rfe #1235 Relation view: move to main "Structure" page
|
||||
+ rfe #1558 Designer menu with explicit text
|
||||
+ rfe #937 Relations with views like with tables
|
||||
+ rfe #1241 Browse Field -> Search
|
||||
+ rfe #723 Provide sanity check for table/column names (table names)
|
||||
+ rfe #1312 SessionTimeZone configuration directive
|
||||
- bug Add missing confirmation when deleting tracking report entries
|
||||
+ rfe Ability to disable foreign key check when emptying tables
|
||||
+ rfe #1549 Reset auto-increment when exporting structure
|
||||
+ rfe #1602 Recover query in redaction after session end
|
||||
+ rfe #1605 After database creation, go to database structure page
|
||||
+ rfe #1604 Show PHP version
|
||||
- bug #4770 Multiple delete on table browse ignoring foreign key checkbox
|
||||
+ rfe CodeMirror based SQL editor as an input transformation
|
||||
+ rfe #1275 CodeMirror based JSON editor as an input transformation
|
||||
+ rfe #685 Editor for HTML content
|
||||
+ rfe #1595 make professional code editor suggestion
|
||||
+ rfe #1606 processlist filter
|
||||
+ rfe Change tracking activation status from db level tracking page
|
||||
+ rfe #1207 Export users associated with a specific schema/database
|
||||
+ rfe #1575 "Disable database expansion" : unclear directive name and
|
||||
explanation
|
||||
+ rfe #1607 Tool tip for lock icon when making changes to a page
|
||||
+ rfe #1327 Hide 'Add user' link if user does not have privileges
|
||||
+ rfe #501 Support for SSL GRANT option
|
||||
+ rfe #1608 Central columns allowing setting SIGNED / UNSIGNED attribute for integer
|
||||
+ rfe #1441 Add regexp match when using AllowArbitraryServer
|
||||
- bug #4806 Unable to work with two different servers in two tabs
|
||||
|
||||
4.3.14.0 (not yet released)
|
||||
|
||||
|
||||
4.3.13.0 (2015-03-29)
|
||||
- bug #4803 "Show hidden items" is sometimes hidden
|
||||
- bug #4807 Breaks when sorting by multiple columns while using UNION
|
||||
- bug #4798 Missing column when exporting in sql
|
||||
- bug #4810 Broken find and replace
|
||||
- bug #4804 Undefined Index after export schema
|
||||
- bug #4802 Changelog page is not working
|
||||
- bug #4815 Infinite calls to index.php
|
||||
- bug #4820 Invalid links to dev.mysql.com
|
||||
- bug #4718 simulate query fails, but actual query does not
|
||||
|
||||
4.3.12.0 (2015-03-14)
|
||||
- bug #4746 Right-aligned columns have left-aligned header
|
||||
- bug #4779 PMA_Util::parseEnumSetValues fails on enums with UTF-8 values
|
||||
- bug Undefined index savedsearcheswork
|
||||
- bug #4788 Inline edit of DATE fields with NULL, NULL checkbox is under datepicker
|
||||
- bug #4790 DROP TABLE/VIEW IF EXISTS are not tracked
|
||||
- bug Compatibility with central columns of version 4.4
|
||||
- bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore
|
||||
- bug #4789 Views aren't dropped when copying a database
|
||||
- bug #4784 Incomplete bookmark saving
|
||||
- bug #4786 SELECT width on relations page
|
||||
|
||||
4.3.11.1 (2015-03-04)
|
||||
- bug [security] Risk of BREACH attack, see PMASA-2015-1
|
||||
|
||||
4.3.11.0 (2015-03-02)
|
||||
- bug #4774 SQL links are completely wrong
|
||||
- bug #4768 MariaDB: version mismatch
|
||||
- bug #4777 Some images are missing in Designer for original theme
|
||||
- bug #4767 Drizzle: undefined index in mysql_charsets.inc.php
|
||||
- bug #4753 Normal field and multi-line field have different margins
|
||||
- bug #4760 Cannot re-import settings from local storage
|
||||
- bug #4778 SQL error when database list is sorted by additional columns
|
||||
- bug #4780 Notice when timestamp column does not have default value
|
||||
|
||||
4.3.10.0 (2015-02-20)
|
||||
- bug Undefined index navwork
|
||||
- bug #4744 Opening console scroll down the page
|
||||
- bug Remove extra column heading in view structure page
|
||||
- bug Add missing confirmation when deleting central columns
|
||||
- bug Undefined index DisableIS
|
||||
- bug #4763 Database export with more than 512 tables fails
|
||||
- bug #4769 Previously set column aliases are destroyed if returned to the same table
|
||||
- bug #4752 Incorrect page after creating table
|
||||
- bug #4771 Central Columns not working, showing error
|
||||
|
||||
4.3.9.0 (2015-02-05)
|
||||
- bug #4728 Incorrect headings in routine editor
|
||||
- bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables
|
||||
- bug #4729 Display original field when using "Relational display column" option and display column is empty
|
||||
- bug #4734 Default values for binary fields do not support binary values
|
||||
- bug #4736 Changing display options breaks query highlighting
|
||||
- bug Undefined index submit_type
|
||||
- bug #4738 Header lose align when scrolling in Firefox
|
||||
- bug #4741 in ./libraries/Advisor.class.php#184 vsprintf(): Too few arguments
|
||||
- bug #4743 Unable to move cursor with keyboard in filter rows box
|
||||
- bug Incorrect link in doc
|
||||
- bug #4745 Tracking does not handle views properly
|
||||
- bug #4706 Schema export doesn't handle dots in db/table name
|
||||
- bug #3935 Table Header not displayed correct (Safari 5.0.5 Mac)
|
||||
- bug #4750 Disable renaming referenced columns
|
||||
- bug #4748 Column name center-aligned instead of left-aligned in Relations
|
||||
|
||||
4.3.8.0 (2015-01-24)
|
||||
- bug Undefined constant PMA_DRIZZLE
|
||||
- bug #4712 Wrongly positioned date-picker while Grid-Editing
|
||||
- bug #4714 Forced ORDER BY for own sql statements
|
||||
- bug #4721 Undefined property: stdClass::$version
|
||||
- bug #4719 'only_db' not working
|
||||
- bug #4700 Error text: Internal Server Error
|
||||
- bug #4722 Incorrect width table summary when favorite tables is disabled
|
||||
- bug #4716 Collapse all in navigation panel is sometimes broken
|
||||
- bug #4724 Cannot navigate in filtered table list
|
||||
- bug #4717 Database navigation menu broken when resolution/screen is changing
|
||||
- bug #4727 Collation column missing in database list when DisableIS is true
|
||||
- bug Undefined index central_columnswork
|
||||
- bug Undefined index favorite_tables
|
||||
|
||||
4.3.7.0 (2015-01-15)
|
||||
- bug #4694 js error on marking table as favorite in Safari (in private mode)
|
||||
- bug #4695 Changing $cfg['DefaultTabTable'] doesn't update link and title
|
||||
- bug Undefined index menuswork
|
||||
- bug Undefined index navwork
|
||||
- bug Undefined index central_columnswork
|
||||
- bug #4697 Server Status refresh not behaving as expected
|
||||
- bug Null argument in array_multisort()
|
||||
- bug #4699 Navigation panel should not hide icons based on 'TableNavigationLinksMode'
|
||||
- bug #4703 Unsaved schema page exported as pdf.pdf
|
||||
- bug #4707 Call to undefined method PMA_Schema_PDF::dieSchema()
|
||||
- bug #4702 URL is non RFC-2396 compatible in get_scripts.js.php
|
||||
|
||||
4.3.6.0 (2015-01-07)
|
||||
- bug Undefined index notices while configuring recent and favorite tables
|
||||
- bug #4687 Designer breaks without configuration storage
|
||||
- bug #4686 Select elements flicker and selects something else
|
||||
- bug #4689 Setup tool creates "pma__favorites" incorrectly
|
||||
- bug #4685 Call to a member function isUserType() on a non-object
|
||||
- bug #4691 Do not include console when no server is selected
|
||||
- bug #4688 File permissions in archive
|
||||
- bug #4692 Dynamic javascripts gives 500 when db selected
|
||||
|
||||
4.3.5.0 (2015-01-05)
|
||||
- bug Auto-configuration: tables were not created automatically
|
||||
- bug #4677 Advanced feature checker does not check for favorite tables feature
|
||||
- bug #4678 Some of the data stored in configuration storage are not deleted upon db or table delete
|
||||
- bug #4679 Setup does not allow providing a name for favorites table
|
||||
- bug #4680 Number of favorite table are not configurable in setup
|
||||
- bug #4681 'Central columns table' field in setup does not have a description
|
||||
- bug #4318 Default connection collation and sorting
|
||||
- bug #4683 Relational data is not properly updated on table rename
|
||||
- bug #4655 Undefined index: collation_connection (second patch)
|
||||
- bug #4682 4.3.3 & 4.3.4 Import sql created by mysqldump fails on foreign keys
|
||||
- bug #4676 Auto-configuration issues
|
||||
- bug #4416 New lines are removed when grid editing (part two: TEXT)
|
||||
|
||||
--- Older ChangeLogs can be found on our project website ---
|
||||
http://www.phpmyadmin.net/old-stuff/ChangeLogs/
|
||||
|
||||
|
||||
@ -146,6 +146,14 @@ environment variables:
|
||||
The fully-qualified path (``https://pma.example.net/``) where the reverse
|
||||
proxy makes phpMyAdmin available.
|
||||
|
||||
.. envvar:: PHP_UPLOAD_MAX_FILESIZE
|
||||
|
||||
Define upload_max_filesize and post_max_size PHP settings.
|
||||
|
||||
.. envvar:: PHP_MAX_INPUT_VARS
|
||||
|
||||
Define max_input_vars PHP setting.
|
||||
|
||||
By default, :ref:`cookie` is used, but if :envvar:`PMA_USER` and
|
||||
:envvar:`PMA_PASSWORD` are set, it is switched to :ref:`auth_config`.
|
||||
|
||||
|
||||
@ -6,33 +6,33 @@
|
||||
*
|
||||
* @package PhpMyAdmin
|
||||
*/
|
||||
chdir('..');
|
||||
|
||||
// Send correct type:
|
||||
header('Content-Type: text/javascript; charset=UTF-8');
|
||||
header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
|
||||
if (!defined('TESTSUITE')) {
|
||||
chdir('..');
|
||||
|
||||
// Avoid loading the full common.inc.php because this would add many
|
||||
// non-js-compatible stuff like DOCTYPE
|
||||
define('PMA_MINIMUM_COMMON', true);
|
||||
require_once './libraries/common.inc.php';
|
||||
// Send correct type:
|
||||
header('Content-Type: text/javascript; charset=UTF-8');
|
||||
header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
|
||||
|
||||
// Avoid loading the full common.inc.php because this would add many
|
||||
// non-js-compatible stuff like DOCTYPE
|
||||
define('PMA_MINIMUM_COMMON', true);
|
||||
require_once './libraries/common.inc.php';
|
||||
}
|
||||
|
||||
$buffer = PMA\libraries\OutputBuffering::getInstance();
|
||||
$buffer->start();
|
||||
register_shutdown_function(
|
||||
function () {
|
||||
echo PMA\libraries\OutputBuffering::getInstance()->getContents();
|
||||
}
|
||||
);
|
||||
if (!defined('TESTSUITE')) {
|
||||
register_shutdown_function(
|
||||
function () {
|
||||
echo PMA\libraries\OutputBuffering::getInstance()->getContents();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
// Get the data for the sprites, if it's available
|
||||
if (is_readable($_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php')) {
|
||||
include $_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php';
|
||||
}
|
||||
$sprites = array();
|
||||
if (function_exists('PMA_sprites')) {
|
||||
$sprites = PMA_sprites();
|
||||
}
|
||||
$sprites = $_SESSION['PMA_Theme']->getSpriteData();
|
||||
|
||||
// We only need the keys from the array of sprites data,
|
||||
// since they contain the (partial) class names
|
||||
$keys = array();
|
||||
|
||||
@ -7,32 +7,36 @@
|
||||
* @package PhpMyAdmin
|
||||
*/
|
||||
|
||||
chdir('..');
|
||||
if (!defined('TESTSUITE')) {
|
||||
chdir('..');
|
||||
|
||||
// Close session early as we won't write anything there
|
||||
session_write_close();
|
||||
// Close session early as we won't write anything there
|
||||
session_write_close();
|
||||
|
||||
// Send correct type
|
||||
header('Content-Type: text/javascript; charset=UTF-8');
|
||||
// Enable browser cache for 1 hour
|
||||
header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
|
||||
// Send correct type
|
||||
header('Content-Type: text/javascript; charset=UTF-8');
|
||||
// Enable browser cache for 1 hour
|
||||
header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
|
||||
|
||||
// When a token is not presented, even though whitelisted arrays are removed
|
||||
// in PMA_removeRequestVars(). This is a workaround for that.
|
||||
$_GET['scripts'] = json_encode($_GET['scripts']);
|
||||
// When a token is not presented, even though whitelisted arrays are removed
|
||||
// in PMA_removeRequestVars(). This is a workaround for that.
|
||||
$_GET['scripts'] = json_encode($_GET['scripts']);
|
||||
|
||||
// Avoid loading the full common.inc.php because this would add many
|
||||
// non-js-compatible stuff like DOCTYPE
|
||||
define('PMA_MINIMUM_COMMON', true);
|
||||
require_once './libraries/common.inc.php';
|
||||
// Avoid loading the full common.inc.php because this would add many
|
||||
// non-js-compatible stuff like DOCTYPE
|
||||
define('PMA_MINIMUM_COMMON', true);
|
||||
require_once './libraries/common.inc.php';
|
||||
}
|
||||
|
||||
$buffer = PMA\libraries\OutputBuffering::getInstance();
|
||||
$buffer->start();
|
||||
register_shutdown_function(
|
||||
function () {
|
||||
echo PMA\libraries\OutputBuffering::getInstance()->getContents();
|
||||
}
|
||||
);
|
||||
if (!defined('TESTSUITE')) {
|
||||
register_shutdown_function(
|
||||
function () {
|
||||
echo PMA\libraries\OutputBuffering::getInstance()->getContents();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
$_GET['scripts'] = json_decode($_GET['scripts']);
|
||||
if (! empty($_GET['scripts']) && is_array($_GET['scripts'])) {
|
||||
@ -41,7 +45,7 @@ if (! empty($_GET['scripts']) && is_array($_GET['scripts'])) {
|
||||
$script_name = 'js';
|
||||
|
||||
$path = explode("/", $script);
|
||||
foreach ($path as $index => $filename) {
|
||||
foreach ($path as $filename) {
|
||||
// Allow alphanumeric, "." and "-" chars only, no files starting
|
||||
// with .
|
||||
if (preg_match("@^[\w][\w\.-]+$@", $filename)) {
|
||||
|
||||
@ -30,11 +30,13 @@ require_once './libraries/js_escape.lib.php';
|
||||
|
||||
$buffer = PMA\libraries\OutputBuffering::getInstance();
|
||||
$buffer->start();
|
||||
register_shutdown_function(
|
||||
function () {
|
||||
echo PMA\libraries\OutputBuffering::getInstance()->getContents();
|
||||
}
|
||||
);
|
||||
if (!defined('TESTSUITE')) {
|
||||
register_shutdown_function(
|
||||
function () {
|
||||
echo PMA\libraries\OutputBuffering::getInstance()->getContents();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
$js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements are disabled.');
|
||||
if ($cfg['AllowUserDropDatabase']) {
|
||||
|
||||
@ -6,29 +6,33 @@
|
||||
* @package PhpMyAdmin
|
||||
*/
|
||||
|
||||
chdir('..');
|
||||
if (!defined('TESTSUITE')) {
|
||||
chdir('..');
|
||||
|
||||
// Send correct type:
|
||||
header('Content-Type: text/javascript; charset=UTF-8');
|
||||
// Send correct type:
|
||||
header('Content-Type: text/javascript; charset=UTF-8');
|
||||
|
||||
// Cache output in client - the nocache query parameter makes sure that this
|
||||
// file is reloaded when config changes
|
||||
header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
|
||||
// Cache output in client - the nocache query parameter makes sure that this
|
||||
// file is reloaded when config changes
|
||||
header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
|
||||
|
||||
// Avoid loading the full common.inc.php because this would add many
|
||||
// non-js-compatible stuff like DOCTYPE
|
||||
define('PMA_MINIMUM_COMMON', true);
|
||||
require_once './libraries/common.inc.php';
|
||||
// Close session early as we won't write anything there
|
||||
session_write_close();
|
||||
// Avoid loading the full common.inc.php because this would add many
|
||||
// non-js-compatible stuff like DOCTYPE
|
||||
define('PMA_MINIMUM_COMMON', true);
|
||||
require_once './libraries/common.inc.php';
|
||||
// Close session early as we won't write anything there
|
||||
session_write_close();
|
||||
}
|
||||
|
||||
$buffer = PMA\libraries\OutputBuffering::getInstance();
|
||||
$buffer->start();
|
||||
register_shutdown_function(
|
||||
function () {
|
||||
echo PMA\libraries\OutputBuffering::getInstance()->getContents();
|
||||
}
|
||||
);
|
||||
if (!defined('TESTSUITE')) {
|
||||
register_shutdown_function(
|
||||
function () {
|
||||
echo PMA\libraries\OutputBuffering::getInstance()->getContents();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
echo "var PMA_gotoWhitelist = new Array();\n";
|
||||
$i = -1;
|
||||
|
||||
@ -717,50 +717,6 @@ class DatabaseInterface
|
||||
=& $tables[$table_name]['Type'];
|
||||
}
|
||||
|
||||
// MySQL forward compatibility
|
||||
// so pma could use this array as if every server
|
||||
// is of version >5.0
|
||||
// todo : remove and check usage in the rest of the code,
|
||||
// MySQL 5.0 is required by current PMA version
|
||||
$tables[$table_name]['TABLE_SCHEMA']
|
||||
= $database;
|
||||
$tables[$table_name]['TABLE_NAME']
|
||||
=& $tables[$table_name]['Name'];
|
||||
$tables[$table_name]['ENGINE']
|
||||
=& $tables[$table_name]['Engine'];
|
||||
$tables[$table_name]['VERSION']
|
||||
=& $tables[$table_name]['Version'];
|
||||
$tables[$table_name]['ROW_FORMAT']
|
||||
=& $tables[$table_name]['Row_format'];
|
||||
$tables[$table_name]['TABLE_ROWS']
|
||||
=& $tables[$table_name]['Rows'];
|
||||
$tables[$table_name]['AVG_ROW_LENGTH']
|
||||
=& $tables[$table_name]['Avg_row_length'];
|
||||
$tables[$table_name]['DATA_LENGTH']
|
||||
=& $tables[$table_name]['Data_length'];
|
||||
$tables[$table_name]['MAX_DATA_LENGTH']
|
||||
=& $tables[$table_name]['Max_data_length'];
|
||||
$tables[$table_name]['INDEX_LENGTH']
|
||||
=& $tables[$table_name]['Index_length'];
|
||||
$tables[$table_name]['DATA_FREE']
|
||||
=& $tables[$table_name]['Data_free'];
|
||||
$tables[$table_name]['AUTO_INCREMENT']
|
||||
=& $tables[$table_name]['Auto_increment'];
|
||||
$tables[$table_name]['CREATE_TIME']
|
||||
=& $tables[$table_name]['Create_time'];
|
||||
$tables[$table_name]['UPDATE_TIME']
|
||||
=& $tables[$table_name]['Update_time'];
|
||||
$tables[$table_name]['CHECK_TIME']
|
||||
=& $tables[$table_name]['Check_time'];
|
||||
$tables[$table_name]['TABLE_COLLATION']
|
||||
=& $tables[$table_name]['Collation'];
|
||||
$tables[$table_name]['CHECKSUM']
|
||||
=& $tables[$table_name]['Checksum'];
|
||||
$tables[$table_name]['CREATE_OPTIONS']
|
||||
=& $tables[$table_name]['Create_options'];
|
||||
$tables[$table_name]['TABLE_COMMENT']
|
||||
=& $tables[$table_name]['Comment'];
|
||||
|
||||
$commentUpper = mb_strtoupper(
|
||||
$tables[$table_name]['Comment']
|
||||
);
|
||||
|
||||
@ -365,11 +365,34 @@ class Theme
|
||||
}
|
||||
}
|
||||
|
||||
$theme = $this;
|
||||
include './themes/sprites.css.php';
|
||||
|
||||
return $success;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads sprites data
|
||||
*
|
||||
* @return array with sprites
|
||||
*/
|
||||
public function getSpriteData()
|
||||
{
|
||||
$sprites = array();
|
||||
$filename = $this->getPath() . '/sprites.lib.php';
|
||||
if (is_readable($filename)) {
|
||||
|
||||
// This defines sprites array
|
||||
include $filename;
|
||||
|
||||
// Backwards compatibility for themes from 4.6 and older
|
||||
if (function_exists('PMA_sprites')) {
|
||||
$sprites = PMA_sprites();
|
||||
}
|
||||
}
|
||||
return $sprites;
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders the preview for this theme
|
||||
*
|
||||
|
||||
@ -192,14 +192,7 @@ class Util
|
||||
// If it's the first time this function is called
|
||||
if (! isset($sprites)) {
|
||||
// Try to load the list of sprites
|
||||
$sprite_file = $_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php';
|
||||
if (is_readable($sprite_file)) {
|
||||
include_once $sprite_file;
|
||||
$sprites = PMA_sprites();
|
||||
} else {
|
||||
// No sprites are available for this theme
|
||||
$sprites = array();
|
||||
}
|
||||
$sprites = $_SESSION['PMA_Theme']->getSpriteData();
|
||||
}
|
||||
|
||||
// Check if we have the requested image as a sprite
|
||||
|
||||
@ -19,7 +19,7 @@ then
|
||||
echo "Usages:"
|
||||
echo " create-release.sh <version> <from_branch> [--tag] [--stable]"
|
||||
echo ""
|
||||
echo "If --tag is specified, release tag is automatically created (do not use this on pre-release versions)"
|
||||
echo "If --tag is specified, release tag is automatically created (use this for all releases including pre-releases)"
|
||||
echo "If --stable is specified, the STABLE branch is updated with this release"
|
||||
echo ""
|
||||
echo "Examples:"
|
||||
@ -320,11 +320,11 @@ Todo now:
|
||||
|
||||
7. on https://github.com/phpmyadmin/phpmyadmin/milestones close the milestone corresponding to the released version (if this is a stable release) and open a new one for the next minor release
|
||||
|
||||
8. if a maintenance version was released, delete the branch corresponding to the previous one; for example git push origin --delete MAINT_4_4_12
|
||||
8. if a maintenance version (z in x.y.z) was released, delete the branch corresponding to the previous one; for example git push origin --delete MAINT_4_4_12
|
||||
|
||||
9. for a stable version, update demo/php/versions.ini in the scripts repository so that the demo server shows current versions
|
||||
|
||||
10. in case of a new major release, update the pmaweb/settings.py in website repository to include the new major releases
|
||||
10. in case of a new major release ('y' in x.y.0), update the pmaweb/settings.py in website repository to include the new major releases
|
||||
|
||||
11. the end :-)
|
||||
|
||||
|
||||
@ -102,13 +102,9 @@ if [ -d $1/themes ]; then
|
||||
echo ' */' >> $LIBRARY
|
||||
echo '' >> $LIBRARY
|
||||
echo '/**' >> $LIBRARY
|
||||
echo ' * Returns map of sprites inside sprite.png' >> $LIBRARY
|
||||
echo ' *' >> $LIBRARY
|
||||
echo ' * @return array Data of sprites' >> $LIBRARY
|
||||
echo ' * Map of sprites inside sprite.png' >> $LIBRARY
|
||||
echo ' */' >> $LIBRARY
|
||||
echo "function PMA_sprites()" >> $LIBRARY
|
||||
echo "{" >> $LIBRARY
|
||||
echo " return array(" >> $LIBRARY
|
||||
echo "\$sprites = array(" >> $LIBRARY
|
||||
CURRENT=1
|
||||
for f in $FILES; do
|
||||
# Add a CSS rule for each icon in the sprite
|
||||
@ -127,16 +123,14 @@ if [ -d $1/themes ]; then
|
||||
fi
|
||||
done
|
||||
fi
|
||||
echo " $NAME => array(" >> $LIBRARY
|
||||
echo " 'position' => '$CURRENT'," >> $LIBRARY
|
||||
echo " 'width' => '$WIDTH'," >> $LIBRARY
|
||||
echo " 'height' => '$HEIGHT'" >> $LIBRARY
|
||||
echo " )," >> $LIBRARY
|
||||
echo " $NAME => array(" >> $LIBRARY
|
||||
echo " 'position' => '$CURRENT'," >> $LIBRARY
|
||||
echo " 'width' => '$WIDTH'," >> $LIBRARY
|
||||
echo " 'height' => '$HEIGHT'" >> $LIBRARY
|
||||
echo " )," >> $LIBRARY
|
||||
CURRENT=$(($CURRENT+1))
|
||||
done
|
||||
echo " );" >> $LIBRARY
|
||||
echo "}" >> $LIBRARY
|
||||
echo "" >> $LIBRARY
|
||||
echo ");" >> $LIBRARY
|
||||
|
||||
# Back to the parent folder
|
||||
cd ../..
|
||||
|
||||
@ -78,6 +78,7 @@ session_start();
|
||||
|
||||
// Standard environment for tests
|
||||
$_SESSION[' PMA_token '] = 'token';
|
||||
$_SESSION['PMA_Theme'] = PMA\libraries\Theme::load('./themes/pmahomme');
|
||||
$_SESSION['tmpval']['pftext'] = 'F';
|
||||
$GLOBALS['lang'] = 'en';
|
||||
$GLOBALS['is_ajax_request'] = false;
|
||||
|
||||
@ -31,7 +31,6 @@ class AdvisorTest extends PMATestCase
|
||||
*/
|
||||
public function setup()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$GLOBALS['server'] = 1;
|
||||
}
|
||||
|
||||
|
||||
@ -771,7 +771,6 @@ class ConfigTest extends PMATestCase
|
||||
public function testGetThemeUniqueValue()
|
||||
{
|
||||
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
|
||||
$partial_sum = (
|
||||
PHPUnit_Framework_Assert::readAttribute($this->object, 'source_mtime') +
|
||||
|
||||
@ -194,8 +194,6 @@ class DbSearchTest extends PMATestCase
|
||||
*/
|
||||
public function testGetSelectionForm()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
|
||||
$this->assertEquals(
|
||||
'<a id="db_search"></a><form id="db_search_form" class="ajax lock-page" '
|
||||
. 'method="post" action="db_search.php" name="db_search">'
|
||||
@ -210,13 +208,13 @@ class DbSearchTest extends PMATestCase
|
||||
. 'type="radio" name="criteriaSearchType" id="criteriaSearchType_1" '
|
||||
. 'value="1" checked="checked" />' . "\n"
|
||||
. '<label for="criteriaSearchType_1">at least one of the words<span '
|
||||
. 'class="pma_hint"><img src="themes/dot.gifb_help.png" title="" alt="" '
|
||||
. 'class="pma_hint"><img src="themes/dot.gif" title="" alt="" class="icon ic_b_help" '
|
||||
. '/><span class="hide">Words are separated by a space character (" ").'
|
||||
. '</span></span></label><br />' . "\n"
|
||||
. '<input type="radio" name="criteriaSearchType" id="criteriaSearchType'
|
||||
. '_2" value="2" />' . "\n"
|
||||
. '<label for="criteriaSearchType_2">all words<span class="pma_hint">'
|
||||
. '<img src="themes/dot.gifb_help.png" title="" alt="" /><span class'
|
||||
. '<img src="themes/dot.gif" title="" alt="" class="icon ic_b_help" /><span class'
|
||||
. '="hide">Words are separated by a space character (" ").</span></span>'
|
||||
. '</label><br />' . "\n"
|
||||
. '<input type="radio" name="criteriaSearchType" id="criteriaSearchType'
|
||||
@ -227,8 +225,8 @@ class DbSearchTest extends PMATestCase
|
||||
. '<label for="criteriaSearchType_4">as regular expression <a href='
|
||||
. '"./url.php?url=http%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen'
|
||||
. '%2Fregexp.html" target='
|
||||
. '"mysql_doc"><img src="themes/dot.gifb_help.png" title="Documentation"'
|
||||
. ' alt="Documentation" /></a></label><br />' . "\n"
|
||||
. '"mysql_doc"><img src="themes/dot.gif" title="Documentation"'
|
||||
. ' alt="Documentation" class="icon ic_b_help" /></a></label><br />' . "\n"
|
||||
. '</td></tr><tr><td class="right vtop">Inside tables:</td>'
|
||||
. '<td rowspan="2"><select name="criteriaTables[]" size="6" '
|
||||
. 'multiple="multiple"><option value="table1">table1</option>'
|
||||
|
||||
@ -37,9 +37,6 @@ class ErrorHandlerTest extends PMATestCase
|
||||
{
|
||||
$this->object = new PMA\libraries\ErrorHandler();
|
||||
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -38,9 +38,6 @@ class ErrorTest extends PMATestCase
|
||||
{
|
||||
$this->object = new PMA\libraries\Error('2', 'Compile Error', 'error.txt', 15);
|
||||
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -48,7 +48,6 @@ class FooterTest extends PMATestCase
|
||||
$GLOBALS['db'] = '';
|
||||
$GLOBALS['table'] = '';
|
||||
$GLOBALS['text_dir'] = 'ltr';
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$GLOBALS['PMA_Config'] = new PMA\libraries\Config();
|
||||
$GLOBALS['PMA_Config']->enableBc();
|
||||
$GLOBALS['collation_connection'] = 'utf8_general_ci';
|
||||
@ -62,8 +61,6 @@ class FooterTest extends PMATestCase
|
||||
$GLOBALS['error_handler'] = new PMA\libraries\ErrorHandler();
|
||||
unset($_POST);
|
||||
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -183,15 +180,14 @@ class FooterTest extends PMATestCase
|
||||
|
||||
$GLOBALS['cfg']['TabsMode'] = 'icons';
|
||||
$GLOBALS['cfg']['ServerDefault'] = 1;
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
$this->assertEquals(
|
||||
'<div id="selflink" class="print_ignore"><a href="index.php?db=&'
|
||||
. 'table=&server=1&target=&lang=en&collation_connection='
|
||||
. 'utf8_general_ci&token=token" title="Open new phpMyAdmin window" '
|
||||
. 'target="_blank"><img src="imagewindow-new.png" title="Open new '
|
||||
. 'phpMyAdmin window" alt="Open new phpMyAdmin window" /></a></div>',
|
||||
. 'target="_blank"><img src="themes/dot.gif" title="Open new '
|
||||
. 'phpMyAdmin window" alt="Open new phpMyAdmin window" '
|
||||
. 'class="icon ic_window-new" /></a></div>',
|
||||
$this->_callPrivateFunction(
|
||||
'_getSelfLink',
|
||||
array(
|
||||
|
||||
@ -39,9 +39,7 @@ class HeaderTest extends PMATestCase
|
||||
$GLOBALS['server'] = 0;
|
||||
$GLOBALS['message'] = 'phpmyadminmessage';
|
||||
$GLOBALS['is_ajax_request'] = false;
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
|
||||
$GLOBALS['server'] = 'server';
|
||||
$GLOBALS['db'] = 'pma_test';
|
||||
|
||||
@ -72,7 +72,7 @@ class LinterTest extends PMATestCase
|
||||
/**
|
||||
* Test for Linter::lint
|
||||
*
|
||||
* @dataProvider testLintProvider
|
||||
* @dataProvider lintProvider
|
||||
*
|
||||
* @param array $expected The expected result.
|
||||
* @param string $query The query to be analyzed.
|
||||
@ -89,7 +89,7 @@ class LinterTest extends PMATestCase
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public static function testLintProvider()
|
||||
public static function lintProvider()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
|
||||
@ -38,9 +38,7 @@ class MenuTest extends PMATestCase
|
||||
$GLOBALS['cfg']['Server']['DisableIS'] = false;
|
||||
$GLOBALS['server'] = 0;
|
||||
$GLOBALS['cfg']['Server']['verbose'] = 'verbose host';
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
|
||||
$GLOBALS['server'] = 'server';
|
||||
$GLOBALS['db'] = 'pma_test';
|
||||
|
||||
@ -37,8 +37,6 @@ class MessageTest extends PMATestCase
|
||||
protected function setUp()
|
||||
{
|
||||
$this->object = new PMA\libraries\Message;
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
}
|
||||
|
||||
/**
|
||||
@ -518,7 +516,7 @@ class MessageTest extends PMATestCase
|
||||
$this->object->setMessage('Test Message');
|
||||
|
||||
$this->expectOutputString(
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" /> '
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_notice" /> '
|
||||
. 'Test Message</div>'
|
||||
);
|
||||
$this->object->display();
|
||||
@ -535,7 +533,7 @@ class MessageTest extends PMATestCase
|
||||
{
|
||||
$this->object->setMessage('Test Message');
|
||||
$this->assertEquals(
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" /> '
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_notice" /> '
|
||||
. 'Test Message</div>',
|
||||
$this->object->getDisplay()
|
||||
);
|
||||
@ -563,18 +561,18 @@ class MessageTest extends PMATestCase
|
||||
return array(
|
||||
array(
|
||||
1,
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
|
||||
. '/> 1 row affected.</div>'
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" '
|
||||
. 'class="icon ic_s_notice" /> 1 row affected.</div>'
|
||||
),
|
||||
array(
|
||||
2,
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
|
||||
. '/> 2 rows affected.</div>'
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" '
|
||||
. 'class="icon ic_s_notice" /> 2 rows affected.</div>'
|
||||
),
|
||||
array(
|
||||
10000,
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
|
||||
. '/> 10000 rows affected.</div>'
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" '
|
||||
. 'class="icon ic_s_notice" /> 10000 rows affected.</div>'
|
||||
)
|
||||
);
|
||||
}
|
||||
@ -608,18 +606,18 @@ class MessageTest extends PMATestCase
|
||||
return array(
|
||||
array(
|
||||
1,
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
|
||||
. '/> 1 row inserted.</div>'
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" '
|
||||
. 'class="icon ic_s_notice" /> 1 row inserted.</div>'
|
||||
),
|
||||
array(
|
||||
2,
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
|
||||
. '/> 2 rows inserted.</div>'
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" '
|
||||
. 'class="icon ic_s_notice" /> 2 rows inserted.</div>'
|
||||
),
|
||||
array(
|
||||
100000,
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
|
||||
. '/> 100000 rows inserted.</div>'
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" '
|
||||
. 'class="icon ic_s_notice" /> 100000 rows inserted.</div>'
|
||||
)
|
||||
);
|
||||
}
|
||||
@ -653,18 +651,18 @@ class MessageTest extends PMATestCase
|
||||
return array(
|
||||
array(
|
||||
1,
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
|
||||
. '/> 1 row deleted.</div>'
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" '
|
||||
. 'class="icon ic_s_notice" /> 1 row deleted.</div>'
|
||||
),
|
||||
array(
|
||||
2,
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
|
||||
. '/> 2 rows deleted.</div>'
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" '
|
||||
. 'class="icon ic_s_notice" /> 2 rows deleted.</div>'
|
||||
),
|
||||
array(
|
||||
500000,
|
||||
'<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
|
||||
. '/> 500000 rows deleted.</div>'
|
||||
'<div class="notice"><img src="themes/dot.gif" title="" alt="" '
|
||||
. 'class="icon ic_s_notice" /> 500000 rows deleted.</div>'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@ -46,8 +46,6 @@ class TableTest extends PMATestCase
|
||||
$GLOBALS['sql_drop_table'] = true;
|
||||
$GLOBALS['cfg']['Server']['table_uiprefs'] = "pma__table_uiprefs";
|
||||
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
|
||||
$GLOBALS['is_ajax_request'] = false;
|
||||
$GLOBALS['cfgRelation'] = PMA_getRelationsParam();
|
||||
$GLOBALS['dblist'] = new DataBasePMAMock();
|
||||
|
||||
@ -22,6 +22,11 @@ class ThemeTest extends PMATestCase
|
||||
*/
|
||||
protected $object;
|
||||
|
||||
/**
|
||||
* @var backup for session theme
|
||||
*/
|
||||
protected $backup;
|
||||
|
||||
/**
|
||||
* Sets up the fixture, for example, opens a network connection.
|
||||
* This method is called before a test is executed.
|
||||
@ -31,6 +36,7 @@ class ThemeTest extends PMATestCase
|
||||
protected function setUp()
|
||||
{
|
||||
$this->object = new Theme();
|
||||
$this->backup = $_SESSION['PMA_Theme'];
|
||||
$_SESSION['PMA_Theme'] = $this->object;
|
||||
$GLOBALS['PMA_Config'] = new PMA\libraries\Config();
|
||||
$GLOBALS['PMA_Config']->enableBc();
|
||||
@ -48,6 +54,7 @@ class ThemeTest extends PMATestCase
|
||||
*/
|
||||
protected function tearDown()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = $this->backup;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -140,6 +147,7 @@ class ThemeTest extends PMATestCase
|
||||
ob_end_clean();
|
||||
$this->assertTrue($ret);
|
||||
$this->assertContains('FILE: navigation.css.php', $out);
|
||||
$this->assertContains('.ic_b_bookmark', $out);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -34,9 +34,7 @@ class FormDisplayTest extends PMATestCase
|
||||
*/
|
||||
function setup()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['PMA_Config'] = new Config();
|
||||
$GLOBALS['PMA_Config']->enableBc();
|
||||
$GLOBALS['server'] = 0;
|
||||
|
||||
@ -32,9 +32,7 @@ class FormTest extends PMATestCase
|
||||
*/
|
||||
function setup()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['PMA_Config'] = new Config();
|
||||
$GLOBALS['PMA_Config']->enableBc();
|
||||
$GLOBALS['server'] = 0;
|
||||
|
||||
@ -50,11 +50,8 @@ class DatabaseStructureControllerTest extends PMATestCase
|
||||
$GLOBALS['cfg']['Server']['DisableIS'] = false;
|
||||
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
$table = $this->getMockBuilder('PMA\libraries\Table')
|
||||
->disableOriginalConstructor()
|
||||
|
||||
@ -50,8 +50,6 @@ class ServerBinlogControllerTest extends PMATestCase
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
Util::cacheSet('profiling_supported', true);
|
||||
|
||||
|
||||
@ -25,7 +25,6 @@ $GLOBALS['cfg']['Server'] = array(
|
||||
);
|
||||
//$_SESSION
|
||||
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
|
||||
|
||||
require_once 'libraries/url_generating.lib.php';
|
||||
@ -59,7 +58,6 @@ class ServerCollationsControllerTest extends PMATestCase
|
||||
//$GLOBALS
|
||||
$GLOBALS['is_ajax_request'] = true;
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -51,8 +51,6 @@ class ServerDatabasesControllerTest extends PMATestCase
|
||||
$GLOBALS['text_dir'] = "text_dir";
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['server'] = 1;
|
||||
|
||||
$container = Container::getDefaultContainer();
|
||||
|
||||
@ -39,11 +39,8 @@ class ServerEnginesControllerTest extends PMATestCase
|
||||
//$GLOBALS
|
||||
$GLOBALS['server'] = 0;
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -38,11 +38,8 @@ class ServerPluginsControllerTest extends PMATestCase
|
||||
|
||||
//$GLOBALS
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -45,11 +45,8 @@ class ServerVariablesControllerTest extends PMATestCase
|
||||
$GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
|
||||
$GLOBALS['server'] = 1;
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -46,7 +46,6 @@ class TableIndexesControllerTest extends PMATestCase
|
||||
*/
|
||||
$GLOBALS['server'] = 1;
|
||||
$GLOBALS['cfg']['Server']['pmadb'] = '';
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['url_params'] = array(
|
||||
'db' => 'db',
|
||||
'server' => 1
|
||||
@ -80,8 +79,6 @@ class TableIndexesControllerTest extends PMATestCase
|
||||
$GLOBALS['dbi'] = $dbi;
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -38,10 +38,7 @@ class TableRelationControllerTest extends PMATestCase
|
||||
protected function setUp()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
$_REQUEST['foreignDb'] = 'db';
|
||||
$_REQUEST['foreignTable'] = 'table';
|
||||
|
||||
@ -40,12 +40,10 @@ class TableSearchControllerTest extends PMATestCase
|
||||
/**
|
||||
* SET these to avoid undefined index error
|
||||
*/
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$_POST['zoom_submit'] = 'zoom';
|
||||
|
||||
$GLOBALS['server'] = 1;
|
||||
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
|
||||
$GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
|
||||
$GLOBALS['is_ajax_request'] = false;
|
||||
$GLOBALS['cfgRelation'] = PMA_getRelationsParam();
|
||||
$GLOBALS['PMA_Types'] = new TypesMySQL();
|
||||
|
||||
@ -48,11 +48,8 @@ class TableStructureControllerTest extends PMATestCase
|
||||
$GLOBALS['cfg']['Server']['DisableIS'] = false;
|
||||
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
$table = $this->getMockBuilder('PMA\libraries\Table')
|
||||
->disableOriginalConstructor()
|
||||
|
||||
@ -39,11 +39,8 @@ class DBIMysqliTest extends PMATestCase
|
||||
{
|
||||
$GLOBALS['cfg']['Server']['ssl'] = false;
|
||||
$GLOBALS['cfg']['Server']['compress'] = true;
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$this->object = new DBIMysqli();
|
||||
}
|
||||
|
||||
|
||||
@ -39,9 +39,6 @@ class NavigationTest extends PMATestCase
|
||||
$GLOBALS['cfg']['Server']['user'] = 'user';
|
||||
$GLOBALS['cfg']['ActionLinksMode'] = 'both';
|
||||
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -53,8 +53,6 @@ class NavigationTreeTest extends PMATestCase
|
||||
$GLOBALS['cfg']['ShowDatabasesNavigationAsTree'] = true;
|
||||
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$this->object = new PMA\libraries\navigation\NavigationTree();
|
||||
}
|
||||
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeColumnContainerTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeColumnTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -34,9 +34,7 @@ class NodeDatabaseChildTest extends PMATestCase
|
||||
*/
|
||||
protected function setUp()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
|
||||
$GLOBALS['server'] = 1;
|
||||
$GLOBALS['cfg']['ServerDefault'] = 1;
|
||||
|
||||
@ -31,7 +31,6 @@ class NodeDatabaseTest extends PMATestCase
|
||||
$GLOBALS['cfg']['MaxNavigationItems'] = 250;
|
||||
$GLOBALS['cfg']['Server'] = array();
|
||||
$GLOBALS['cfg']['Server']['DisableIS'] = true;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeEventContainerTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeEventTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -28,7 +28,6 @@ class NodeFactoryTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeFunctionContainerTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeFunctionTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeIndexContainerTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeIndexTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeProcedureContainerTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeProcedureTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -31,7 +31,6 @@ class NodeTableContainerTest extends PMATestCase
|
||||
$GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
|
||||
$GLOBALS['cfg']['NavigationTreeTableSeparator'] = '__';
|
||||
$GLOBALS['cfg']['NavigationTreeTableLevel'] = 1;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -35,7 +35,6 @@ class NodeTableTest extends PMATestCase
|
||||
$GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
|
||||
$GLOBALS['cfg']['NavigationTreeTableSeparator'] = '__';
|
||||
$GLOBALS['cfg']['NavigationTreeTableLevel'] = 1;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -30,7 +30,6 @@ class NodeTest extends PMATestCase
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$GLOBALS['cfg']['Server']['DisableIS'] = false;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeTriggerContainerTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeTriggerTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -31,7 +31,6 @@ class NodeViewContainerTest extends PMATestCase
|
||||
$GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
|
||||
$GLOBALS['cfg']['NavigationTreeTableSeparator'] = '__';
|
||||
$GLOBALS['cfg']['NavigationTreeTableLevel'] = 1;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -27,7 +27,6 @@ class NodeViewTest extends PMATestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 0;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -44,8 +44,6 @@ class AuthenticationCookieTest extends PMATestCase
|
||||
$GLOBALS['table'] = 'table';
|
||||
$this->object = new AuthenticationCookie();
|
||||
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -61,7 +61,6 @@ class ImportCsvTest extends PMATestCase
|
||||
$GLOBALS['compression'] = 'none';
|
||||
$GLOBALS['read_multiply'] = 10;
|
||||
$GLOBALS['import_type'] = 'Xml';
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$GLOBALS['import_handle'] = @fopen($GLOBALS['import_file'], 'r');
|
||||
|
||||
//separator for csv
|
||||
@ -71,8 +70,6 @@ class ImportCsvTest extends PMATestCase
|
||||
$GLOBALS['csv_new_line'] = 'auto';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -29,18 +29,46 @@ class FilesTest extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
}
|
||||
|
||||
public function testJsMessages()
|
||||
/**
|
||||
* Test for dynamic javascript files
|
||||
*
|
||||
* @param $name string Filename to test
|
||||
* @param $expected string Expected output
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider listScripts
|
||||
*/
|
||||
public function testDynamicJs($name, $expected)
|
||||
{
|
||||
ob_start();
|
||||
$GLOBALS['pmaThemeImage'] = '';
|
||||
$GLOBALS['goto_whitelist'] = array('x');
|
||||
$_GET['scripts'] = '["ajax.js"]';
|
||||
$cfg = array(
|
||||
'AllowUserDropDatabase' => true,
|
||||
'GridEditing' => 'click',
|
||||
'OBGzip' => false,
|
||||
'ServerDefault' => 1,
|
||||
);
|
||||
require 'js/messages.php';
|
||||
$out = ob_get_contents();
|
||||
ob_end_clean();
|
||||
$this->assertContains('var PMA_messages = new Array();', $out);
|
||||
$GLOBALS['cfg'] = $cfg;
|
||||
require $name;
|
||||
$buffer->stop();
|
||||
$out = $buffer->getContents();
|
||||
$this->assertContains($expected, $out);
|
||||
}
|
||||
|
||||
/**
|
||||
* Data provider for scripts testing
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function listScripts()
|
||||
{
|
||||
return array(
|
||||
array('js/whitelist.php', 'var PMA_gotoWhitelist'),
|
||||
array('js/messages.php', 'var PMA_messages = new Array();'),
|
||||
array('js/get_image.js.php', 'function PMA_getImage'),
|
||||
array('js/get_scripts.js.php', 'var AJAX'),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -142,8 +142,6 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
$this->markTestSkipped('Cannot modify constant');
|
||||
}
|
||||
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemeImage'] = 'testImage';
|
||||
$GLOBALS['_FormDislayGroup'] = 1;
|
||||
$opts = array();
|
||||
$opts['errors'] = array('e1');
|
||||
@ -174,8 +172,8 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
|
||||
$this->assertContains(
|
||||
'<img src="testImageb_help.png" title="Documentation" ' .
|
||||
'alt="Documentation" /',
|
||||
'<img src="themes/dot.gif" title="Documentation" ' .
|
||||
'alt="Documentation" class="icon ic_b_help" /',
|
||||
$result
|
||||
);
|
||||
|
||||
|
||||
@ -81,7 +81,6 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['MaxRows'] = 10;
|
||||
$GLOBALS['cfg']['ServerDefault'] = "PMA_server";
|
||||
$GLOBALS['cfg']['ActionLinksMode'] = 'icons';
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$GLOBALS['cfg']['CharEditing'] = '';
|
||||
$GLOBALS['cfg']['LimitChars'] = 50;
|
||||
$GLOBALS['db'] = 'PMA_db';
|
||||
@ -89,8 +88,6 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
//$_SESSION
|
||||
$GLOBALS['server'] = 1;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$_SESSION['relation'][1] = array(
|
||||
'PMA_VERSION' => PMA_VERSION,
|
||||
'centralcolumnswork' => true,
|
||||
|
||||
@ -52,11 +52,8 @@ class PMA_DisplayChangePassword_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['Server']['DisableIS'] = false;
|
||||
$GLOBALS['PMA_PHP_SELF'] = "server_privileges.php";
|
||||
$GLOBALS['server'] = 0;
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$_SESSION['relation'][$GLOBALS['server']] = "relation";
|
||||
}
|
||||
|
||||
|
||||
@ -51,11 +51,8 @@ class PMA_DisplayCreateTable_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['ShowHint'] = true;
|
||||
$GLOBALS['cfg']['ActionLinksMode'] = 'icons';
|
||||
$GLOBALS['PMA_PHP_SELF'] = "server_privileges.php";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$_SESSION['relation'][$GLOBALS['server']] = "relation";
|
||||
}
|
||||
|
||||
|
||||
@ -61,12 +61,9 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['server'] = 0;
|
||||
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$GLOBALS['db'] = "PMA";
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$_SESSION['relation'][$GLOBALS['server']] = "";
|
||||
|
||||
$pmaconfig = $this->getMockBuilder('PMA\libraries\Config')
|
||||
|
||||
@ -39,8 +39,6 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
|
||||
public function setup()
|
||||
{
|
||||
$GLOBALS['server'] = 1;
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
|
||||
$GLOBALS['cfg']['ServerDefault'] = 1;
|
||||
$GLOBALS['text_dir'] = 'ltr';
|
||||
|
||||
@ -53,7 +53,6 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['Server']['DisableIS'] = false;
|
||||
$GLOBALS['server'] = 0;
|
||||
$GLOBALS['cfg']['ActionLinksMode'] = "both";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//_SESSION
|
||||
$_SESSION['relation'][$GLOBALS['server']] = array(
|
||||
@ -70,8 +69,6 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -42,7 +42,6 @@ class PMA_Normalization_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['LimitChars'] = 50;
|
||||
$GLOBALS['PMA_Types'] = new TypesMySQL();
|
||||
$GLOBALS['cfg']['ServerDefault'] = "PMA_server";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$GLOBALS['cfg']['ShowHint'] = true;
|
||||
$GLOBALS['cfg']['CharEditing'] = '';
|
||||
$GLOBALS['cfg']['ActionLinksMode'] = 'icons';
|
||||
@ -51,8 +50,6 @@ class PMA_Normalization_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['server'] = 1;
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -38,7 +38,6 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
$GLOBALS['table'] = 'table';
|
||||
$GLOBALS['db'] = 'db';
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$GLOBALS['cfg'] = array(
|
||||
'ServerDefault' => 1,
|
||||
'ActionLinksMode' => 'icons',
|
||||
|
||||
@ -40,11 +40,9 @@ class PMA_Relation_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['Server']['pmadb'] = 'phpmyadmin';
|
||||
$GLOBALS['cfg']['ZeroConf'] = true;
|
||||
$_SESSION['relation'][$GLOBALS['server']] = "PMA_relation";
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$_SESSION['relation'] = array();
|
||||
|
||||
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['cfg']['ServerDefault'] = 0;
|
||||
|
||||
include_once 'libraries/relation.lib.php';
|
||||
|
||||
@ -52,11 +52,8 @@ class PMA_SelectServer_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['LimitChars'] = 100;
|
||||
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -32,7 +32,6 @@ class PMA_ServerCommon_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function setUp()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -87,8 +87,6 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
|
||||
//$_POST
|
||||
$_POST['pred_password'] = 'none';
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$_SESSION['relation'][$GLOBALS['server']] = array(
|
||||
'PMA_VERSION' => PMA_VERSION,
|
||||
'db' => 'pmadb',
|
||||
|
||||
@ -57,11 +57,8 @@ class PMA_ServerReplication_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['url_params'] = array();
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
|
||||
|
||||
@ -68,11 +68,8 @@ class PMA_ServerStatusAdvisor_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['replication_info']['slave']['status'] = false;
|
||||
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -66,8 +66,6 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -45,8 +45,6 @@ class PMA_ServerStatusProcesses_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -62,11 +62,8 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['replication_info']['slave']['status'] = false;
|
||||
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -51,11 +51,8 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['replication_types'] = array();
|
||||
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -65,11 +65,8 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['replication_info']['slave']['status'] = false;
|
||||
|
||||
$GLOBALS['table'] = "table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -43,9 +43,6 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
|
||||
'usergroups' => 'usergroups'
|
||||
);
|
||||
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -47,7 +47,6 @@ class PMA_SqlQueryForm_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
|
||||
$GLOBALS['db'] = "PMA_db";
|
||||
$GLOBALS['table'] = "PMA_table";
|
||||
$GLOBALS['pmaThemeImage'] = 'image';
|
||||
$GLOBALS['text_dir'] = "text_dir";
|
||||
|
||||
$GLOBALS['cfg']['GZipDump'] = false;
|
||||
@ -81,8 +80,6 @@ class PMA_SqlQueryForm_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['Server']['bookmarktable'] = "bookmarktable";
|
||||
|
||||
//$_SESSION
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
//Mock DBI
|
||||
$dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
|
||||
|
||||
@ -45,7 +45,6 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['server'] = 1;
|
||||
$GLOBALS['db'] = "PMA_db";
|
||||
$GLOBALS['table'] = "PMA_table";
|
||||
$GLOBALS['pmaThemeImage'] = "image";
|
||||
$GLOBALS['cfg']['ServerDefault'] = "server";
|
||||
$GLOBALS['cfg']['ActionLinksMode'] = 'both';
|
||||
$GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
|
||||
@ -56,7 +55,6 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase
|
||||
'tracking' => 'tracking',
|
||||
'trackingwork' => true
|
||||
);
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
|
||||
$GLOBALS['cfg']['Server']['tracking_default_statements'] = 'DELETE';
|
||||
|
||||
|
||||
@ -32,7 +32,6 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
$GLOBALS['table'] = 'table';
|
||||
$GLOBALS['db'] = 'db';
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$GLOBALS['cfg'] = array(
|
||||
'ServerDefault' => 1,
|
||||
'ActionLinksMode' => 'icons',
|
||||
|
||||
@ -30,9 +30,7 @@ class PMA_BuildActionTitles_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
function setup()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$GLOBALS['cfg'] = array('ActionLinksMode' => 'both');
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -31,9 +31,7 @@ class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
|
||||
function setup()
|
||||
{
|
||||
$GLOBALS['PMA_Config'] = new PMA\libraries\Config();
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['cfg'] = array('ServerDefault' => 1);
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['text_dir'] = 'ltr';
|
||||
}
|
||||
|
||||
|
||||
@ -30,7 +30,6 @@ class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
function setup()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -30,7 +30,6 @@ class PMA_ShowDocu_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
function setup()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$GLOBALS['server'] = '99';
|
||||
$GLOBALS['cfg']['ServerDefault'] = 1;
|
||||
}
|
||||
|
||||
@ -30,7 +30,6 @@ class PMA_ShowPHPDocu_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
function setup()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$GLOBALS['server'] = 99;
|
||||
$GLOBALS['cfg']['ServerDefault'] = 0;
|
||||
}
|
||||
|
||||
@ -46,8 +46,6 @@ class PMA_FatalError_Test extends PHPUnit_Framework_TestCase
|
||||
'verbose' => 'verbose',
|
||||
);
|
||||
$GLOBALS['cfg']['OBGzip'] = false;
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
|
||||
$GLOBALS['server'] = 1;
|
||||
$GLOBALS['db'] = '';
|
||||
|
||||
@ -42,8 +42,6 @@ class PMA_GetTableCount_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['PMA_Config'] = new PMA\libraries\Config();
|
||||
$GLOBALS['PMA_Config']->enableBc();
|
||||
$GLOBALS['cfg']['OBGzip'] = false;
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
|
||||
$GLOBALS['server'] = 1;
|
||||
$GLOBALS['db'] = '';
|
||||
|
||||
@ -75,7 +75,6 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
|
||||
}
|
||||
|
||||
}
|
||||
$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
|
||||
$GLOBALS['server'] = 0;
|
||||
$GLOBALS['PMA_Config'] = new PMA\libraries\Config();
|
||||
$GLOBALS['PMA_Config']->enableBc();
|
||||
|
||||
@ -36,8 +36,6 @@ class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
|
||||
'verbose' => 'verbose',
|
||||
);
|
||||
$GLOBALS['cfg']['OBGzip'] = false;
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
|
||||
$GLOBALS['server'] = 1;
|
||||
$GLOBALS['db'] = '';
|
||||
|
||||
@ -43,9 +43,7 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
|
||||
$cfg['ServerDefault'] = 1;
|
||||
|
||||
$GLOBALS['PMA_Types'] = new TypesMySQL();
|
||||
$_SESSION['PMA_Theme'] = new Theme();
|
||||
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
|
||||
$GLOBALS['pmaThemeImage'] = 'theme/';
|
||||
|
||||
}
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 15 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user
