Commit Graph

12 Commits

Author SHA1 Message Date
Madhura Jayaratne
7bb078f771 Fix some line breaks
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-12 15:35:44 +05:30
Madhura Jayaratne
43f6e8b22a In fact this including replication.inc.php here is not required since it was include earlier
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-12 15:27:40 +05:30
Madhura Jayaratne
20102085ca Include replication.inc.php only if the database is in a slave replication process
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-12 15:11:39 +05:30
Madhura Jayaratne
b5a620777e Remove unnecessary line break
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-12 15:05:53 +05:30
Atul Pratap Singh
c0b6e18f5c Add missing includes and update member variables
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-08-12 09:41:54 +05:30
Madhura Jayaratne
7197a41f17 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-11 12:16:03 +05:30
Madhura Jayaratne
9701cbddc2 Fix spacing in doc comments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-11 12:14:43 +05:30
Hugues Peccatte
82d7132774 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-08-10 22:41:11 +02:00
Madhura Jayaratne
bdce9e3ca6 Add missing include
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-10 21:26:16 +05:30
Madhura Jayaratne
edf833644b Merge branch 'master' into structureController
Conflicts:
	libraries/controllers/StructureController.class.php
2015-08-10 16:19:13 +05:30
Madhura Jayaratne
c90d05f3b2 Use instance variables
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-10 15:50:32 +05:30
Madhura Jayaratne
a599b61534 Create separate controllers from table and database structure pages
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-10 15:09:17 +05:30