Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a054562

Browse files
roccivicroccivic
committed
PMA_Footer and PMA_Header no longer need to be singletons
1 parent c2ae2ae commit a054562

67 files changed

Lines changed: 206 additions & 137 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎browse_foreigners.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313

1414
PMA_checkParameters(array('db', 'table', 'field'));
1515

16-
$header = PMA_Header::getInstance();
16+
$response = PMA_Response::getInstance();
17+
$header = $response->getHeader();
1718
$header->disableMenu();
1819
$header->setBodyId('body_browse_foreigners');
1920

‎db_events.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
/**
1616
* Include JavaScript libraries
1717
*/
18-
$scripts = PMA_Header::getInstance()->getScripts();
18+
$response = PMA_Response::getInstance();
19+
$header = $response->getHeader();
20+
$scripts = $header->getScripts();
1921
$scripts->addFile('jquery/timepicker.js');
2022
$scripts->addFile('rte/common.js');
2123
$scripts->addFile('rte/events.js');

‎db_export.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
*/
1212
require_once 'libraries/common.inc.php';
1313

14-
$scripts = PMA_Header::getInstance()->getScripts();
14+
$response = PMA_Response::getInstance();
15+
$header = $response->getHeader();
16+
$scripts = $header->getScripts();
1517
$scripts->addFile('export.js');
1618

1719
// $sub_part is also used in db_info.inc.php to see if we are coming from

‎db_import.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
*/
1111
require_once 'libraries/common.inc.php';
1212

13-
$scripts = PMA_Header::getInstance()->getScripts();
13+
$response = PMA_Response::getInstance();
14+
$header = $response->getHeader();
15+
$scripts = $header->getScripts();
1416
$scripts->addFile('import.js');
1517

1618
/**

‎db_operations.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
require_once 'libraries/mysql_charsets.lib.php';
2020

2121
// add a javascript file for jQuery functions to handle Ajax actions
22-
$scripts = PMA_Header::getInstance()->getScripts();
22+
$response = PMA_Response::getInstance();
23+
$header = $response->getHeader();
24+
$scripts = $header->getScripts();
2325
$scripts->addFile('db_operations.js');
2426

2527
/**

‎db_printview.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
*/
1111
require_once 'libraries/common.inc.php';
1212

13-
$header = PMA_Header::getInstance();
13+
$response = PMA_Response::getInstance();
14+
$header = $response->getHeader();
1415
$header->enablePrintView();
1516
$header->display();
1617

‎db_routines.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
/**
1717
* Include JavaScript libraries
1818
*/
19-
$scripts = PMA_Header::getInstance()->getScripts();
19+
$response = PMA_Response::getInstance();
20+
$header = $response->getHeader();
21+
$scripts = $header->getScripts();
2022
$scripts->addFile('jquery/timepicker.js');
2123
$scripts->addFile('rte/common.js');
2224
$scripts->addFile('rte/routines.js');

‎db_search.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
*/
1414
require_once 'libraries/common.inc.php';
1515

16-
$scripts = PMA_Header::getInstance()->getScripts();
16+
$response = PMA_Response::getInstance();
17+
$header = $response->getHeader();
18+
$scripts = $header->getScripts();
1719
$scripts->addFile('db_search.js');
1820
$scripts->addFile('sql.js');
1921
$scripts->addFile('makegrid.js');

‎db_sql.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
/**
1414
* Runs common work
1515
*/
16-
$scripts = PMA_Header::getInstance()->getScripts();
16+
$response = PMA_Response::getInstance();
17+
$header = $response->getHeader();
18+
$scripts = $header->getScripts();
1719
$scripts->addFile('functions.js');
1820
$scripts->addFile('makegrid.js');
1921
$scripts->addFile('sql.js');

‎db_structure.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
*/
1111
require_once 'libraries/common.inc.php';
1212

13-
$scripts = PMA_Header::getInstance()->getScripts();
13+
$response = PMA_Response::getInstance();
14+
$header = $response->getHeader();
15+
$scripts = $header->getScripts();
1416
$scripts->addFile('db_structure.js');
1517
$scripts->addFile('tbl_change.js');
1618
$scripts->addFile('jquery/timepicker.js');

0 commit comments

Comments
 (0)