diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 36d467138a..aba7a2e7d4 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -3,7 +3,7 @@ imports: - javascript - php filter: - excluded_paths: [js/jquery/*, js/jqplot/*, js/openlayers/*, js/codemirror/*, js/canvg/*, js/tracekit/*, js/sprintf.js] + excluded_paths: [js/vendor/*] build: dependencies: before: @@ -12,7 +12,7 @@ build: tests: override: - - command: './vendor/bin/phpcs --standard=PMAStandard ./ --report=checkstyle --report-file=cs-data --ignore=*/vendor/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*' + command: './vendor/bin/phpcs --standard=PMAStandard ./ --report=checkstyle --report-file=cs-data --ignore=*/vendor/*,*/build/*' analysis: file: 'cs-data' # The reporter filename format: 'php-cs-checkstyle' # The supported format by Scrutinizer diff --git a/build.xml b/build.xml index 3eabc9dc1b..282146fa8a 100644 --- a/build.xml +++ b/build.xml @@ -89,7 +89,7 @@ '; $retval .= ''; + . $basedir . 'js/vendor/codemirror/lib/codemirror.css?' . $v . '" />'; $retval .= ''; + . $basedir . 'js/vendor/codemirror/addon/hint/show-hint.css?' . $v . '" />'; $retval .= ''; + . $basedir . 'js/vendor/codemirror/addon/lint/lint.css?' . $v . '" />'; $retval .= ''; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 158a065934..e67959f887 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -859,10 +859,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('chart.js'); - $scripts->addFile('jqplot/jquery.jqplot.js'); - $scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js'); - $scripts->addFile('jqplot/plugins/jqplot.highlighter.js'); - $scripts->addFile('jquery/jquery.tablesorter.js'); + $scripts->addFile('vendor/jqplot/jquery.jqplot.js'); + $scripts->addFile('vendor/jqplot/plugins/jqplot.pieRenderer.js'); + $scripts->addFile('vendor/jqplot/plugins/jqplot.highlighter.js'); + $scripts->addFile('vendor/jquery/jquery.tablesorter.js'); } /* diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php index c7f7be1cee..e2f1018694 100644 --- a/libraries/controllers/database/DatabaseStructureController.php +++ b/libraries/controllers/database/DatabaseStructureController.php @@ -123,7 +123,7 @@ class DatabaseStructureController extends DatabaseController array( 'db_structure.js', 'tbl_change.js', - 'jquery/jquery-ui-timepicker-addon.js' + 'vendor/jquery/jquery-ui-timepicker-addon.js' ) ); diff --git a/libraries/controllers/server/ServerPluginsController.php b/libraries/controllers/server/ServerPluginsController.php index a824eb37d6..493c2861db 100644 --- a/libraries/controllers/server/ServerPluginsController.php +++ b/libraries/controllers/server/ServerPluginsController.php @@ -44,7 +44,7 @@ class ServerPluginsController extends Controller $header = $this->response->getHeader(); $scripts = $header->getScripts(); - $scripts->addFile('jquery/jquery.tablesorter.js'); + $scripts->addFile('vendor/jquery/jquery.tablesorter.js'); $scripts->addFile('server_plugins.js'); /** diff --git a/libraries/controllers/table/TableChartController.php b/libraries/controllers/table/TableChartController.php index fc5b314a68..c37845088a 100644 --- a/libraries/controllers/table/TableChartController.php +++ b/libraries/controllers/table/TableChartController.php @@ -85,16 +85,16 @@ class TableChartController extends TableController array( 'chart.js', 'tbl_chart.js', - 'jqplot/jquery.jqplot.js', - 'jqplot/plugins/jqplot.barRenderer.js', - 'jqplot/plugins/jqplot.canvasAxisLabelRenderer.js', - 'jqplot/plugins/jqplot.canvasTextRenderer.js', - 'jqplot/plugins/jqplot.categoryAxisRenderer.js', - 'jqplot/plugins/jqplot.dateAxisRenderer.js', - 'jqplot/plugins/jqplot.pointLabels.js', - 'jqplot/plugins/jqplot.pieRenderer.js', - 'jqplot/plugins/jqplot.enhancedPieLegendRenderer.js', - 'jqplot/plugins/jqplot.highlighter.js' + 'vendor/jqplot/jquery.jqplot.js', + 'vendor/jqplot/plugins/jqplot.barRenderer.js', + 'vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js', + 'vendor/jqplot/plugins/jqplot.canvasTextRenderer.js', + 'vendor/jqplot/plugins/jqplot.categoryAxisRenderer.js', + 'vendor/jqplot/plugins/jqplot.dateAxisRenderer.js', + 'vendor/jqplot/plugins/jqplot.pointLabels.js', + 'vendor/jqplot/plugins/jqplot.pieRenderer.js', + 'vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js', + 'vendor/jqplot/plugins/jqplot.highlighter.js' ) ); diff --git a/libraries/controllers/table/TableGisVisualizationController.php b/libraries/controllers/table/TableGisVisualizationController.php index 47b75329e6..d7c430d78a 100644 --- a/libraries/controllers/table/TableGisVisualizationController.php +++ b/libraries/controllers/table/TableGisVisualizationController.php @@ -159,8 +159,8 @@ class TableGisVisualizationController extends TableController $this->response->getHeader()->getScripts()->addFiles( array( - 'openlayers/OpenLayers.js', - 'jquery/jquery.svg.js', + 'vendor/openlayers/OpenLayers.js', + 'vendor/jquery/jquery.svg.js', 'tbl_gis_visualization.js', ) ); diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/controllers/table/TableSearchController.php index 9ca04b4436..8db5f794e9 100644 --- a/libraries/controllers/table/TableSearchController.php +++ b/libraries/controllers/table/TableSearchController.php @@ -195,8 +195,8 @@ class TableSearchController extends TableController 'sql.js', 'tbl_select.js', 'tbl_change.js', - 'jquery/jquery-ui-timepicker-addon.js', - 'jquery/jquery.uitablefilter.js', + 'vendor/jquery/jquery-ui-timepicker-addon.js', + 'vendor/jquery/jquery.uitablefilter.js', 'gis_data_editor.js', ) ); @@ -226,13 +226,13 @@ class TableSearchController extends TableController array( 'makegrid.js', 'sql.js', - 'jqplot/jquery.jqplot.js', - 'jqplot/plugins/jqplot.canvasTextRenderer.js', - 'jqplot/plugins/jqplot.canvasAxisLabelRenderer.js', - 'jqplot/plugins/jqplot.dateAxisRenderer.js', - 'jqplot/plugins/jqplot.highlighter.js', - 'jqplot/plugins/jqplot.cursor.js', - 'jquery/jquery-ui-timepicker-addon.js', + 'vendor/jqplot/jquery.jqplot.js', + 'vendor/jqplot/plugins/jqplot.canvasTextRenderer.js', + 'vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js', + 'vendor/jqplot/plugins/jqplot.dateAxisRenderer.js', + 'vendor/jqplot/plugins/jqplot.highlighter.js', + 'vendor/jqplot/plugins/jqplot.cursor.js', + 'vendor/jquery/jquery-ui-timepicker-addon.js', 'tbl_zoom_plot_jqplot.js', 'tbl_change.js', ) diff --git a/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php b/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php index 3784165d02..35f7f664fd 100644 --- a/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php +++ b/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php @@ -41,8 +41,8 @@ class Text_Plain_JsonEditor extends CodeMirrorEditorTransformationPlugin { $scripts = array(); if ($GLOBALS['cfg']['CodemirrorEnable']) { - $scripts[] = 'codemirror/lib/codemirror.js'; - $scripts[] = 'codemirror/mode/javascript/javascript.js'; + $scripts[] = 'vendor/codemirror/lib/codemirror.js'; + $scripts[] = 'vendor/codemirror/mode/javascript/javascript.js'; $scripts[] = 'transformations/json_editor.js'; } diff --git a/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php b/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php index 336938aa32..a5424a0e7b 100644 --- a/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php +++ b/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php @@ -41,8 +41,8 @@ class Text_Plain_SqlEditor extends CodeMirrorEditorTransformationPlugin { $scripts = array(); if ($GLOBALS['cfg']['CodemirrorEnable']) { - $scripts[] = 'codemirror/lib/codemirror.js'; - $scripts[] = 'codemirror/mode/sql/sql.js'; + $scripts[] = 'vendor/codemirror/lib/codemirror.js'; + $scripts[] = 'vendor/codemirror/mode/sql/sql.js'; $scripts[] = 'transformations/sql_editor.js'; } diff --git a/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php b/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php index da7e5154e6..437c948da5 100644 --- a/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php +++ b/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php @@ -41,8 +41,8 @@ class Text_Plain_XmlEditor extends CodeMirrorEditorTransformationPlugin { $scripts = array(); if ($GLOBALS['cfg']['CodemirrorEnable']) { - $scripts[] = 'codemirror/lib/codemirror.js'; - $scripts[] = 'codemirror/mode/xml/xml.js'; + $scripts[] = 'vendor/codemirror/lib/codemirror.js'; + $scripts[] = 'vendor/codemirror/mode/xml/xml.js'; $scripts[] = 'transformations/xml_editor.js'; } diff --git a/libraries/plugins/transformations/output/Text_Plain_Json.php b/libraries/plugins/transformations/output/Text_Plain_Json.php index efec17ea1c..80b77d8fc3 100644 --- a/libraries/plugins/transformations/output/Text_Plain_Json.php +++ b/libraries/plugins/transformations/output/Text_Plain_Json.php @@ -30,9 +30,9 @@ class Text_Plain_Json extends TransformationsPlugin $response = Response::getInstance(); $scripts = $response->getHeader() ->getScripts(); - $scripts->addFile('codemirror/lib/codemirror.js'); - $scripts->addFile('codemirror/mode/javascript/javascript.js'); - $scripts->addFile('codemirror/addon/runmode/runmode.js'); + $scripts->addFile('vendor/codemirror/lib/codemirror.js'); + $scripts->addFile('vendor/codemirror/mode/javascript/javascript.js'); + $scripts->addFile('vendor/codemirror/addon/runmode/runmode.js'); $scripts->addFile('transformations/json.js'); } } diff --git a/libraries/plugins/transformations/output/Text_Plain_Sql.php b/libraries/plugins/transformations/output/Text_Plain_Sql.php index ba82a68309..d06f03ecfd 100644 --- a/libraries/plugins/transformations/output/Text_Plain_Sql.php +++ b/libraries/plugins/transformations/output/Text_Plain_Sql.php @@ -29,9 +29,9 @@ class Text_Plain_Sql extends SQLTransformationsPlugin $response = Response::getInstance(); $scripts = $response->getHeader() ->getScripts(); - $scripts->addFile('codemirror/lib/codemirror.js'); - $scripts->addFile('codemirror/mode/sql/sql.js'); - $scripts->addFile('codemirror/addon/runmode/runmode.js'); + $scripts->addFile('vendor/codemirror/lib/codemirror.js'); + $scripts->addFile('vendor/codemirror/mode/sql/sql.js'); + $scripts->addFile('vendor/codemirror/addon/runmode/runmode.js'); $scripts->addFile('function.js'); } } diff --git a/libraries/plugins/transformations/output/Text_Plain_Xml.php b/libraries/plugins/transformations/output/Text_Plain_Xml.php index 683127a928..0fec961529 100644 --- a/libraries/plugins/transformations/output/Text_Plain_Xml.php +++ b/libraries/plugins/transformations/output/Text_Plain_Xml.php @@ -30,9 +30,9 @@ class Text_Plain_Xml extends TransformationsPlugin $response = Response::getInstance(); $scripts = $response->getHeader() ->getScripts(); - $scripts->addFile('codemirror/lib/codemirror.js'); - $scripts->addFile('codemirror/mode/xml/xml.js'); - $scripts->addFile('codemirror/addon/runmode/runmode.js'); + $scripts->addFile('vendor/codemirror/lib/codemirror.js'); + $scripts->addFile('vendor/codemirror/mode/xml/xml.js'); + $scripts->addFile('vendor/codemirror/addon/runmode/runmode.js'); $scripts->addFile('transformations/xml.js'); } } diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index aab1e04148..57fefedacb 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -408,7 +408,7 @@ unset($form_params); $response = Response::getInstance(); $response->getHeader()->getScripts()->addFiles( array( - 'jquery/jquery.uitablefilter.js', + 'vendor/jquery/jquery.uitablefilter.js', 'indexes.js' ) ); diff --git a/normalization.php b/normalization.php index 124356d1b7..48cb46a165 100644 --- a/normalization.php +++ b/normalization.php @@ -73,7 +73,7 @@ if (isset($_REQUEST['getNewTables3NF'])) { $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('normalization.js'); -$scripts->addFile('jquery/jquery.uitablefilter.js'); +$scripts->addFile('vendor/jquery/jquery.uitablefilter.js'); $normalForm = '1nf'; if (Core::isValid($_REQUEST['normalizeTo'], array('1nf', '2nf', '3nf'))) { $normalForm = $_REQUEST['normalizeTo']; diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 0d5e4d9167..22c43baec0 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -321,7 +321,7 @@ for kit in $KITS ; do mv htmldoc doc/html rm doc/html/.buildinfo doc/html/objects.inv # Javascript sources - rm -rf js/jquery/src/ js/openlayers/src/ + rm -rf js/vendor/jquery/src/ js/vendor/openlayers/src/ fi # Remove developer scripts diff --git a/server_privileges.php b/server_privileges.php index c15bfda307..170e923c45 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -30,7 +30,7 @@ $response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_privileges.js'); -$scripts->addFile('zxcvbn.js'); +$scripts->addFile('vendor/zxcvbn.js'); if ((isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'server') diff --git a/server_replication.php b/server_replication.php index 9e07e194d4..802506eb59 100644 --- a/server_replication.php +++ b/server_replication.php @@ -24,7 +24,7 @@ $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_privileges.js'); $scripts->addFile('replication.js'); -$scripts->addFile('zxcvbn.js'); +$scripts->addFile('vendor/zxcvbn.js'); /** * Checks if the user is allowed to do what he tries to... diff --git a/server_sql.php b/server_sql.php index 8072dd4ab9..2bf16a0f61 100644 --- a/server_sql.php +++ b/server_sql.php @@ -24,7 +24,7 @@ $response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('makegrid.js'); -$scripts->addFile('jquery/jquery.uitablefilter.js'); +$scripts->addFile('vendor/jquery/jquery.uitablefilter.js'); $scripts->addFile('sql.js'); require_once 'libraries/server_common.inc.php'; diff --git a/server_status_monitor.php b/server_status_monitor.php index e5b8697048..6a32d1d3e5 100644 --- a/server_status_monitor.php +++ b/server_status_monitor.php @@ -70,18 +70,18 @@ if ($response->isAjax()) { */ $header = $response->getHeader(); $scripts = $header->getScripts(); -$scripts->addFile('jquery/jquery.tablesorter.js'); -$scripts->addFile('jquery/jquery.sortableTable.js'); -$scripts->addFile('jquery/jquery-ui-timepicker-addon.js'); +$scripts->addFile('vendor/jquery/jquery.tablesorter.js'); +$scripts->addFile('vendor/jquery/jquery.sortableTable.js'); +$scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js'); // for charting -$scripts->addFile('jqplot/jquery.jqplot.js'); -$scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js'); -$scripts->addFile('jqplot/plugins/jqplot.enhancedPieLegendRenderer.js'); -$scripts->addFile('jqplot/plugins/jqplot.canvasTextRenderer.js'); -$scripts->addFile('jqplot/plugins/jqplot.canvasAxisLabelRenderer.js'); -$scripts->addFile('jqplot/plugins/jqplot.dateAxisRenderer.js'); -$scripts->addFile('jqplot/plugins/jqplot.highlighter.js'); -$scripts->addFile('jqplot/plugins/jqplot.cursor.js'); +$scripts->addFile('vendor/jqplot/jquery.jqplot.js'); +$scripts->addFile('vendor/jqplot/plugins/jqplot.pieRenderer.js'); +$scripts->addFile('vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js'); +$scripts->addFile('vendor/jqplot/plugins/jqplot.canvasTextRenderer.js'); +$scripts->addFile('vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js'); +$scripts->addFile('vendor/jqplot/plugins/jqplot.dateAxisRenderer.js'); +$scripts->addFile('vendor/jqplot/plugins/jqplot.highlighter.js'); +$scripts->addFile('vendor/jqplot/plugins/jqplot.cursor.js'); $scripts->addFile('jqplot/plugins/jqplot.byteFormatter.js'); $scripts->addFile('server_status_monitor.js'); diff --git a/server_status_queries.php b/server_status_queries.php index 2cb5db3032..bb06a4a587 100644 --- a/server_status_queries.php +++ b/server_status_queries.php @@ -25,11 +25,11 @@ $scripts = $header->getScripts(); // for charting $scripts->addFile('chart.js'); -$scripts->addFile('jqplot/jquery.jqplot.js'); -$scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js'); -$scripts->addFile('jqplot/plugins/jqplot.highlighter.js'); -$scripts->addFile('jqplot/plugins/jqplot.enhancedPieLegendRenderer.js'); -$scripts->addFile('jquery/jquery.tablesorter.js'); +$scripts->addFile('vendor/jqplot/jquery.jqplot.js'); +$scripts->addFile('vendor/jqplot/plugins/jqplot.pieRenderer.js'); +$scripts->addFile('vendor/jqplot/plugins/jqplot.highlighter.js'); +$scripts->addFile('vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js'); +$scripts->addFile('vendor/jquery/jquery.tablesorter.js'); $scripts->addFile('server_status_sorter.js'); $scripts->addFile('server_status_queries.js'); diff --git a/server_status_variables.php b/server_status_variables.php index f5b4179607..30b04aa26b 100644 --- a/server_status_variables.php +++ b/server_status_variables.php @@ -38,7 +38,7 @@ $response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_status_variables.js'); -$scripts->addFile('jquery/jquery.tablesorter.js'); +$scripts->addFile('vendor/jquery/jquery.tablesorter.js'); $scripts->addFile('server_status_sorter.js'); $response->addHTML('
'); diff --git a/setup/index.php b/setup/index.php index a0c75aa692..39ec3d8c64 100644 --- a/setup/index.php +++ b/setup/index.php @@ -43,8 +43,8 @@ Core::noCacheHeader(); - - + diff --git a/sql.php b/sql.php index 92601b9fb6..3fbb40e51e 100644 --- a/sql.php +++ b/sql.php @@ -26,8 +26,8 @@ PageSettings::showGroup('Browse'); $response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); -$scripts->addFile('jquery/jquery-ui-timepicker-addon.js'); -$scripts->addFile('jquery/jquery.uitablefilter.js'); +$scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js'); +$scripts->addFile('vendor/jquery/jquery.uitablefilter.js'); $scripts->addFile('tbl_change.js'); $scripts->addFile('indexes.js'); $scripts->addFile('gis_data_editor.js'); diff --git a/tbl_change.php b/tbl_change.php index 437ccb97ef..20d7b5eb64 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -79,9 +79,9 @@ $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('sql.js'); $scripts->addFile('tbl_change.js'); -$scripts->addFile('jquery/jquery-ui-timepicker-addon.js'); -$scripts->addFile('jquery/jquery.validate.js'); -$scripts->addFile('jquery/additional-methods.js'); +$scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js'); +$scripts->addFile('vendor/jquery/jquery.validate.js'); +$scripts->addFile('vendor/jquery/additional-methods.js'); $scripts->addFile('gis_data_editor.js'); /** diff --git a/tbl_sql.php b/tbl_sql.php index 46b14004f4..2c79cef581 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -24,7 +24,7 @@ $response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('makegrid.js'); -$scripts->addFile('jquery/jquery.uitablefilter.js'); +$scripts->addFile('vendor/jquery/jquery.uitablefilter.js'); $scripts->addFile('sql.js'); require 'libraries/tbl_common.inc.php'; diff --git a/tbl_tracking.php b/tbl_tracking.php index e9ef0ba8e2..0f48cfb905 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -18,7 +18,7 @@ require_once './libraries/tracking.lib.php'; $response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); -$scripts->addFile('jquery/jquery.tablesorter.js'); +$scripts->addFile('vendor/jquery/jquery.tablesorter.js'); $scripts->addFile('tbl_tracking.js'); define('TABLE_MAY_BE_ABSENT', true); diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php index b91abfcfe2..6b89820f65 100644 --- a/test/classes/ScriptsTest.php +++ b/test/classes/ScriptsTest.php @@ -149,12 +149,12 @@ $(function() {}); public function testGetFiles() { // codemirror's onload event is blacklisted - $this->object->addFile('codemirror/lib/codemirror.js'); + $this->object->addFile('vendor/codemirror/lib/codemirror.js'); $this->object->addFile('common.js'); $this->assertEquals( array( - array('name' => 'codemirror/lib/codemirror.js', 'fire' => 0), + array('name' => 'vendor/codemirror/lib/codemirror.js', 'fire' => 0), array('name' => 'common.js', 'fire' => 1) ), $this->object->getFiles() diff --git a/themes/pmahomme/css/resizable-menu.css.php b/themes/pmahomme/css/resizable-menu.css.php index 21d90dc545..03bab595cb 100644 --- a/themes/pmahomme/css/resizable-menu.css.php +++ b/themes/pmahomme/css/resizable-menu.css.php @@ -3,7 +3,7 @@ /** * Styles for the resizable menus * - * used by js/jquery/jquery.menuResizer-1.0.js + * used by js/vendor/jquery/jquery.menuResizer-1.0.js * * @package PhpMyAdmin-theme * @subpackage PMAHomme diff --git a/user_password.php b/user_password.php index 413bea3e9d..5d7323ceaf 100644 --- a/user_password.php +++ b/user_password.php @@ -25,7 +25,7 @@ $response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_privileges.js'); -$scripts->addFile('zxcvbn.js'); +$scripts->addFile('vendor/zxcvbn.js'); /** * Displays an error message and exits if the user isn't allowed to use this