diff --git a/.travis.yml b/.travis.yml index 88893fa94..a906524bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_script: - pear install --alldeps phpmd/PHP_PMD - phpenv rehash # PHPLOC - - curl -o phploc.phar https://phar.phpunit.de/phploc.phar + - curl -o phploc.phar https://phar.phpunit.de/phploc-2.0.6.phar # Basic config required for PHPUnit - cp qa-tests/phpunit-qa-config.php qa-config.php diff --git a/qa-plugin/wysiwyg-editor/qa-wysiwyg-ajax.php b/qa-plugin/wysiwyg-editor/qa-wysiwyg-ajax.php index db1e74838..bb0553adf 100644 --- a/qa-plugin/wysiwyg-editor/qa-wysiwyg-ajax.php +++ b/qa-plugin/wysiwyg-editor/qa-wysiwyg-ajax.php @@ -31,8 +31,8 @@ public function match_request($request) // Fix path to WYSIWYG editor smilies public function process_request($request) { - // echo '
', print_r(qa_db_list_tables(), true), '
'; require_once QA_INCLUDE_DIR.'qa-app-posts.php'; + // smiley replacement regexes $rxSearch = '#<(img|a)([^>]+)(src|href)="([^"]+)/wysiwyg-editor/plugins/smiley/images/([^"]+)"#'; $rxReplace = '<$1$2$3="$4/wysiwyg-editor/ckeditor/plugins/smiley/images/$5"';