This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/ResultList.php b/src/ResultList.php | |
index f941340..aefd6d0 100644 | |
--- a/src/ResultList.php | |
+++ b/src/ResultList.php | |
@@ -55,7 +55,7 @@ class ResultList extends ViewableData implements SS_List, Limitable | |
//If we are in live reading mode, only return published documents | |
if (Versioned::get_stage() == Versioned::LIVE) { | |
- $publishedFilter = new Query\BoolQuery(); | |
+ $publishedFilter = $query->hasParam('post_filter') ? $query->getParam('post_filter') : new Query\BoolQuery(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
$lockfile = json_decode(file_get_contents(__DIR__ . '/../composer.lock'), true); | |
$satis = [ | |
'name' => 'my/project-dependencies', | |
'homepage' => 'http://apache/satis/web', | |
'repositories' => [ | |
[ | |
"type" => "composer", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git vendor/heyday/silverstripe-elastica/src/ResultList.php vendor/heyday/silverstripe-elastica/src/ResultList.php | |
index a178198..13b9f65 100644 | |
--- vendor/heyday/silverstripe-elastica/src/ResultList.php | |
+++ vendor/heyday/silverstripe-elastica/src/ResultList.php | |
@@ -41,11 +41,19 @@ class ResultList extends ViewableData implements SS_List | |
'_type' | |
)); | |
+ $query->setSource([ | |
+ 'ID', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
class Page extends SiteTree implements NotifiedOn { | |
private static $db = array( | |
); | |
private static $has_one = array( | |
); | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[alias] | |
update-from = "!f() { git fetch $1 --prune; git merge --ff-only $1/$2 || git rebase --preserve-merges $1/$2; }; f" | |
ff = merge --ff-only | |
nf = merge --no-ff |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/filesystem/File.php b/filesystem/File.php | |
index 026a7bf..0082dfe 100644 | |
--- a/filesystem/File.php | |
+++ b/filesystem/File.php | |
@@ -646,7 +646,7 @@ class File extends DataObject { | |
* @return string | |
*/ | |
public function getAbsoluteURL() { | |
- return Director::absoluteBaseURL() . $this->getFilename(); | |
+ return Director::absoluteURL($this->getURL()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
if (defined('YML_PROXY_CONFIG_FILE')) { | |
$ymlFile = YML_PROXY_CONFIG_FILE; | |
if ($ymlFile{0} != '/') { | |
$ymlFile = BASE_PATH . '/' . $ymlFile; | |
} | |
$publisherName = defined('PROXY_PUBLISHER') ? PROXY_PUBLISHER : null; | |
$dynamicName = defined('PROXY_DYNAMIC_PUBLISHER') ? PROXY_DYNAMIC_PUBLISHER : null; | |
$array = Yaml::parse(file_get_contents($ymlFile)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
/** | |
* Redirects write queries to a specific database configuration | |
* | |
* @author <marcus@silverstripe.com.au> | |
* @license BSD License http://www.silverstripe.org/bsd-license | |
*/ | |
class MySQLWriteDbAspect implements BeforeCallAspect { | |
/** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Injector: | |
S3Service: | |
constructor: | |
- kidding | |
- right? | |
S3ContentReader: | |
type: prototype | |
properties: | |
s3service: %$S3Service | |
bucket: kfc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
module.exports = function(grunt) { | |
// COMMANDS | |
// comple css and js - $ grunt | |
// optim - run $ grunt imgoptim | |
// FILE STRUCTURE | |
// css/app.css, css/app.min.css |
NewerOlder