phlbnks

#!/bin/bash

# No conflict, changes in branch time order.
mkdir merge-conflict1
cd merge-conflict1
git init
touch test1.sh
git add test1.sh
echo $'Start\nOne\n\n\n\nTwo\n\n\n\nThree\n\n\n\nFour\n\n\n\nEnd' > test1.sh
git commit -am 'initial commit on master test1.sh'

phlbnks

<?php
/**
 * Plugin Name: Social Test
 *
 * TODO: Output <meta name="twitter:site" content="@username" />? Needs custom option to read from.
 * TODO: Custom option for social fallback image instead of core image?
 */

/**
 * Adding the Open Graph schema definitions in the Language Attributes.

phlbnks

#!/usr/bin/env bash

valet stop
composer global remove laravel/valet
composer global remove weprovide/valet-plus
brew services stop  --all

brew uninstall dnsmasq
sudo rm -rf /usr/local/etc/dnsmasq.conf
sudo rm -rf /usr/local/Cellar/dnsmasq

phlbnks

<?php

/**
 * Filter breadcrumbs to remove post archive when viewing Tag archives.
 */
add_action( 'bcn_after_fill', function( $bcn_breadcrumb_trail ){
	// Bail early if not a tag archive.
	if ( ! is_tag() ) {
		return $bcn_breadcrumb_trail;
	}

phlbnks

<?php
/**
 * Exclude posts with 'fruit' custom meta field value of 'bananas' from site Search
 */
function cc_search_filter( $query ) {
	if ( ! is_admin() && $query->is_main_query() ) {
		if ( $query->is_search ) {
			$query->set( 'meta_query',
				array(
					'relation' => 'OR',

phlbnks

<?php
/**
 * Exclude posts with term 'bananas' from Search.
 */
function cc_search_filter( $query ) {
	if ( ! is_admin() && $query->is_main_query() ) {
		if ( $query->is_search ) {
			$query->set(
				'tax_query',
				array(

phlbnks

SELECT
	wp_posts.post_title AS Product,
	wp_postmeta1.meta_value AS SKU,
	wp_postmeta2.meta_value AS Price,
	GROUP_CONCAT( wp_terms.name ORDER BY wp_terms.name SEPARATOR ', ' ) AS ProductCategories
FROM wp_posts
LEFT JOIN wp_postmeta wp_postmeta1
	ON wp_postmeta1.post_id = wp_posts.ID
	AND wp_postmeta1.meta_key = '_sku'
LEFT JOIN wp_postmeta wp_postmeta2

phlbnks

<?php
/**
 * Update .htaccess to whitelist logo when modified in platform settings.
 */
function cc_logo_htaccess() {
	// Fire only on Platform Settings options page.
	$screen = get_current_screen();
	if ( 'cc-configurator_page_cc-settings' === $screen->id && ( $_POST['acf']['field_576c2a5137029'] || $_POST['acf']['field_576c2a9e3702a'] ) ) {

		// Store files in an array.

phlbnks

#!/bin/bash
#
# Manage .htpasswd files


# Store script name for use in output.
me=$( basename $0 )


# Utility function for exiting.

phlbnks

#!/bin/bash -e
#
# Description:
# 	This will deploy WordPress in the current directory.
# 	Without modification it:
# 	- will configure basic security:
# 		- remove initial user created
# 		- deploy 6G firewall in .htaccess
# 		- attempt to prevent user enumeration in .htaccess
# 		- protect sensitive files and disallow executables in /wp-uploads